will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renaming :singular resource option to :singleton

Browse Source
This commit is contained in:
Ryan Bates
2010-08-06 13:06:18 -07:00
parent 7d9e710f05
commit c9e0f4e3ef
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/cancan/controller_resource_spec.rb
View File

@@ -166,22 +166,22 @@ describe CanCan::ControllerResource do
@controller.instance_variable_get(:@ability).should == :some_ability
end
it "should find record through has_one association with :singular option" do
it "should find record through has_one association with :singleton option" do
@params.merge!(:action => "show")
person = Object.new
@controller.instance_variable_set(:@person, person)
stub(person).ability { :some_ability }
resource = CanCan::ControllerResource.new(@controller, :through => :person, :singular => true)
resource = CanCan::ControllerResource.new(@controller, :through => :person, :singleton => true)
resource.load_resource
@controller.instance_variable_get(:@ability).should == :some_ability
end
it "should build record through has_one association with :singular option" do
it "should build record through has_one association with :singleton option" do
@params.merge!(:action => "create", :ability => :ability_attributes)
person = Object.new
@controller.instance_variable_set(:@person, person)
stub(person).build_ability(:ability_attributes) { :new_ability }
resource = CanCan::ControllerResource.new(@controller, :through => :person, :singular => true)
resource = CanCan::ControllerResource.new(@controller, :through => :person, :singleton => true)
resource.load_resource
@controller.instance_variable_get(:@ability).should == :new_ability
end