rspec-core 2.6.0 → 2.7.0.rc1

data/spec/rspec/core/configuration_options_spec.rb

@@ -14,6 +14,17 @@ describe RSpec::Core::ConfigurationOptions do
     config_options_object(*args).options
   end
 
+  it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
+    begin
+      orig_home = ENV.delete("HOME")
+      coo = RSpec::Core::ConfigurationOptions.new([])
+      coo.should_receive(:warn)
+      coo.parse_options
+    ensure
+      ENV["HOME"] = orig_home
+    end
+  end
+
   describe "#configure" do
     it "sends libs before requires" do
       opts = config_options_object(*%w[--require a/path -I a/lib])
@@ -30,6 +41,29 @@ describe RSpec::Core::ConfigurationOptions do
       config.should_receive(:add_formatter).ordered
       opts.configure(config)
     end
+
+    it "sends default_path before files_or_directories_to_run" do
+      opts = config_options_object(*%w[--default_path spec])
+      config = double("config").as_null_object
+      config.should_receive(:default_path=).ordered
+      config.should_receive(:files_or_directories_to_run=).ordered
+      opts.configure(config)
+    end
+
+    it "sends pattern before files_or_directories_to_run" do
+      opts = config_options_object(*%w[--pattern **/*.spec])
+      config = double("config").as_null_object
+      config.should_receive(:pattern=).ordered
+      config.should_receive(:files_or_directories_to_run=).ordered
+      opts.configure(config)
+    end
+
+    it "merges the :exclusion_filter option with the default exclusion_filter" do
+      opts = config_options_object(*%w[--tag ~slow])
+      config = RSpec::Core::Configuration.new
+      opts.configure(config)
+      config.exclusion_filter.should have_key(:slow)
+    end
   end
 
   describe "-c, --color, and --colour" do
@@ -44,6 +78,14 @@ describe RSpec::Core::ConfigurationOptions do
     it "sets :color_enabled => false" do
       parse_options('--no-color').should include(:color_enabled => false)
     end
+
+    it "overrides previous :color_enabled => true" do
+      parse_options('--color', '--no-color').should include(:color_enabled => false)
+    end
+
+    it "gets overriden by a subsequent :color_enabled => true" do
+      parse_options('--no-color', '--color').should include(:color_enabled => true)
+    end
   end
 
   describe "-I" do
@@ -85,8 +127,13 @@ describe RSpec::Core::ConfigurationOptions do
 
   describe '--line_number' do
     it "sets :line_number" do
-      parse_options('-l','3').should include(:line_number => '3')
-      parse_options('--line_number','3').should include(:line_number => '3')
+      parse_options('-l','3').should include(:line_numbers => ['3'])
+      parse_options('--line_number','3').should include(:line_numbers => ['3'])
+    end
+
+    it "can be specified multiple times" do
+      parse_options('-l','3', '-l', '6').should include(:line_numbers => ['3', '6'])
+      parse_options('--line_number','3', '--line_number', '6').should include(:line_numbers => ['3', '6'])
     end
   end
 
@@ -165,6 +212,21 @@ describe RSpec::Core::ConfigurationOptions do
 
   end
 
+  describe "--no-drb" do
+    it "disables drb" do
+      parse_options("--no-drb").should include(:drb => false)
+    end
+
+    it "overrides a previous drb => true" do
+      parse_options("--drb", "--no-drb").should include(:drb => false)
+    end
+
+    it "gets overriden by a subsquent drb => true" do
+      parse_options("--no-drb", "--drb").should include(:drb => true)
+    end
+  end
+
+
   describe "files_or_directories_to_run" do
     it "parses files from '-c file.rb dir/file.rb'" do
       parse_options("-c", "file.rb", "dir/file.rb").should include(:files_or_directories_to_run => ["file.rb", "dir/file.rb"])
@@ -185,9 +247,17 @@ describe RSpec::Core::ConfigurationOptions do
 
     it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
       parse_options("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
-
     end
+  end
 
+  describe "default_path" do
+    it "gets set before files_or_directories_to_run" do
+      config = double("config").as_null_object
+      config.should_receive(:default_path=).ordered
+      config.should_receive(:files_or_directories_to_run=).ordered
+      opts = config_options_object("--default_path", "foo")
+      opts.configure(config)
+    end
   end
 
   # TODO ensure all options are output
@@ -205,17 +275,38 @@ describe RSpec::Core::ConfigurationOptions do
       config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
     end
 
+    context "with --example" do
+      it "includes --example" do
+        config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
+      end
+
+      it "unescapes characters which were escaped upon storing --example originally" do
+        config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
+      end
+    end
+
     context "with tags" do
-      it "includes the tags" do
+      it "includes the inclusion tags" do
         coo = config_options_object("--tag", "tag")
         coo.drb_argv.should eq(["--tag", "tag"])
       end
 
-      it "leaves tags intact" do
+      it "leaves inclusion tags intact" do
         coo = config_options_object("--tag", "tag")
         coo.drb_argv
         coo.options[:filter].should eq( {:tag=>true} )
       end
+
+      it "includes the exclusion tags" do
+        coo = config_options_object("--tag", "~tag")
+        coo.drb_argv.should eq(["--tag", "~tag"])
+      end
+
+      it "leaves exclusion tags intact" do
+        coo = config_options_object("--tag", "~tag")
+        coo.drb_argv
+        coo.options[:exclusion_filter].should eq( {:tag=>true} )
+      end
     end
 
     context "with formatters" do
@@ -239,8 +330,8 @@ describe RSpec::Core::ConfigurationOptions do
 
     context "--drb specified in ARGV" do
       it "renders all the original arguments except --drb" do
-        config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s -I path/a -I path/b --require path/c --require path/d])
+        config_options_object(*%w[ --drb --color --format s --example pattern --line_number 1 --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s -I path/a -I path/b --require path/c --require path/d])
       end
     end
 
@@ -248,8 +339,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --tty --format s --line_number 1 --example pattern --profile --backtrace ]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --tty --line_number 1 --example pattern --format s])
+        config_options_object(*%w[ --tty --format s --example pattern --line_number 1 --profile --backtrace ]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --tty --example pattern --line_number 1 --format s])
       end
     end
 
@@ -257,8 +348,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --drb --format s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s])
+        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s])
       end
     end
 
@@ -266,8 +357,8 @@ describe RSpec::Core::ConfigurationOptions do
       it "renders all the original arguments except --drb and --options" do
         File.stub(:exist?) { true }
         IO.stub(:read) { "--drb --color" }
-        config_options_object(*%w[ --drb --format s --line_number 1 --example pattern --profile --backtrace]).
-          drb_argv.should eq(%w[ --color --profile --backtrace --line_number 1 --example pattern --format s ])
+        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s ])
       end
     end
   end
@@ -279,23 +370,16 @@ describe RSpec::Core::ConfigurationOptions do
 
     before do
       @orig_spec_opts = ENV["SPEC_OPTS"]
-      @orig_global_options_file = RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE
-      @orig_local_options_file  = RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :GLOBAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :LOCAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE = global_options_file
-      RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE  = local_options_file
-      FileUtils.rm local_options_file if File.exist? local_options_file
-      FileUtils.rm global_options_file if File.exist? global_options_file
-      FileUtils.rm custom_options_file if File.exist? custom_options_file
+      RSpec::Core::ConfigurationOptions::send :public, :global_options_file
+      RSpec::Core::ConfigurationOptions::send :public, :local_options_file
+      RSpec::Core::ConfigurationOptions::any_instance.stub(:global_options_file) { global_options_file }
+      RSpec::Core::ConfigurationOptions::any_instance.stub(:local_options_file) { local_options_file }
     end
 
     after do
       ENV["SPEC_OPTS"] = @orig_spec_opts
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :GLOBAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :LOCAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE = @orig_global_options_file
-      RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE  = @orig_local_options_file
+      RSpec::Core::ConfigurationOptions::send :private, :global_options_file
+      RSpec::Core::ConfigurationOptions::send :private, :local_options_file
     end
 
     def write_options(scope, options)
@@ -308,7 +392,7 @@ describe RSpec::Core::ConfigurationOptions do
       ENV["SPEC_OPTS"] = "--debug"
       options = parse_options("--drb")
       options[:color_enabled].should be_true
-      options[:line_number].should eq("37")
+      options[:line_numbers].should eq(["37"])
       options[:debug].should be_true
       options[:drb].should be_true
     end

data/spec/rspec/core/configuration_spec.rb

@@ -71,6 +71,18 @@ module RSpec::Core
         config.should_receive(:require).with('rspec/core/mocking/with_absolutely_nothing')
         config.mock_framework = :crazy_new_mocking_framework_ive_not_yet_heard_of
       end
+
+      context 'when there are already some example groups defined' do
+        before(:each) do
+          RSpec.world.stub(:example_groups).and_return([double.as_null_object])
+        end
+
+        it 'raises an error since this setting must be applied before any groups are defined' do
+          expect {
+            config.mock_framework = :rspec
+          }.to raise_error(/must be configured before any example groups are defined/)
+        end
+      end
     end
 
     describe "#mock_with" do
@@ -109,6 +121,18 @@ module RSpec::Core
           config.expect_with :not_supported
         end.to raise_error(ArgumentError)
       end
+
+      context 'when there are already some example groups defined' do
+        before(:each) do
+          RSpec.world.stub(:example_groups).and_return([double.as_null_object])
+        end
+
+        it 'raises an error since this setting must be applied before any groups are defined' do
+          expect {
+            config.expect_with :rspec
+          }.to raise_error(/must be configured before any example groups are defined/)
+        end
+      end
     end
 
     describe "#expecting_with_rspec?" do
@@ -145,22 +169,47 @@ module RSpec::Core
 
     describe "#files_to_run" do
       it "loads files not following pattern if named explicitly" do
-        file = "./spec/rspec/core/resources/a_bar.rb"
-        config.files_or_directories_to_run = file
-        config.files_to_run.should == [file]
+        config.files_or_directories_to_run = "spec/rspec/core/resources/a_bar.rb"
+        config.files_to_run.should eq([      "spec/rspec/core/resources/a_bar.rb"])
+      end
+
+      it "prevents repitition of dir when start of the pattern" do
+        config.pattern = "spec/**/a_spec.rb"
+        config.files_or_directories_to_run = "spec"
+        config.files_to_run.should eq(["spec/rspec/core/resources/a_spec.rb"])
+      end
+
+      it "does not prevent repitition of dir when later of the pattern" do
+        config.pattern = "rspec/**/a_spec.rb"
+        config.files_or_directories_to_run = "spec"
+        config.files_to_run.should eq(["spec/rspec/core/resources/a_spec.rb"])
       end
 
       context "with default pattern" do
         it "loads files named _spec.rb" do
-          dir = "./spec/rspec/core/resources"
-          config.files_or_directories_to_run = dir
-          config.files_to_run.should == ["#{dir}/a_spec.rb"]
+          dir = "spec/rspec/core/resources"
+          config.files_or_directories_to_run = "spec/rspec/core/resources"
+          config.files_to_run.should eq([      "spec/rspec/core/resources/a_spec.rb"])
         end
 
         it "loads files in Windows" do
           file = "C:\\path\\to\\project\\spec\\sub\\foo_spec.rb"
           config.files_or_directories_to_run = file
-          config.files_to_run.should == [file]
+          config.files_to_run.should eq([file])
+        end
+      end
+      
+      context "with default default_path" do
+        it "loads files in the default path when run by rspec" do
+          config.stub(:command) { 'rspec' }
+          config.files_or_directories_to_run = []
+          config.files_to_run.should_not be_empty
+        end
+
+        it "does not load files in the default path when run by ruby" do
+          config.stub(:command) { 'ruby' }
+          config.files_or_directories_to_run = []
+          config.files_to_run.should be_empty
         end
       end
     end
@@ -209,9 +258,9 @@ module RSpec::Core
     end
 
     describe "path with line number" do
-      it "assigns the line number as the filter" do
+      it "assigns the line number as a location filter" do
         config.files_or_directories_to_run = "path/to/a_spec.rb:37"
-        config.filter.should == {:line_number => 37}
+        config.filter.should eq({:locations => {File.expand_path("path/to/a_spec.rb") => [37]}})
       end
     end
 
@@ -221,10 +270,42 @@ module RSpec::Core
         config.full_description = "foo"
         config.filter.should_not have_key(:focused)
       end
+    end
 
-      it "assigns the example name as the filter on description" do
-        config.full_description = "foo"
-        config.filter.should == {:full_description => /foo/}
+    context "with line number" do
+
+      it "assigns the file and line number as a location filter" do
+        config.files_or_directories_to_run = "path/to/a_spec.rb:37"
+        config.filter.should eq({:locations => {File.expand_path("path/to/a_spec.rb") => [37]}})
+      end
+
+      it "assigns multiple files with line numbers as location filters" do
+        config.files_or_directories_to_run = "path/to/a_spec.rb:37", "other_spec.rb:44"
+        config.filter.should eq({:locations => {File.expand_path("path/to/a_spec.rb") => [37],
+                                                File.expand_path("other_spec.rb") => [44]}})
+      end
+
+      it "assigns files with multiple line numbers as location filters" do
+        config.files_or_directories_to_run = "path/to/a_spec.rb:37", "path/to/a_spec.rb:44"
+        config.filter.should eq({:locations => {File.expand_path("path/to/a_spec.rb") => [37, 44]}})
+      end
+    end
+
+    context "with multiple line numbers" do
+      it "assigns the file and line numbers as a location filter" do
+        config.files_or_directories_to_run = "path/to/a_spec.rb:1:3:5:7"
+        config.filter.should eq({:locations => {File.expand_path("path/to/a_spec.rb") => [1,3,5,7]}})
+      end
+    end
+
+    it "assigns the example name as the filter on description" do
+      config.full_description = "foo"
+      config.filter.should eq({:full_description => /foo/})
+    end
+    
+    describe "#default_path" do
+      it 'defaults to "spec"' do
+        config.default_path.should eq('spec')
       end
     end
 
@@ -251,7 +332,7 @@ module RSpec::Core
 
           group = ExampleGroup.describe('does like, stuff and junk', :magic_key => :include) { }
           group.should_not respond_to(:you_call_this_a_blt?)
-          group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
+          group.new.you_call_this_a_blt?.should eq("egad man, where's the mayo?!?!?")
         end
       end
 
@@ -263,7 +344,7 @@ module RSpec::Core
 
           group = ExampleGroup.describe('does like, stuff and junk', :magic_key => :include) { }
           group.should_not respond_to(:you_call_this_a_blt?)
-          group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
+          group.new.you_call_this_a_blt?.should eq("egad man, where's the mayo?!?!?")
         end
       end
 
@@ -468,29 +549,29 @@ module RSpec::Core
     describe "#filter_run" do
       it_behaves_like "metadata hash builder" do
         def metadata_hash(*args)
-          config.filter_run *args
+          config.filter_run(*args)
           config.filter
         end
       end
 
       it "sets the filter" do
         config.filter_run :focus => true
-        config.filter[:focus].should == true
+        config.filter[:focus].should be(true)
       end
 
       it "merges with existing filters" do
         config.filter_run :filter1 => true
         config.filter_run :filter2 => false
 
-        config.filter[:filter1].should == true
-        config.filter[:filter2].should == false
+        config.filter[:filter1].should be(true)
+        config.filter[:filter2].should be(false)
       end
 
-      it "warns if :line_number is already a filter" do
-        config.filter_run :line_number => 100
+      it "warns if :line_numbers is already a filter" do
+        config.filter_run :line_numbers => [100]
         config.should_receive(:warn).with(
           "Filtering by {:focus=>true} is not possible since you " \
-          "are already filtering by {:line_number=>100}"
+          "are already filtering by {:line_numbers=>[100]}"
         )
         config.filter_run :focus => true
       end
@@ -508,26 +589,39 @@ module RSpec::Core
     describe "#filter_run_excluding" do
       it_behaves_like "metadata hash builder" do
         def metadata_hash(*args)
-          config.filter_run_excluding *args
+          config.filter_run_excluding(*args)
           config.exclusion_filter
         end
       end
 
       it "sets the filter" do
         config.filter_run_excluding :slow => true
-        config.exclusion_filter[:slow].should == true
+        config.exclusion_filter[:slow].should be(true)
       end
 
       it "merges with existing filters" do
         config.filter_run_excluding :filter1 => true
         config.filter_run_excluding :filter2 => false
 
-        config.exclusion_filter[:filter1].should == true
-        config.exclusion_filter[:filter2].should == false
+        config.exclusion_filter[:filter1].should be(true)
+        config.exclusion_filter[:filter2].should be(false)
+      end
+    end
+
+    describe "#inclusion_filter" do
+      it "returns {} even if set to nil" do
+        config.inclusion_filter = nil
+        config.inclusion_filter.should eq({})
       end
     end
 
+
     describe "#exclusion_filter" do
+      it "returns {} even if set to nil" do
+        config.exclusion_filter = nil
+        config.exclusion_filter.should eq({})
+      end
+
       describe "the default :if filter" do
         it "does not exclude a spec with no :if metadata" do
           config.exclusion_filter[:if].call(nil, {}).should be_false
@@ -561,24 +655,24 @@ module RSpec::Core
       end
     end
 
-    describe "#line_number=" do
+    describe "line_numbers=" do
       before { config.stub(:warn) }
 
-      it "sets the line number" do
-        config.line_number = '37'
-        config.filter.should == {:line_number => 37}
+      it "sets the line numbers" do
+        config.line_numbers = ['37']
+        config.filter.should eq({:line_numbers => [37]})
       end
 
       it "overrides :focused" do
         config.filter_run :focused => true
-        config.line_number = '37'
-        config.filter.should == {:line_number => 37}
+        config.line_numbers = ['37']
+        config.filter.should eq({:line_numbers => [37]})
       end
 
       it "prevents :focused" do
-        config.line_number = '37'
+        config.line_numbers = ['37']
         config.filter_run :focused => true
-        config.filter.should == {:line_number => 37}
+        config.filter.should eq({:line_numbers => [37]})
       end
     end
 
@@ -586,14 +680,14 @@ module RSpec::Core
       context "given true" do
         it "clears the backtrace clean patterns" do
           config.full_backtrace = true
-          config.backtrace_clean_patterns.should == []
+          config.backtrace_clean_patterns.should eq([])
         end
       end
 
       context "given false" do
         it "restores backtrace clean patterns" do
           config.full_backtrace = false
-          config.backtrace_clean_patterns.should == RSpec::Core::Configuration::DEFAULT_BACKTRACE_PATTERNS
+          config.backtrace_clean_patterns.should eq(RSpec::Core::Configuration::DEFAULT_BACKTRACE_PATTERNS)
         end
       end
 
@@ -606,6 +700,23 @@ module RSpec::Core
       end
     end
 
+    describe "#cleaned_from_backtrace? defaults" do
+      it "returns true for rspec files" do
+        config.cleaned_from_backtrace?("lib/rspec/core.rb").
+          should be_true
+      end
+
+      it "returns true for spec_helper" do
+        config.cleaned_from_backtrace?("spec/spec_helper.rb").
+          should be_true
+      end
+
+      it "returns true for java files (for JRuby)" do
+        config.cleaned_from_backtrace?("org/jruby/RubyArray.java:2336").
+          should be_true
+      end
+    end
+
     describe "#debug=true" do
       before do
         if defined?(Debugger)
@@ -720,12 +831,12 @@ module RSpec::Core
 
         it "delegates the getter to the other option" do
           config.another_custom_option = "this value"
-          config.custom_option.should == "this value"
+          config.custom_option.should eq("this value")
         end
 
         it "delegates the setter to the other option" do
           config.custom_option = "this value"
-          config.another_custom_option.should == "this value"
+          config.another_custom_option.should eq("this value")
         end
 
         it "delegates the predicate to the other option" do
@@ -792,5 +903,18 @@ module RSpec::Core
       end
     end
 
+    describe "#reset" do
+      it "clears the reporter" do
+        config.reporter.should_not be_nil
+        config.reset
+        config.instance_variable_get("@reporter").should be_nil
+      end
+
+      it "clears the formatters" do
+        config.add_formatter "doc"
+        config.reset
+        config.formatters.should be_empty
+      end
+    end
   end
 end

data/spec/rspec/core/deprecations_spec.rb

@@ -9,7 +9,7 @@ describe "deprecations" do
 
     it "returns RSpec" do
       RSpec.stub(:warn_deprecation)
-      Spec.should == RSpec
+      Spec.should eq(RSpec)
     end
 
     it "doesn't include backward compatibility in const_missing backtrace" do
@@ -32,7 +32,7 @@ describe "deprecations" do
 
       it "delegates to example" do
         RSpec.stub(:warn_deprecation)
-        running_example.should == example
+        running_example.should eq(example)
       end
     end
   end

data/spec/rspec/core/drb_command_line_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "::DRbCommandLine", :ruby => "!jruby" do
+describe "::DRbCommandLine", :type => :drb, :unless => RUBY_PLATFORM == 'java' do
   let(:config) { RSpec::Core::Configuration.new }
   let(:out)    { StringIO.new }
   let(:err)    { StringIO.new }
@@ -41,14 +41,14 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
     context "without RSPEC_DRB environment variable set" do
       it "defaults to 8989" do
         with_RSPEC_DRB_set_to(nil) do
-          command_line([]).drb_port.should == 8989
+          command_line([]).drb_port.should eq(8989)
         end
       end
 
       it "sets the DRb port" do
         with_RSPEC_DRB_set_to(nil) do
-          command_line(["--drb-port", "1234"]).drb_port.should == 1234
-          command_line(["--drb-port", "5678"]).drb_port.should == 5678
+          command_line(["--drb-port", "1234"]).drb_port.should eq(1234)
+          command_line(["--drb-port", "5678"]).drb_port.should eq(5678)
         end
       end
     end
@@ -58,7 +58,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "without config variable set" do
         it "uses RSPEC_DRB value" do
           with_RSPEC_DRB_set_to('9000') do
-            command_line([]).drb_port.should == "9000"
+            command_line([]).drb_port.should eq("9000")
           end
         end
       end
@@ -66,7 +66,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "and config variable set" do
         it "uses configured value" do
           with_RSPEC_DRB_set_to('9000') do
-            command_line(%w[--drb-port 5678]).drb_port.should == 5678
+            command_line(%w[--drb-port 5678]).drb_port.should eq(5678)
           end
         end
       end