ruby_configurator_spec.rb in rconf-0.8.12

- old
+ new

@@ -21,10 +21,11 @@
 
   before(:each) do
     @configurator = create_configurator('ruby { version "0"; rubygems "1" }')
     flexmock(File).should_receive(:exist?).with('.rvmrc').and_return(true)
     flexmock(IO).should_receive(:read).with('.rvmrc').and_return("anything")
+    flexmock(File).should_receive(:open).with('.rvmrc', 'w').and_yield(FlexMock.undefined) # Don't override rconf's .rvmrc...
   end
 
   it 'should succeed on linux when rvm succeeds' do
     should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
     should_execute('rvm', 'list').once.and_return(success_result("=> rvm #{RVM_VERSION}"))
@@ -34,19 +35,16 @@
   end
 
   it 'should install rvm if needed' do
     rvm_tar = "rvm-#{RVM_VERSION}.tar.gz" 
     should_execute('rvm', '--version').once.and_return(success_result("rvm"))
-    should_execute('rvm', 'list').once.and_return(success_result("=> rvm #{RVM_VERSION}"))
     should_execute('curl', '-O', '-f', "https://rvm.beginrescueend.com/releases/#{rvm_tar}",
       {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).once.and_return(success_result)
     should_execute('tar', 'zxf', rvm_tar, 
       {:abort_on_failure=>"Failed to extract rvm tgz from #{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "rvm-#{RVM_VERSION}.tar.gz"))}"}).once.and_return(success_result)
     flexmock(Dir).should_receive(:chdir).and_yield
     should_execute('./install', {:abort_on_failure=>"Failed to install rvm #{RVM_VERSION}"}).once.and_return(success_result)
-    should_execute('rvm', 'use', '0').once.and_return(success_result('Using '))
-    should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
-    flexmock(@configurator).should_receive(:setup_bashrc).once.and_return(true)
+    should_execute('rvm', 'use', '0').never
     @configurator.run_linux
   end
 
   it 'should install rubygems if needed' do
     should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))