Merge pull request #3798 from nebulab/elia/fix-admin-resource-control…

…ler-not-found-errors

Ensure #resource_not_found mentions the right model

backend/app/controllers/spree/admin/resource_controller.rb

@@ -5,8 +5,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
   before_action :load_resource, except: :update_positions
-  rescue_from ActiveRecord::RecordNotFound do
-    resource_not_found
+  rescue_from ActiveRecord::RecordNotFound do |exception|
+    resource_not_found(flash_class: exception.model.constantize)
   end
   rescue_from ActiveRecord::RecordInvalid, with: :resource_invalid
 

backend/spec/controllers/spree/admin/resource_controller_spec.rb

@@ -221,4 +221,21 @@ def check_destroy_constraints
       end
     end
   end
+
+  describe 'rescue_from ActveRecord::RecordNotFound' do
+    let(:widget) { Widget.create!(name: 'a widget') }
+
+    subject do
+      get :edit, params: { id: widget.to_param }
+    end
+
+    it 'shows an error message with a reference to the model that was not found and redirect to the collection' do
+      allow(controller).to receive(:edit) { Spree::Product.find(123) }
+
+      subject
+
+      expect(response).to redirect_to('/admin/widgets')
+      expect(flash[:error]).to eql('Product is not found')
+    end
+  end
 end