repeater_spec.rb in prawn-1.0.0.rc1

- old
+ new

@@ -8,49 +8,49 @@
     doc = sample_document
     doc.expects(:create_stamp).with("prawn_repeater(#{orig_count})")
 
     r = repeater(doc, :all) { :do_nothing }
 
-    Prawn::Repeater.count.should == orig_count + 1
+    assert_equal orig_count + 1,  Prawn::Repeater.count
   end
 
   it "must provide an :all filter" do
     doc = sample_document
     r = repeater(doc, :all) { :do_nothing }
 
-    (1..doc.page_count).all? { |i| r.match?(i) }.should be_true
+    assert (1..doc.page_count).all? { |i| r.match?(i) }
   end
 
   it "must provide an :odd filter" do
     doc = sample_document
     r = repeater(doc, :odd) { :do_nothing }
 
     odd, even = (1..doc.page_count).partition { |e| e % 2 == 1 }
 
-    odd.all? { |i| r.match?(i) }.should be_true
-    even.any? { |i| r.match?(i) }.should be_false
+    assert odd.all? { |i| r.match?(i) }
+    assert ! even.any? { |i| r.match?(i) }
   end
 
   it "must be able to filter by an array of page numbers" do
     doc = sample_document
     r = repeater(doc, [1,2,7]) { :do_nothing }
 
-    (1..10).select { |i| r.match?(i) }.should == [1,2,7]
+    assert_equal [1,2,7], (1..10).select { |i| r.match?(i) }
   end
 
   it "must be able to filter by a range of page numbers" do
     doc = sample_document
     r = repeater(doc, 2..4) { :do_nothing }
 
-    (1..10).select { |i| r.match?(i) }.should == [2,3,4]
+    assert_equal [2,3,4], (1..10).select { |i| r.match?(i) }
   end
 
   it "must be able to filter by an arbitrary proc" do
     doc = sample_document
     r = repeater(doc, lambda { |x| x == 1 or x % 3 == 0 })
 
-    (1..10).select { |i| r.match?(i) }.should == [1,3,6,9]
+    assert_equal [1,3,6,9], (1..10).select { |i| r.match?(i) }
   end
 
   it "must try to run a stamp if the page number matches" do
     doc = sample_document
     doc.expects(:stamp)
@@ -93,11 +93,11 @@
     doc.repeat(:all, :dynamic => true) do
       doc.draw_text "#@page #{doc.page_number}", :at => [500, 0]
     end
 
     text = PDF::Inspector::Text.analyze(doc.render)
-    text.strings.should == (1..10).to_a.map{|p| "Page #{p}"}
+    assert_equal (1..10).to_a.map{|p| "Page #{p}"}, text.strings
   end
 
   it "must treat any block as a closure (Document.new instance_eval form)" do
     doc = Prawn::Document.new(:skip_page_creation => true) do
       10.times { start_new_page }
@@ -108,11 +108,11 @@
         draw_text "#@page #{page_number}", :at => [500, 0]
       end
     end
 
     text = PDF::Inspector::Text.analyze(doc.render)
-    text.strings.should == (1..10).to_a.map{|p| "Page #{p}"}
+    assert_equal (1..10).to_a.map{|p| "Page #{p}"}, text.strings
   end
 
   def sample_document
     doc = Prawn::Document.new(:skip_page_creation => true)
     10.times { |e| doc.start_new_page }
@@ -148,10 +148,10 @@
         text.strings.include?("fill_color: 666666").should == false
         text.strings.include?("fill_color: 000000").should == true
         text.strings.include?("cap_style: round").should == false
         text.strings.include?("cap_style: butt").should == true
       end
-
+      
     end
 
   end
 
 end