Use new RSpec expectation syntax.

Author: mdub

spec/pith/config_spec.rb

@@ -8,13 +8,13 @@
   describe "#ignore_patterns" do
 
     it "is a set" do
-      config.ignore_patterns.should be_kind_of(Set)
+      expect(config.ignore_patterns).to be_kind_of(Set)
     end
 
     it "includes some sensible defaults" do
-      config.ignore_patterns.should include("_*")
-      config.ignore_patterns.should include(".git")
-      config.ignore_patterns.should include(".svn")
+      expect(config.ignore_patterns).to include("_*")
+      expect(config.ignore_patterns).to include(".git")
+      expect(config.ignore_patterns).to include(".svn")
     end
 
   end
@@ -23,19 +23,19 @@
 
     it "adds to ignore_patterns" do
       config.ignore("foo")
-      config.ignore_patterns.should be_member('foo')
+      expect(config.ignore_patterns).to be_member('foo')
     end
 
     it "adds multiple patterns to ignore_patterns (when passed multiple arguments)" do
       config.ignore("foo", "bar")
-      config.ignore_patterns.should be_member('foo')
-      config.ignore_patterns.should be_member('bar')
+      expect(config.ignore_patterns).to be_member('foo')
+      expect(config.ignore_patterns).to be_member('bar')
     end
 
     it "adds multiple patterns to ignore_patterns (when passed an array)" do
       config.ignore(["foo", "bar"])
-      config.ignore_patterns.should be_member('foo')
-      config.ignore_patterns.should be_member('bar')
+      expect(config.ignore_patterns).to be_member('foo')
+      expect(config.ignore_patterns).to be_member('bar')
     end
 
   end

spec/pith/input_spec.rb

@@ -24,12 +24,12 @@ def make_input(path)
       make_input("dir/some_page.html.md.erb")
     end
 
-    it { should be_template }
+    it { is_expected.to be_template }
 
     describe "#title" do
 
       it "is based on last component of filename" do
-        subject.title.should == "Some page"
+        expect(subject.title).to eq("Some page")
       end
 
       it "can be over-ridden in metadata" do
@@ -38,31 +38,31 @@ def make_input(path)
           i.puts "title: Blah blah"
           i.puts "..."
         end
-        input.title.should == "Blah blah"
+        expect(input.title).to eq("Blah blah")
       end
 
     end
 
     describe "#output" do
 
       it "returns an Output" do
-        subject.output.should_not be_nil
+        expect(subject.output).not_to be_nil
       end
 
     end
 
     describe "#output_path" do
 
       it "excludes the template-type extensions" do
-        subject.output_path.should == Pathname("dir/some_page.html")
+        expect(subject.output_path).to eq(Pathname("dir/some_page.html"))
       end
 
     end
 
     describe "#pipeline" do
 
       it "is a list of Tilt processors" do
-        subject.pipeline.should == [Tilt["erb"], Tilt["md"]]
+        expect(subject.pipeline).to eq([Tilt["erb"], Tilt["md"]])
       end
 
     end
@@ -75,11 +75,11 @@ def make_input(path)
       make_input("dir/some_image.gif")
     end
 
-    it { should_not be_template }
+    it { is_expected.not_to be_template }
 
     describe "pipeline" do
       it "should be empty" do
-        subject.pipeline.should be_empty
+        expect(subject.pipeline).to be_empty
       end
     end
 
@@ -93,7 +93,7 @@ def make_input(path)
 
     describe "output" do
       it "should be nil" do
-        subject.output.should be_nil
+        expect(subject.output).to be_nil
       end
     end
 

spec/pith/pathname_ext_spec.rb

@@ -8,20 +8,20 @@
   describe "#in?" do
 
     it "returns false for siblings" do
-      pathname.in?("foo/baz").should == false
+      expect(pathname.in?("foo/baz")).to eq(false)
     end
 
     it "returns true for ancestors" do
-      pathname.in?("foo").should == true
+      expect(pathname.in?("foo")).to eq(true)
     end
 
     it "returns false for other prefixes" do
-      pathname.in?("fo").should == false
-      pathname.in?("foo/b").should == false
+      expect(pathname.in?("fo")).to eq(false)
+      expect(pathname.in?("foo/b")).to eq(false)
     end
 
     it "returns false for itself" do
-      pathname.in?("foo/bar").should == false
+      expect(pathname.in?("foo/bar")).to eq(false)
     end
 
   end

spec/pith/plugins/publication_spec.rb

@@ -11,22 +11,22 @@
   describe "#published_at" do
 
     it "defaults to nil" do
-      @template.published_at.should be_nil
+      expect(@template.published_at).to be_nil
     end
 
     it "is derived by parsing the 'published' meta-field" do
       @template.meta["published"] = "25 Dec 1999 22:30"
-      @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
+      expect(@template.published_at).to eq(Time.local(1999, 12, 25, 22, 30))
     end
 
     it "honours any parsing (of Time) that yaml may do on the 'published' meta-field" do
       @template.meta["published"] = Time.local(1999, 12, 25, 22, 30)
-      @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
+      expect(@template.published_at).to eq(Time.local(1999, 12, 25, 22, 30))
     end
 
     it "honours any parsing (to Date) of time that yaml may do on the 'published' meta-field" do
       @template.meta["published"] = Date.new(1999, 12, 25)
