mspec 1.7.0 → 1.8.0

data/spec/guards/tty_spec.rb

@@ -6,7 +6,7 @@ describe Object, "#with_tty" do
     ScratchPad.clear
 
     @guard = TTYGuard.new
-    TTYGuard.stub!(:new).and_return(@guard)
+    TTYGuard.stub(:new).and_return(@guard)
   end
 
   it "yields if STDOUT is a TTY" do

data/spec/guards/user_spec.rb

@@ -4,18 +4,18 @@ require 'mspec/guards'
 describe Object, "#as_user" do
   before :each do
     @guard = UserGuard.new
-    UserGuard.stub!(:new).and_return(@guard)
+    UserGuard.stub(:new).and_return(@guard)
     ScratchPad.clear
   end
 
   it "yields when the Process.euid is not 0" do
-    Process.stub!(:euid).and_return(501)
+    Process.stub(:euid).and_return(501)
     as_user { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 
   it "does not yield when the Process.euid is 0" do
-    Process.stub!(:euid).and_return(0)
+    Process.stub(:euid).and_return(0)
     as_user { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end

data/spec/guards/version_spec.rb

@@ -99,18 +99,18 @@ end
 describe Object, "#ruby_version_is" do
   before :each do
     @guard = VersionGuard.new 'x.x.x.x'
-    VersionGuard.stub!(:new).and_return(@guard)
+    VersionGuard.stub(:new).and_return(@guard)
     ScratchPad.clear
   end
 
   it "yields when #match? returns true" do
-    @guard.stub!(:match?).and_return(true)
+    @guard.stub(:match?).and_return(true)
     ruby_version_is('x.x.x.x') { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end
 
   it "does not yield when #match? returns false" do
-    @guard.stub!(:match?).and_return(false)
+    @guard.stub(:match?).and_return(false)
     ruby_version_is('x.x.x.x') { ScratchPad.record :yield }
     ScratchPad.recorded.should_not == :yield
   end

data/spec/helpers/ducktype_spec.rb

@@ -4,7 +4,7 @@ require 'mspec/helpers'
 
 describe Object, "#responds_to" do
   it "returns true for specified symbols" do
-    obj = mock("obj")
+    obj = double("obj")
     obj.responds_to(:to_flo)
     obj.should respond_to(:to_flo)
     obj.should respond_to(:to_s)
@@ -13,7 +13,7 @@ end
 
 describe Object, "#does_not_respond_to" do
   it "returns false for specified symbols" do
-    obj = mock("obj")
+    obj = double("obj")
     obj.does_not_respond_to(:to_s)
     obj.should_not respond_to(:to_s)
   end
@@ -30,7 +30,7 @@ end
 
 describe Object, "#fake!" do
   before :each do
-    @obj = mock("obj")
+    @obj = double("obj")
   end
 
   it "makes the object respond to the message" do

data/spec/helpers/environment_spec.rb

@@ -8,23 +8,27 @@ describe "#env" do
   end
 
   it "calls `env` on non-Windows" do
-    PlatformGuard.stub!(:windows?).and_return(false)
+    PlatformGuard.stub(:windows?).and_return(false)
+    PlatformGuard.stub(:opal?).and_return(false)
     should_receive(:`).with("env").and_return("one=two\nthree=four")
     env
   end
 
   it "calls `cmd.exe /C set` on Windows" do
-    PlatformGuard.stub!(:windows?).and_return(true)
+    PlatformGuard.stub(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C set").and_return("one=two\nthree=four")
     env
   end
 
-  it "returns the current user's environment variables" do
-    PlatformGuard.stub!(:windows?).and_return(false)
+  it "returns the current user's environment variables on non-Windows, non-Opal platforms" do
+    PlatformGuard.stub(:windows?).and_return(false)
+    PlatformGuard.stub(:opal?).and_return(false)
     should_receive(:`).with("env").and_return("one=two\nthree=four")
     env.should == {"one" => "two", "three" => "four"}
+  end
 
-    PlatformGuard.stub!(:windows?).and_return(true)
+  it "returns the current user's environment variables on Windows" do
+    PlatformGuard.stub(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C set").and_return("five=six\nseven=eight")
     env.should == {"five" => "six", "seven" => "eight"}
   end
@@ -40,23 +44,27 @@ describe "#username" do
   end
 
   it "calls `cmd.exe /C ECHO %USERNAME%` on Windows" do
-    PlatformGuard.stub!(:windows?).and_return(true)
+    PlatformGuard.stub(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("john")
     username
   end
 
   it "calls `env` on non-Windows" do
-    PlatformGuard.stub!(:windows?).and_return(false)
+    PlatformGuard.stub(:windows?).and_return(false)
+    PlatformGuard.stub(:opal?).and_return(false)
     should_receive(:`).with("whoami").and_return("john")
     username
   end
 
-  it "returns the user's username" do
-    PlatformGuard.stub!(:windows?).and_return(true)
+  it "returns the user's username on Windows" do
+    PlatformGuard.stub(:windows?).and_return(true)
     should_receive(:`).with("cmd.exe /C ECHO %USERNAME%").and_return("johnonwin")
     username.should == "johnonwin"
+  end
 
-    PlatformGuard.stub!(:windows?).and_return(false)
+  it "returns the user's username on non-Windows, non-Opal platforms" do
+    PlatformGuard.stub(:windows?).and_return(false)
+    PlatformGuard.stub(:opal?).and_return(false)
     should_receive(:`).with("whoami").and_return("john")
     username.should == "john"
   end

data/spec/helpers/flunk_spec.rb

@@ -6,8 +6,8 @@ require 'mspec/helpers'
 
 describe Object, "#flunk" do
   before :each do
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
   end
 
   it "raises an SpecExpectationNotMetError unconditionally" do

data/spec/helpers/io_spec.rb

@@ -71,7 +71,7 @@ describe Object, "#new_fd" do
   end
 
   it "accepts an options Hash" do
-    FeatureGuard.stub!(:enabled?).and_return(true)
+    FeatureGuard.stub(:enabled?).and_return(true)
     fd = new_fd @name, { :mode => 'w:utf-8' }
     fd.should be_an_instance_of(Fixnum)
 
@@ -83,7 +83,7 @@ describe Object, "#new_fd" do
   end
 
   it "raises an ArgumentError if the options Hash does not include :mode" do
-    FeatureGuard.stub!(:enabled?).and_return(true)
+    FeatureGuard.stub(:enabled?).and_return(true)
     lambda { new_fd @name, { :encoding => "utf-8" } }.should raise_error(ArgumentError)
   end
 end

data/spec/helpers/ruby_exe_spec.rb

@@ -106,7 +106,7 @@ describe "#resolve_ruby_exe" do
   end
 
   it "returns the value returned by #ruby_exe_options if it exists and is executable" do
-    PlatformGuard.stub!(:windows?).and_return(false)
+    PlatformGuard.stub(:windows?).and_return(false)
     @script.should_receive(:ruby_exe_options).and_return(@name)
     File.should_receive(:exist?).with(@name).and_return(true)
     File.should_receive(:executable?).with(@name).and_return(true)
@@ -115,7 +115,7 @@ describe "#resolve_ruby_exe" do
   end
 
   it "returns the value returned by #ruby_exe_options if it exists on Windows platforms" do
-    PlatformGuard.stub!(:windows?).and_return(true)
+    PlatformGuard.stub(:windows?).and_return(true)
     @script.should_receive(:ruby_exe_options).and_return(@name)
     File.should_receive(:exist?).with(@name).and_return(true)
     File.should_not_receive(:executable?)
@@ -124,7 +124,7 @@ describe "#resolve_ruby_exe" do
   end
 
   it "expands the path portion of the result of #ruby_exe_options" do
-    PlatformGuard.stub!(:windows?).and_return(false)
+    PlatformGuard.stub(:windows?).and_return(false)
     @script.should_receive(:ruby_exe_options).and_return("#{@name} -Xfoo")
     File.should_receive(:exist?).with(@name).and_return(true)
     File.should_receive(:executable?).with(@name).and_return(true)
@@ -172,11 +172,6 @@ describe Object, "#ruby_cmd" do
       "ruby_spec_exe -w -Q -w -Cdir some/ruby/file.rb < file.txt"
   end
 
-  it "returns a command that runs code using -e" do
-    File.should_receive(:exist?).with(@code).and_return(false)
-    @script.ruby_cmd(@code).should == %(ruby_spec_exe -w -Q -e "some \\"real\\" 'ruby' code")
-  end
-
   it "includes the given options and arguments with -e" do
     File.should_receive(:exist?).with(@code).and_return(false)
     @script.ruby_cmd(@code, :options => "-W0 -Cdir", :args => "< file.txt").should ==
@@ -195,7 +190,7 @@ describe Object, "#ruby_exe" do
   end
 
   before :each do
-    @script.stub!(:`)
+    @script.stub(:`)
   end
 
   it "executes (using `) the result of calling #ruby_cmd with the given arguments" do
@@ -216,6 +211,7 @@ describe Object, "#ruby_exe" do
   describe "with :env option" do
     it "preserves the values of existing ENV keys" do
       ENV["ABC"] = "123"
+      ENV.stub(:[])
       ENV.should_receive(:[]).with("RUBY_FLAGS")
       ENV.should_receive(:[]).with("ABC")
       @script.ruby_exe nil, :env => { :ABC => "xyz" }

data/spec/matchers/have_singleton_method_spec.rb

@@ -18,7 +18,7 @@ describe HaveSingletonMethodMatcher do
   end
 
   it "matches when the object has a singleton method" do
-    obj = mock("HSMMSpecs")
+    obj = double("HSMMSpecs")
     def obj.singleton_method; end
 
     matcher = HaveSingletonMethodMatcher.new :singleton_method

data/spec/matchers/output_spec.rb

@@ -20,7 +20,7 @@ describe OutputMatcher do
   end
 
   it "provides a useful failure message" do
-    proc = Proc.new { puts "unexpected"; $stderr.puts "unerror" }
+    proc = Proc.new { print "unexpected"; $stderr.print "unerror" }
     matcher = OutputMatcher.new("expected", "error")
     matcher.matches?(proc)
     matcher.failure_message.should ==

data/spec/mocks/mock_spec.rb

@@ -21,25 +21,25 @@ end
 
 describe Mock, ".replaced_name" do
   it "returns the name for a method that is being replaced by a mock method" do
-    m = mock('a fake id')
-    m.stub!(:__mspec_object_id__).and_return(42)
+    m = double('a fake id')
+    m.stub(:__mspec_object_id__).and_return(42)
     Mock.replaced_name(m, :method_call).should == :__mspec_42_method_call__
   end
 end
 
 describe Mock, ".replaced_key" do
   it "returns a key used internally by Mock" do
-    m = mock('a fake id')
-    m.stub!(:__mspec_object_id__).and_return(42)
+    m = double('a fake id')
+    m.stub(:__mspec_object_id__).and_return(42)
     Mock.replaced_key(m, :method_call).should == [:__mspec_42_method_call__, :method_call]
   end
 end
 
 describe Mock, ".replaced?" do
   before :each do
-    @mock = mock('install_method')
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    @mock = double('install_method')
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
   end
 
   it "returns true if a method has been stubbed on an object" do
@@ -59,7 +59,7 @@ end
 
 describe Mock, ".name_or_inspect" do
   before :each do
-    @mock = mock("I have a #name")
+    @mock = double("I have a #name")
   end
 
   it "returns the value of @name if set" do
@@ -70,9 +70,9 @@ end
 
 describe Mock, ".install_method for mocks" do
   before :each do
-    @mock = mock('install_method')
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    @mock = double('install_method')
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
   end
 
   after :each do
@@ -123,8 +123,8 @@ describe Mock, ".install_method for mocks" do
   end
 
   it "adds to the expectation tally" do
-    state = mock("run state").as_null_object
-    state.stub!(:state).and_return(mock("spec state"))
+    state = double("run state").as_null_object
+    state.stub(:state).and_return(double("spec state"))
     MSpec.should_receive(:current).and_return(state)
     MSpec.should_receive(:actions).with(:expectation, state.state)
     Mock.install_method(@mock, :method_call).and_return(1)
@@ -132,8 +132,8 @@ describe Mock, ".install_method for mocks" do
   end
 
   it "registers that an expectation has been encountered" do
-    state = mock("run state").as_null_object
-    state.stub!(:state).and_return(mock("spec state"))
+    state = double("run state").as_null_object
+    state.stub(:state).and_return(double("spec state"))
     MSpec.should_receive(:expectation)
     Mock.install_method(@mock, :method_call).and_return(1)
     @mock.method_call.should == 1
@@ -142,9 +142,9 @@ end
 
 describe Mock, ".install_method for stubs" do
   before :each do
-    @mock = mock('install_method')
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    @mock = double('install_method')
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
   end
 
   after :each do
@@ -157,12 +157,12 @@ describe Mock, ".install_method for stubs" do
 
   # This illustrates RSpec's behavior. This spec passes on RSpec and we mimic it
   #
-  # describe "A mock receiving multiple calls to #stub!" do
+  # describe "A mock receiving multiple calls to #stub" do
   #   it "returns the last value stubbed" do
-  #     m = mock 'multiple #stub!'
-  #     m.stub!(:foo).and_return(true)
+  #     m = mock 'multiple #stub'
+  #     m.stub(:foo).and_return(true)
   #     m.foo.should == true
-  #     m.stub!(:foo).and_return(false)
+  #     m.stub(:foo).and_return(false)
   #     m.foo.should == false
   #   end
   # end
@@ -175,8 +175,8 @@ describe Mock, ".install_method for stubs" do
   end
 
   it "does not add to the expectation tally" do
-    state = mock("run state").as_null_object
-    state.stub!(:state).and_return(mock("spec state"))
+    state = double("run state").as_null_object
+    state.stub(:state).and_return(double("spec state"))
     MSpec.should_not_receive(:actions)
     Mock.install_method(@mock, :method_call, :stub).and_return(1)
     @mock.method_call.should == 1
@@ -185,9 +185,9 @@ end
 
 describe Mock, ".install_method" do
   before :each do
-    @mock = mock('install_method')
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    @mock = double('install_method')
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
   end
 
   after :each do
@@ -211,10 +211,10 @@ class MockAndRaiseError < Exception; end
 
 describe Mock, ".verify_call" do
   before :each do
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
 
-    @mock = mock('verify_call')
+    @mock = double('verify_call')
     @proxy = Mock.install_method @mock, :method_call
   end
 
@@ -302,9 +302,9 @@ describe Mock, ".verify_call" do
 
   it "does not raise an expection when it is expected to yield to a block that can take any number of arguments" do
     @proxy.and_yield(1, 2, 3)
-    lambda {
+    expect {
       Mock.verify_call(@mock, :method_call) {|*a|}
-    }.should_not raise_error(SpecExpectationNotMetError)
+    }.not_to raise_error
   end
 
   it "raises an exception when expected to" do
@@ -317,10 +317,10 @@ end
 
 describe Mock, ".verify_count" do
   before :each do
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
 
-    @mock = mock('verify_count')
+    @mock = double('verify_count')
     @proxy = Mock.install_method @mock, :method_call
   end
 
@@ -380,10 +380,10 @@ end
 
 describe Mock, ".verify_count mixing mocks and stubs" do
   before :each do
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
 
-    @mock = mock('verify_count')
+    @mock = double('verify_count')
   end
 
   after :each do
@@ -412,10 +412,10 @@ end
 
 describe Mock, ".cleanup" do
   before :each do
-    MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
+    MSpec.stub(:actions)
+    MSpec.stub(:current).and_return(double("spec state").as_null_object)
 
-    @mock = mock('cleanup')
+    @mock = double('cleanup')
     @proxy = Mock.install_method @mock, :method_call
     @stub = Mock.install_method @mock, :method_call, :stub
   end

data/spec/mocks/proxy_spec.rb

@@ -340,7 +340,7 @@ describe MockProxy, "#raising" do
   end
 
   it "returns the exception object passed to #and_raise" do
-    exc = mock("exception")
+    exc = double("exception")
     @proxy.and_raise(exc)
     @proxy.raising.should equal(exc)
   end