3639ca90eb
This reverts e3eab13b86
I don't know what was the idea of that, but it turned out REAL bad.
`collection` sets the collection instance variable. `resource_base` is used all
over CanCan. It's also used inside `load_collection?` which is checked before
`load_collection` is called. That means we actually set the collection instance
variable through inherited_resources (without any authorization whatsoever) before trying to load it through CanCan using `accessible_by`.
1. def load_resource
2. unless skip?(:load)
3. if load_instance?
4. self.resource_instance ||= load_resource_instance
5. elsif load_collection?
6. self.collection_instance ||= load_collection
7. end
8. end
9. end
`collection_instance` is set on line 5 instead of line 6.
43 lines
1.7 KiB
Ruby
43 lines
1.7 KiB
Ruby
require "spec_helper"
|
|
|
|
describe CanCan::InheritedResource do
|
|
before(:each) do
|
|
@params = HashWithIndifferentAccess.new(:controller => "projects")
|
|
@controller_class = Class.new
|
|
@controller = @controller_class.new
|
|
@ability = Ability.new(nil)
|
|
stub(@controller).params { @params }
|
|
stub(@controller).current_ability { @ability }
|
|
stub(@controller_class).cancan_skipper { {:authorize => {}, :load => {}} }
|
|
end
|
|
|
|
it "show should load resource through @controller.resource" do
|
|
@params.merge!(:action => "show", :id => 123)
|
|
stub(@controller).resource { :project_resource }
|
|
CanCan::InheritedResource.new(@controller).load_resource
|
|
@controller.instance_variable_get(:@project).should == :project_resource
|
|
end
|
|
|
|
it "new should load through @controller.build_resource" do
|
|
@params[:action] = "new"
|
|
stub(@controller).build_resource { :project_resource }
|
|
CanCan::InheritedResource.new(@controller).load_resource
|
|
@controller.instance_variable_get(:@project).should == :project_resource
|
|
end
|
|
|
|
it "index should load through @controller.association_chain when parent" do
|
|
@params[:action] = "index"
|
|
stub(@controller).association_chain { @controller.instance_variable_set(:@project, :project_resource) }
|
|
CanCan::InheritedResource.new(@controller, :parent => true).load_resource
|
|
@controller.instance_variable_get(:@project).should == :project_resource
|
|
end
|
|
|
|
it "index should load through @controller.end_of_association_chain" do
|
|
@params[:action] = "index"
|
|
stub(Project).accessible_by(@ability, :index) { :projects }
|
|
stub(@controller).end_of_association_chain { Project }
|
|
CanCan::InheritedResource.new(@controller).load_resource
|
|
@controller.instance_variable_get(:@projects).should == :projects
|
|
end
|
|
end
|