rspec-core 2.12.2 → 2.13.0

data/spec/rspec/core/pending_example_spec.rb

@@ -19,7 +19,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with('just because')
+      expect(example).to be_pending_with('just because')
     end
 
     it "sets the message to 'No reason given' if :pending => true" do
@@ -29,7 +29,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with('No reason given')
+      expect(example).to be_pending_with('No reason given')
     end
   end
 
@@ -40,7 +40,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with('Not yet implemented')
+      expect(example).to be_pending_with('Not yet implemented')
     end
   end
 
@@ -53,7 +53,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
+      expect(example).to be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
     end
   end
 
@@ -62,15 +62,15 @@ describe "an example" do
       it "does not have an auto-generated description" do
         group = RSpec::Core::ExampleGroup.describe('group') do
           it "checks something" do
-            (3+4).should eq(7)
+            expect((3+4)).to eq(7)
           end
           pending do
-            "string".reverse.should eq("gnirts")
+            expect("string".reverse).to eq("gnirts")
           end
         end
         example = group.examples.last
         example.run(group.new, stub.as_null_object)
-        example.description.should match(/example at/)
+        expect(example.description).to match(/example at/)
       end
     end
 
@@ -78,7 +78,7 @@ describe "an example" do
       it "does not show any message" do
         group = RSpec::Core::ExampleGroup.describe('group') do
           it "checks something" do
-            (3+4).should eq(7)
+            expect((3+4)).to eq(7)
           end
           specify do
             pending
@@ -86,7 +86,7 @@ describe "an example" do
         end
         example = group.examples.last
         example.run(group.new, stub.as_null_object)
-        example.description.should match(/example at/)
+        expect(example.description).to match(/example at/)
       end
     end
   end
@@ -100,7 +100,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with('just because')
+      expect(example).to be_pending_with('just because')
     end
   end
 
@@ -123,45 +123,45 @@ describe "an example" do
 
       context "when given no options" do
         it "is listed as pending with the supplied message" do
-          run_example("just because").should be_pending_with("just because")
+          expect(run_example("just because")).to be_pending_with("just because")
         end
 
         it "is listed as pending with the default message when no message is given" do
-          run_example.should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
+          expect(run_example).to be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
       end
 
       context "when given a truthy :if option" do
         it "is listed as pending with the supplied message" do
-          run_example("just because", :if => true).should be_pending_with("just because")
+          expect(run_example("just because", :if => true)).to be_pending_with("just because")
         end
 
         it "is listed as pending with the default message when no message is given" do
-          run_example(:if => true).should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
+          expect(run_example(:if => true)).to be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
       end
 
       context "when given a falsey :if option" do
         it "runs the example and fails" do
-          run_example(                :if => false).should fail_with(ArgumentError)
-          run_example("just because", :if => false).should fail_with(ArgumentError)
+          expect(run_example(                :if => false)).to fail_with(ArgumentError)
+          expect(run_example("just because", :if => false)).to fail_with(ArgumentError)
         end
       end
 
       context "when given a truthy :unless option" do
         it "runs the example and fails" do
-          run_example(                :unless => true).should fail_with(ArgumentError)
-          run_example("just because", :unless => true).should fail_with(ArgumentError)
+          expect(run_example(                :unless => true)).to fail_with(ArgumentError)
+          expect(run_example("just because", :unless => true)).to fail_with(ArgumentError)
         end
       end
 
       context "when given a falsey :unless option" do
         it "is listed as pending with the supplied message" do
-          run_example("just because", :unless => false).should be_pending_with("just because")
+          expect(run_example("just because", :unless => false)).to be_pending_with("just because")
         end
 
         it "is listed as pending with the default message when no message is given" do
-          run_example(:unless => false).should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
+          expect(run_example(:unless => false)).to be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
       end
     end
@@ -172,47 +172,47 @@ describe "an example" do
       end
 
       it "passes" do
