spec/configurators/ruby_configurator_spec.rb in rconf-0.9.6 vs spec/configurators/ruby_configurator_spec.rb in rconf-0.9.7
- old
+ new
@@ -26,12 +26,12 @@
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}"))
- should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
+ should_execute('rvm', 'current').once.and_return(success_result("0@"))
+ #should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
@configurator.run_linux
end
it 'should install rvm if needed' do
@@ -47,11 +47,11 @@
@configurator.run_linux
end
it 'should install rubygems if needed' 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}"))
- should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
+ should_execute('rvm', 'current').once.and_return(success_result("0@"))
+ #should_execute('rvm', 'use', '0', Hash).once.and_return(success_result('Using '))
should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('0'))
should_execute('rvm', '0@', 'rubygems', '1',
{:abort_on_failure=>'Failed to install rubygems'}).once.and_return(success_result)
@configurator.run_linux
end