Merge pull request #673 from juggler/rules_order

Changes rules order in mongoid specs. Fixes #672
ryanb · Feb 22, 2013 · e6bf4c8 · e6bf4c8
2 parents 68ea78b + 17043ca
commit e6bf4c8
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/spec/cancan/model_adapters/mongoid_adapter_spec.rb b/spec/cancan/model_adapters/mongoid_adapter_spec.rb
@@ -83,14 +83,13 @@ class MongoidProject
         MongoidProject.accessible_by(@ability, :destroy).entries.should == [sir]
       end
 
-      it "is able to mix empty conditions and hashes" do
+      it "takes presedence over rule defined without a condition" do
-        pending "TODO figure out why this isn't working"
         @ability.can :read, :mongoid_projects
         @ability.can :read, :mongoid_projects, :title => 'Sir'
         sir  = MongoidProject.create(:title => 'Sir')
         lord = MongoidProject.create(:title => 'Lord')
 
-        MongoidProject.accessible_by(@ability, :read).count.should == 2
+        MongoidProject.accessible_by(@ability, :read).entries.should == [sir]
       end
 
       it "returns everything when the defined ability is access all" do