fix pluralize error on index action when passing resource name - closes

ryanb#143 again
jduff · Sep 8, 2010 · a5ff826 · a5ff826
1 parent 9d91545
commit a5ff826
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/cancan/controller_resource.rb b/lib/cancan/controller_resource.rb
@@ -29,7 +29,7 @@ def load_resource
       if !resource_instance && (parent? || member_action?)
         @controller.instance_variable_set("@#{instance_name}", load_resource_instance)
       elsif load_collection?
-        @controller.instance_variable_set("@#{instance_name.pluralize}", load_collection)
+        @controller.instance_variable_set("@#{instance_name.to_s.pluralize}", load_collection)
       end
     end
 

diff --git a/spec/cancan/controller_resource_spec.rb b/spec/cancan/controller_resource_spec.rb
@@ -67,7 +67,7 @@
   it "should build a collection when on index action when class responds to accessible_by" do
     stub(Project).accessible_by(@ability) { :found_projects }
     @params[:action] = "index"
-    resource = CanCan::ControllerResource.new(@controller)
+    resource = CanCan::ControllerResource.new(@controller, :project)
     resource.load_resource
     @controller.instance_variable_get(:@project).should be_nil
     @controller.instance_variable_get(:@projects).should == :found_projects