Merge pull request #23 from jonmagic/update-specs-to-use-expect

Specify rspec version and update specs to expect syntax

Author: jonmagic

Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 gemspec
 gem "rake"
-gem "rspec"
+gem "rspec", "~> 3.2.0"

spec/lib/grim/image_magick_processor_spec.rb

@@ -16,7 +16,7 @@
     end
 
     it "should return page count" do
-      @processor.count(fixture_path("smoker.pdf")).should == 25
+      expect(@processor.count(fixture_path("smoker.pdf"))).to eq(25)
     end
   end
 
@@ -30,13 +30,13 @@
 
     it "should create the file" do
       @processor.save(@pdf, 0, @path, {})
-      File.exist?(@path).should be_true
+      expect(File.exist?(@path)).to be(true)
     end
 
     it "should use default width of 1024" do
       @processor.save(@pdf, 0, @path, {})
       width, height = dimensions_for_path(@path)
-      width.should == 1024
+      expect(width).to eq(1024)
     end
   end
 
@@ -50,7 +50,7 @@
 
     it "should set width" do
       width, height = dimensions_for_path(@path)
-      width.should == 20
+      expect(width).to eq(20)
     end
   end
 
@@ -67,7 +67,7 @@
       Grim::ImageMagickProcessor.new.save(@pdf, 0, @path, {:quality => 90})
       higher_size = File.size(@path)
 
-      (lower_size < higher_size).should be_true
+      expect(lower_size < higher_size).to be(true)
     end
   end
 
@@ -81,7 +81,7 @@
       lower_time  = Benchmark.realtime { Grim::ImageMagickProcessor.new.save(@pdf, 0, @path, {:density => 72}) }
       higher_time = Benchmark.realtime { Grim::ImageMagickProcessor.new.save(@pdf, 0, @path, {:density => 300}) }
 
-      (lower_time < higher_time).should be_true
+      expect(lower_time < higher_time).to be(true)
     end
   end
 
@@ -99,7 +99,7 @@
       file1_size = File.stat(@path1).size
       file2_size = File.stat(@path2).size
 
-      file1_size.should_not == file2_size
+      expect(file1_size).to_not eq(file2_size)
     end
   end
-end
+end

spec/lib/grim/multi_processor_spec.rb

@@ -14,29 +14,29 @@
 
   describe "#count" do
     it "should try processors until it succeeds" do
-      @failure.stub(:count){""}
-      @success.should_receive(:count).and_return(30)
-      @extra.should_not_receive(:count)
+      allow(@failure).to receive(:count).and_return("")
+      expect(@success).to receive(:count).and_return(30)
+      expect(@extra).to_not receive(:count)
 
       @processor.count(@path)
     end
   end
 
   describe "#save" do
     it "should try processors until it succeeds" do
-      @failure.stub(:save){false}
-      @success.should_receive(:save).and_return(true)
-      @extra.should_not_receive(:save)
+      allow(@failure).to receive(:save).and_return(false)
+      expect(@success).to receive(:save).and_return(true)
+      expect(@extra).to_not receive(:save)
 
       @processor.save(@pdf, 0, @path, {})
     end
 
     it "should raise error if all processors fail" do
-      @failure.should_receive(:save).and_return(false)
-      @success.should_receive(:save).and_return(false)
-      @extra.should_receive(:save).and_return(false)
+      expect(@failure).to receive(:save).and_return(false)
+      expect(@success).to receive(:save).and_return(false)
+      expect(@extra).to receive(:save).and_return(false)
 
-      lambda { @processor.save(@pdf, 0, @path, {}) }.should raise_error(Grim::UnprocessablePage)
+      expect { @processor.save(@pdf, 0, @path, {}) }.to raise_error(Grim::UnprocessablePage)
     end
   end
-end
+end

spec/lib/grim/page_spec.rb

@@ -8,7 +8,7 @@
   end
 
   it "should have number" do
-    Grim::Page.new(Grim::Pdf.new(fixture_path("smoker.pdf")), 1).number.should == 2
+    expect(Grim::Page.new(Grim::Pdf.new(fixture_path("smoker.pdf")), 1).number).to eq(2)
   end
 
   describe "#save" do
@@ -18,7 +18,7 @@
     end
 
     it "should call Grim.processor.save with pdf, index, path, and options" do
-      Grim.processor.should_receive(:save).with(@pdf, 0, @path, {})
+      expect(Grim.processor).to receive(:save).with(@pdf, 0, @path, {})
       @pdf[0].save(@path)
     end
   end
@@ -30,8 +30,8 @@
     end
 
     it "raises an exception" do
-      lambda { @pdf[0].save(nil) }.should raise_error(Grim::PathMissing)
-      lambda { @pdf[0].save('  ') }.should raise_error(Grim::PathMissing)
+      expect { @pdf[0].save(nil) }.to raise_error(Grim::PathMissing)
+      expect { @pdf[0].save('  ') }.to raise_error(Grim::PathMissing)
     end
   end
 