-        run_example("just because").should be_pending
+        expect(run_example("just because")).to be_pending
       end
     end
 
     context "that passes" do
       def run_example(*pending_args)
-        super(*pending_args) { 3.should eq(3) }
+        super(*pending_args) { expect(3).to eq(3) }
       end
 
       context "when given no options" do
         it "fails with a PendingExampleFixedError" do
-          run_example("just because").should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
-          run_example.should                 fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          expect(run_example("just because")).to fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          expect(run_example).to                 fail_with(RSpec::Core::Pending::PendingExampleFixedError)
         end
       end
 
       context "when given a truthy :if option" do
         it "fails with a PendingExampleFixedError" do
-          run_example("just because", :if => true).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
-          run_example(                :if => true).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          expect(run_example("just because", :if => true)).to fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          expect(run_example(                :if => true)).to fail_with(RSpec::Core::Pending::PendingExampleFixedError)
         end
       end
 
       context "when given a falsey :if option" do
         it "runs the example and it passes" do
-          run_example(                :if => false).should pass
-          run_example("just because", :if => false).should pass
+          expect(run_example(                :if => false)).to pass
+          expect(run_example("just because", :if => false)).to pass
         end
       end
 
       context "when given a truthy :unless option" do
         it "runs the example and it passes" do
-          run_example(                :unless => true).should pass
-          run_example("just because", :unless => true).should pass
+          expect(run_example(                :unless => true)).to pass
+          expect(run_example("just because", :unless => true)).to pass
         end
       end
 
       context "when given a falsey :unless option" do
         it "fails with a PendingExampleFixedError" do
-          run_example("just because", :unless => false).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
-          run_example(                :unless => false).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          expect(run_example("just because", :unless => false)).to fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          expect(run_example(                :unless => false)).to fail_with(RSpec::Core::Pending::PendingExampleFixedError)
         end
       end
     end

data/spec/rspec/core/project_initializer_spec.rb

@@ -21,7 +21,7 @@ module RSpec::Core
 
           it "generates a .rspec" do
             command_line_config.run
-            File.read('.rspec').should =~ /--color\n--format progress/m
+            expect(File.read('.rspec')).to match /--color\n--format progress/m
           end
         end
 
@@ -35,7 +35,7 @@ module RSpec::Core
           it "doesn't create a new one" do
             File.open('.rspec', 'w') {|f| f << '--color'}
             command_line_config.run
-            File.read('.rspec').should eq('--color')
+            expect(File.read('.rspec')).to eq('--color')
           end
         end
 
@@ -47,7 +47,7 @@ module RSpec::Core
 
           it "generates a spec/spec_helper.rb" do
             command_line_config.run
-            File.read('spec/spec_helper.rb').should =~ /RSpec\.configure do \|config\|/m
+            expect(File.read('spec/spec_helper.rb')).to match /RSpec\.configure do \|config\|/m
           end
         end
 
@@ -64,7 +64,7 @@ module RSpec::Core
             random_content = "content #{rand}"
             File.open('spec/spec_helper.rb', 'w') {|f| f << random_content}
             command_line_config.run
-            File.read('spec/spec_helper.rb').should eq(random_content)
+            expect(File.read('spec/spec_helper.rb')).to eq(random_content)
           end
         end
 
@@ -82,13 +82,13 @@ module RSpec::Core
           it "removes it if confirmed" do
             command_line_config.stub(:gets => 'yes')
             command_line_config.run
-            File.exist?('autotest/discover.rb').should be_false
+            expect(File.exist?('autotest/discover.rb')).to be_false
           end
 
           it "leaves it if not confirmed" do
             command_line_config.stub(:gets => 'no')
             command_line_config.run
-            File.exist?('autotest/discover.rb').should be_true
+            expect(File.exist?('autotest/discover.rb')).to be_true
           end
         end
 
@@ -106,13 +106,13 @@ module RSpec::Core
           it "removes it if confirmed" do
             command_line_config.stub(:gets => 'yes')
             command_line_config.run
