fixed failing spec

jomz · Feb 21, 2013 · c8d10fc · c8d10fc
1 parent a69726a
commit c8d10fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/spec/controllers/copy_move_controller_spec.rb b/spec/controllers/copy_move_controller_spec.rb
@@ -102,8 +102,8 @@
     end
 
     it "should have copied the descendants" do
-      assigns[:new_page].should have(3).children
-      assigns[:new_page].children.first.should have(1).child
+      assigns[:new_page].should have(pages(:parent).children.count).children
+      assigns[:new_page].children.descendants.count.should == pages(:parent).children.descendants.count
     end
 
     it "should write a flash notice" do

diff --git a/spec/models/copy_move_spec.rb b/spec/models/copy_move_spec.rb
@@ -98,18 +98,19 @@
       @new_page = @page.copy_tree_to(pages(:first))
       @new_page.parent.should == pages(:first)
       @new_page.should have(3).children
-      @new_page.children.first.should have(1).child
-      @new_page.children.first.children.first.should have(1).child
+      @new_page.should have(pages(:parent).children.count).children
+      @new_page.children.descendants.count.should == pages(:parent).children.descendants.count
     end
 
     it "should override the status when given" do
       @new_page = @page.copy_tree_to(pages(:first), Status[:hidden].id)
       @new_page.status.should == Status[:hidden]
       @new_page.children.each do |child|
         child.status.should == Status[:hidden]
+        child.children.each do |grandchild|
+          grandchild.status.should == Status[:hidden]
+        end
       end
-      @new_page.children.first.children.first.status.should == Status[:hidden]
-      @new_page.children.first.children.first.children.first.status.should == Status[:hidden]
     end
   end
 end