spec/repeater_spec.rb in prawn-0.12.0 vs spec/repeater_spec.rb in prawn-0.13.0

@@ -8,59 +8,59 @@
     doc = sample_document
     doc.expects(:create_stamp).with("prawn_repeater(#{orig_count})")
 
     r = repeater(doc, :all) { :do_nothing }
 
-    assert_equal orig_count + 1,  Prawn::Repeater.count
+    Prawn::Repeater.count.should == orig_count + 1
   end
 
   it "must provide an :all filter" do
     doc = sample_document
     r = repeater(doc, :all) { :do_nothing }
 
-    assert (1..doc.page_count).all? { |i| r.match?(i) }
+    (1..doc.page_count).all? { |i| r.match?(i) }.should be_true
   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 }
 
-    assert odd.all? { |i| r.match?(i) }
-    assert ! even.any? { |i| r.match?(i) }
+    odd.all? { |i| r.match?(i) }.should be_true
+    even.any? { |i| r.match?(i) }.should be_false
   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 }
 
-    assert_equal [1,2,7], (1..10).select { |i| r.match?(i) }
+    (1..10).select { |i| r.match?(i) }.should == [1,2,7]
   end
 
   it "must be able to filter by a range of page numbers" do
     doc = sample_document
     r = repeater(doc, 2..4) { :do_nothing }
 
-    assert_equal [2,3,4], (1..10).select { |i| r.match?(i) }
+    (1..10).select { |i| r.match?(i) }.should == [2,3,4]
   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 })
 
-    assert_equal [1,3,6,9], (1..10).select { |i| r.match?(i) }
+    (1..10).select { |i| r.match?(i) }.should == [1,3,6,9]
   end
 
   it "must try to run a stamp if the page number matches" do
     doc = sample_document
     doc.expects(:stamp)
 
     repeater(doc, :odd).run(3)
   end
 
-  it "must not try to run a stamp if the page number matches" do
+  it "must not try to run a stamp unless the page number matches" do
     doc = sample_document
 
     doc.expects(:stamp).never
     repeater(doc, :odd).run(2)
   end
@@ -70,20 +70,34 @@
 
     doc.expects(:stamp).never
     (1..10).each { |p| repeater(doc, :all, true){:do_nothing}.run(p) }
   end
 
+  it "must try to run a block if the page number matches" do
+    doc = sample_document
+
+    doc.expects(:draw_text).twice
+    (1..10).each { |p| repeater(doc, [1,2], true){doc.draw_text "foo"}.run(p) }
+  end
+
+  it "must not try to run a block unless the page number matches" do
+    doc = sample_document
+
+    doc.expects(:draw_text).never
+    repeater(doc, :odd, true){doc.draw_text "foo"}.run(2)
+  end
+
   it "must treat any block as a closure" do
     doc = sample_document
 
     @page = "Page" # ensure access to ivars
     doc.repeat(:all, :dynamic => true) do
       doc.draw_text "#@page #{doc.page_number}", :at => [500, 0]
     end
 
     text = PDF::Inspector::Text.analyze(doc.render)
-    assert_equal (1..10).to_a.map{|p| "Page #{p}"}, text.strings
+    text.strings.should == (1..10).to_a.map{|p| "Page #{p}"}
   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 }
@@ -94,11 +108,11 @@
         draw_text "#@page #{page_number}", :at => [500, 0]
       end
     end
 
     text = PDF::Inspector::Text.analyze(doc.render)
-    assert_equal (1..10).to_a.map{|p| "Page #{p}"}, text.strings
+    text.strings.should == (1..10).to_a.map{|p| "Page #{p}"}
   end
 
   def sample_document
     doc = Prawn::Document.new(:skip_page_creation => true)
     10.times { |e| doc.start_new_page }
@@ -134,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