-            File.exist?('lib/tasks/rspec.rake').should be_false
+            expect(File.exist?('lib/tasks/rspec.rake')).to be_false
           end
 
           it "leaves it if not confirmed" do
             command_line_config.stub(:gets => 'no')
             command_line_config.run
-            File.exist?('lib/tasks/rspec.rake').should be_true
+            expect(File.exist?('lib/tasks/rspec.rake')).to be_true
           end
         end
       end

data/spec/rspec/core/rake_task_spec.rb

@@ -23,31 +23,31 @@ module RSpec::Core
       let(:task) { RakeTask.new(:task_name) }
 
       it "correctly sets the name" do
-        task.name.should == :task_name
+        expect(task.name).to eq :task_name
       end
     end
 
     context "with args passed to the rake task" do
       it "correctly passes along task arguments" do
         task = RakeTask.new(:rake_task_args, :files) do |t, args|
-          args[:files].should == "first_spec.rb"
+          expect(args[:files]).to eq "first_spec.rb"
         end
 
         task.should_receive(:run_task) { true }
-        Rake.application.invoke_task("rake_task_args[first_spec.rb]").should be_true
+        expect(Rake.application.invoke_task("rake_task_args[first_spec.rb]")).to be_true
       end
     end
 
     context "default" do
       it "renders rspec" do
-        spec_command.should =~ /^#{ruby} -S rspec/
+        expect(spec_command).to match /^#{ruby} -S rspec/
       end
     end
 
     context "with rcov" do
       it "renders rcov" do
         with_rcov do
-          spec_command.should =~ /^#{ruby} -S rcov/
+          expect(spec_command).to match /^#{ruby} -S rcov/
         end
       end
     end
@@ -55,7 +55,7 @@ module RSpec::Core
     context "with ruby options" do
       it "renders them before -S" do
           task.ruby_opts = "-w"
-          spec_command.should =~ /^#{ruby} -w -S rspec/
+          expect(spec_command).to match /^#{ruby} -w -S rspec/
       end
     end
 
@@ -63,7 +63,7 @@ module RSpec::Core
       context "with rcov=false (default)" do
         it "does not add the rcov options to the command" do
           task.rcov_opts = '--exclude "mocks"'
-          spec_command.should_not =~ /--exclude "mocks"/
+          expect(spec_command).not_to match /--exclude "mocks"/
         end
       end
 
@@ -71,13 +71,13 @@ module RSpec::Core
         it "renders them after rcov" do
           task.rcov = true
           task.rcov_opts = '--exclude "mocks"'
-          spec_command.should =~ /rcov.*--exclude "mocks"/
+          expect(spec_command).to match /rcov.*--exclude "mocks"/
         end
 
         it "ensures that -Ispec:lib is in the resulting command" do
           task.rcov = true
           task.rcov_opts = '--exclude "mocks"'
-          spec_command.should =~ /rcov.*-Ispec:lib/
+          expect(spec_command).to match /rcov.*-Ispec:lib/
         end
       end
     end
@@ -88,13 +88,13 @@ module RSpec::Core
           task.stub(:files_to_run) { "this.rb that.rb" }
           task.rcov = true
           task.rspec_opts = "-Ifoo"
-          spec_command.should =~ /this.rb that.rb -- -Ifoo/
+          expect(spec_command).to match /this.rb that.rb -- -Ifoo/
         end
       end
       context "with rcov=false (default)" do
         it "adds the rspec_opts" do
           task.rspec_opts = "-Ifoo"
-          spec_command.should =~ /rspec.*-Ifoo/
+          expect(spec_command).to match /rspec.*-Ifoo/
         end
       end
     end
@@ -109,13 +109,13 @@ module RSpec::Core
         task.__send__(:files_to_run)
       end
 
-      orderings.uniq.size.should eq(1)
+      expect(orderings.uniq.size).to eq(1)
     end
 
     context "with SPEC env var set" do
       it "sets files to run" do
         with_env_vars 'SPEC' => 'path/to/file' do