-      @template.published_at.should == Time.local(1999, 12, 25)
+      expect(@template.published_at).to eq(Time.local(1999, 12, 25))
     end
 
   end
@@ -35,18 +35,18 @@
 
     it "defaults to #published_at" do
       @template.meta["published"] = "25 Dec 1999 22:30"
-      @template.updated_at.should == Time.local(1999, 12, 25, 22, 30)
+      expect(@template.updated_at).to eq(Time.local(1999, 12, 25, 22, 30))
     end
 
     it "can be overridden with an 'updated' meta-field" do
       @template.meta["published"] = "25 Dec 1999 22:30"
       @template.meta["updated"] = "1 Jan 2000 03:00"
-      @template.updated_at.should == Time.local(2000, 1, 1, 3, 0)
+      expect(@template.updated_at).to eq(Time.local(2000, 1, 1, 3, 0))
     end
 
     it "honours any parsing of time that yaml may do on the 'updated' meta-field" do
       @template.meta["updated"] = Date.new(2000, 1, 1)
-      @template.updated_at.should == Time.local(2000, 1, 1)
+      expect(@template.updated_at).to eq(Time.local(2000, 1, 1))
     end
 
   end

spec/pith/project_spec.rb

@@ -14,7 +14,7 @@
     end
 
     it "creates the output directory" do
-      $output_dir.should be_directory
+      expect($output_dir).to be_directory
     end
 
   end
@@ -31,22 +31,22 @@
 
       it "returns an Input object" do
         @input = @project.input("input.html.haml")
-        @input.should be_kind_of(Pith::Input)
-        @input.file.should == @input_file
+        expect(@input).to be_kind_of(Pith::Input)
+        expect(@input.file).to eq(@input_file)
       end
 
       it "returns the same object the second time" do
         first_time = @project.input("input.html.haml")
         second_time = @project.input("input.html.haml")
-        second_time.should equal(first_time)
+        expect(second_time).to equal(first_time)
       end
 
     end
 
     describe "(with an invalid input path)" do
 
       it "returns nil" do
-        @project.input("bogus.path").should be_nil
+        expect(@project.input("bogus.path")).to be_nil
       end
 
     end
@@ -66,8 +66,8 @@
       let(:output) { @project.output("input.html") }
 
       it "returns the matching Output" do
-        output.should be_kind_of(Pith::Output)
-        output.file.should == $output_dir + "input.html"
+        expect(output).to be_kind_of(Pith::Output)
+        expect(output.file).to eq($output_dir + "input.html")
       end
 
     end
@@ -77,7 +77,7 @@
       let(:output) { @project.output("bogus.html.haml") }
 
       it "returns nil" do
-        output.should be_nil
+        expect(output).to be_nil
       end
 
     end
@@ -90,26 +90,26 @@
       @input_file = $input_dir + "input.html.haml"
       @input_file.touch(Time.now - 10)
       @project.sync
-      @project.input("input.html.haml").should_not be_nil
-      @project.output("input.html").should_not be_nil
+      expect(@project.input("input.html.haml")).not_to be_nil
+      expect(@project.output("input.html")).not_to be_nil
       FileUtils.rm(@input_file)
       @project.sync
     end
 
     describe "#input" do
       it "returns nil" do
-        @project.input("input.html.haml").should be_nil
+        expect(@project.input("input.html.haml")).to be_nil
       end
     end
 
     describe "#output" do
       it "returns nil" do
-        @project.output("input.html").should be_nil
+        expect(@project.output("input.html")).to be_nil
       end
     end
 
     it "doesn't confuse subsequent calls to #sync" do
-      proc { @project.sync }.should_not raise_error
+      expect { @project.sync }.not_to raise_error
     end
 
   end

spec/pith/server_spec.rb

@@ -51,12 +51,12 @@
     let(:request_uri) { "/bogus.html" }
 
     it "does not build the output" do
-      output.should_not_receive(:build)
+      expect(output).not_to receive(:build)
       result_path
     end
 
     it "passes on the env unchanged" do
-      result_path.should == "/bogus.html"
+      expect(result_path).to eq("/bogus.html")
     end
 
   end
@@ -68,12 +68,12 @@ def self.can_request_output(description, uri)
       let(:request_uri) { uri }
 
       it "builds the output" do
-        output.should_receive(:build)
+        expect(output).to receive(:build)
         result_path
       end
 
       it "passes on request" do
-        result_path.should == "/dir/index.html"
+        expect(result_path).to eq("/dir/index.html")
       end
 
     end
@@ -91,8 +91,8 @@ def self.can_request_output(description, uri)
     let(:request_uri) { "/dir" }
 
     it "redirects" do
-      result_status.should == 302
-      result_headers["Location"].should == "/dir/"
+      expect(result_status).to eq(302)
+      expect(result_headers["Location"]).to eq("/dir/")
     end
 
   end

spec/spec_helper.rb

@@ -9,6 +9,8 @@
 
 RSpec.configure do |config|
 
+  config.raise_errors_for_deprecations!
+
   config.before(:suite) do
     [$input_dir, $output_dir].each do |dir|
       dir.rmtree if dir.exist?