@@ -47,13 +47,15 @@
   describe "#text" do
     it "should return the text from the selected page" do
       pdf = Grim::Pdf.new(fixture_path("smoker.pdf"))
-      pdf[1].text.should == "Step 1: get someone to print this curve for you to scale, 72” wide\nStep 2: Get a couple 55 gallon drums\n\n\f"
+      expect(pdf[1].text).to \
+        eq("Step 1: get someone to print this curve for you to scale, 72” wide\nStep 2: Get a couple 55 gallon drums\n\n\f")
     end
 
     it "works with full path to pdftotext" do
       pdftotext_path = `which pdftotext`.chomp
       pdf = Grim::Pdf.new(fixture_path("smoker.pdf"), pdftotext_path: pdftotext_path)
-      pdf[1].text.should == "Step 1: get someone to print this curve for you to scale, 72” wide\nStep 2: Get a couple 55 gallon drums\n\n\f"
+      expect(pdf[1].text).to \
+        eq("Step 1: get someone to print this curve for you to scale, 72” wide\nStep 2: Get a couple 55 gallon drums\n\n\f")
     end
   end
 end

spec/lib/grim/pdf_spec.rb

@@ -4,23 +4,26 @@
 describe Grim::Pdf do
 
   it "should have a path" do
-    Grim::Pdf.new(fixture_path("smoker.pdf")).path.should == fixture_path("smoker.pdf")
+    pdf = Grim::Pdf.new(fixture_path("smoker.pdf"))
+    expect(pdf.path).to eq(fixture_path("smoker.pdf"))
   end
 
   describe "#initialize" do
     it "should raise an error if pdf does not exist" do
-      lambda { Grim::Pdf.new(fixture_path("booboo.pdf")) }.should raise_error(Grim::PdfNotFound)
+      expect {
+        Grim::Pdf.new(fixture_path("booboo.pdf"))
+      }.to raise_error(Grim::PdfNotFound)
     end
 
     it "should set path on pdf" do
       pdf = Grim::Pdf.new(fixture_path("smoker.pdf"))
-      pdf.path.should == fixture_path("smoker.pdf")
+      expect(pdf.path).to eq(fixture_path("smoker.pdf"))
     end
   end
 
   describe "#count" do
     it "should call Grim.processor.count with pdf path" do
-      Grim.processor.should_receive(:count).with(fixture_path("smoker.pdf"))
+      expect(Grim.processor).to receive(:count).with(fixture_path("smoker.pdf"))
       pdf = Grim::Pdf.new(fixture_path("smoker.pdf"))
       pdf.count
     end
@@ -32,19 +35,19 @@
     end
 
     it "should raise Grim::PageDoesNotExist if page doesn't exist" do
-      lambda { @pdf[25] }.should raise_error(Grim::PageNotFound)
+      expect { @pdf[25] }.to raise_error(Grim::PageNotFound)
     end
 
     it "should return an instance of Grim::Page if page exists" do
-      @pdf[24].class.should == Grim::Page
+      expect(@pdf[24].class).to eq(Grim::Page)
     end
   end
 
   describe "#each" do
     it "should be iterable" do
       pdf = Grim::Pdf.new(fixture_path("smoker.pdf"))
-      pdf.map {|p| p.number }.should == (1..25).to_a
+      expect(pdf.map {|p| p.number }).to eq((1..25).to_a)
     end
   end
 
-end
+end

spec/lib/grim_spec.rb

@@ -3,32 +3,32 @@
 
 describe Grim do
   it "should have a default processor" do
-    Grim.processor.class.should == Grim::ImageMagickProcessor
+    expect(Grim.processor.class).to eq(Grim::ImageMagickProcessor)
   end
 
   it "should have a VERSION constant" do
-    Grim.const_defined?('VERSION').should be_true
+    expect(Grim.const_defined?('VERSION')).to be(true)
   end
 
   it "should have WIDTH constant set to 1024" do
-    Grim::WIDTH.should == 1024
+    expect(Grim::WIDTH).to eq(1024)
   end
 
   it "should have QUALITY constant set to 90" do
-    Grim::QUALITY.should == 90
+    expect(Grim::QUALITY).to eq(90)
   end
 
   it "should have DENSITY constant set to 300" do
-    Grim::DENSITY.should == 300
+    expect(Grim::DENSITY).to eq(300)
   end
 
   it "should have COLORSPACE constant set to 'RGB'" do
-    Grim::COLORSPACE.should == 'RGB'
+    expect(Grim::COLORSPACE).to eq('RGB')
   end
 
   describe "#reap" do
     it "should return an instance of Grim::Pdf" do
-      Grim.reap(fixture_path("smoker.pdf")).class.should == Grim::Pdf
+      expect(Grim.reap(fixture_path("smoker.pdf")).class).to eq(Grim::Pdf)
     end
   end
-end
+end