-          task.__send__(:files_to_run).should eq(["path/to/file"])
+          expect(task.__send__(:files_to_run)).to eq(["path/to/file"])
         end
       end
 
@@ -134,7 +134,7 @@ module RSpec::Core
       # since the config block is deferred til task invocation, must fake
       # calling the task so the expected pattern is picked up
       task.should_receive(:run_task) { true }
-      Rake.application.invoke_task(task.name).should be_true
+      expect(Rake.application.invoke_task(task.name)).to be_true
 
       specify_consistent_ordering_of_files_to_run('a/*.rb', task)
     end
@@ -145,7 +145,7 @@ module RSpec::Core
         ["first_spec.rb", "second_\"spec.rb", "third_\'spec.rb", "fourth spec.rb"].each do |file_name|
           FileUtils.touch(File.join(Dir.tmpdir, file_name))
         end
-        task.__send__(:files_to_run).sort.should eq([
+        expect(task.__send__(:files_to_run).sort).to eq([
           File.join(Dir.tmpdir, "first_spec.rb"),
           File.join(Dir.tmpdir, "fourth\\ spec.rb"),
           File.join(Dir.tmpdir, "second_\\\"spec.rb"),
@@ -170,7 +170,7 @@ module RSpec::Core
         FileUtils.ln_s bars_dir, File.join(project_dir, "spec/bars")
 
         FileUtils.cd(project_dir) do
-          RakeTask.new.__send__(:files_to_run).sort.should eq([
+          expect(RakeTask.new.__send__(:files_to_run).sort).to eq([
             "./spec/bars/bar_spec.rb",
             "./spec/foos/foo_spec.rb"
           ])

data/spec/rspec/core/reporter_spec.rb

@@ -44,7 +44,7 @@ module RSpec::Core
 
         group.run(Reporter.new(formatter))
 
-        order.should eq([
+        expect(order).to eq([
            "Started: root",
            "Started: context 1",
            "Finished: context 1",
@@ -96,7 +96,7 @@ module RSpec::Core
         reporter = Reporter.new
         yielded = nil
         reporter.report(3) {|r| yielded = r}
-        yielded.should eq(reporter)
+        expect(yielded).to eq(reporter)
       end
     end
 
@@ -113,7 +113,7 @@ module RSpec::Core
         end
 
         reporter.finish 1234
-        duration.should be < 0.2
+        expect(duration).to be < 0.2
       end
     end
   end

data/spec/rspec/core/resources/formatter_specs.rb

@@ -8,7 +8,7 @@ describe "pending command with block format" do
   context "with content that would fail" do
     it "is pending" do
       pending do
-        1.should eq(2)
+        expect(1).to eq(2)
       end
     end
   end
@@ -16,7 +16,7 @@ describe "pending command with block format" do
   context "with content that would pass" do
     it "fails" do
       pending do
-        1.should eq(1)
+        expect(1).to eq(1)
       end
     end
   end
@@ -24,13 +24,13 @@ end
 
 describe "passing spec" do
   it "passes" do
-    1.should eq(1)
+    expect(1).to eq(1)
   end
 end
 
 describe "failing spec" do
   it "fails" do
-    1.should eq(2)
+    expect(1).to eq(2)
   end
 end
 

data/spec/rspec/core/ruby_project_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 module RSpec
   module Core
     describe RubyProject do
@@ -7,14 +9,14 @@ module RSpec
         context "with ancestor containing spec directory" do
           it "returns ancestor containing the spec directory" do
             RubyProject.stub(:ascend_until).and_return('foodir')
-            RubyProject.determine_root.should eq("foodir")
+            expect(RubyProject.determine_root).to eq("foodir")
           end
         end
 
         context "without ancestor containing spec directory" do
           it "returns current working directory" do
             RubyProject.stub(:find_first_parent_containing).and_return(nil)
-            RubyProject.determine_root.should eq(".")
+            expect(RubyProject.determine_root).to eq(".")
           end
         end