spec/access_rules_spec.rb in tuersteher-0.3.4 vs spec/access_rules_spec.rb in tuersteher-0.4.0

@@ -90,15 +90,15 @@
       class SampleModel1; end
       class SampleModel2; end
 
       before do
         rules = [
-          ModelAccessRule.new(SampleModel1).grant.permission(:all),
-          ModelAccessRule.new(SampleModel2).grant.permission(:read),
-          ModelAccessRule.new(SampleModel2).grant.permission(:update).role(:user).extension(:owner?),
-          ModelAccessRule.new(SampleModel2).deny.permission(:create),
-          ModelAccessRule.new(SampleModel2).grant.permission(:all).role(:admin),
+          ModelAccessRule.new(SampleModel1).grant.method(:all),
+          ModelAccessRule.new(SampleModel2).grant.method(:read),
+          ModelAccessRule.new(SampleModel2).grant.method(:update).role(:user).extension(:owner?),
+          ModelAccessRule.new(SampleModel2).deny.method(:create),
+          ModelAccessRule.new(SampleModel2).grant.method(:all).role(:admin),
         ]
         AccessRulesStorage.instance.stub(:model_rules).and_return(rules)
         @user = stub('user')
         @model1 = SampleModel1.new
         @model2 = SampleModel2.new
@@ -141,16 +141,16 @@
           AccessRules.model_access?(@user, @model2, :create).should_not be_true
         end
       end
 
       context "without user" do
-        it "should be true for this paths" do
+        it "should be true for this models" do
           AccessRules.model_access?(nil, @model1, :xyz).should be_true
           AccessRules.model_access?(nil, @model2, :read).should be_true
         end
 
-        it "should not be true for this paths" do
+        it "should not be true for this models" do
           AccessRules.model_access?(nil, @model2, :update).should_not be_true
         end
       end
     end # of context 'model_access?'
 
@@ -162,11 +162,11 @@
         def owner? user; false; end
       end
 
       before do
         rules = [
-          ModelAccessRule.new(SampleModel).permission(:update).role(:admin),
-          ModelAccessRule.new(SampleModel).permission(:update).role(:user).extension(:owner?),
+          ModelAccessRule.new(SampleModel).method(:update).role(:admin),
+          ModelAccessRule.new(SampleModel).method(:update).role(:user).extension(:owner?),
         ]
         AccessRulesStorage.instance.stub(:model_rules).and_return(rules)
         @user = stub('user')
         @model1 = SampleModel.new
         @model2 = SampleModel.new