ruby_configurator_spec.rb in rconf-0.7.8

- old
+ new
@@ -27,56 +27,39 @@
     end
     flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
   end
 
   it 'should succeed on linux when rvm succeeds' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '--version').and_return(success_result("rvm #{RVM_VERSION}"))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'list').and_return(success_result("=> rvm #{RVM_VERSION}"))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'use', '0').and_return(success_result('Using '))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '0@', 'gem', '--version').and_return(success_result('1'))
+    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').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
     rvm_tar = "rvm-#{RVM_VERSION}.tar.gz" 
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '--version').and_return(success_result("rvm"))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'list').and_return(success_result("=> rvm #{RVM_VERSION}"))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'curl', '-O', '-f',
-      "http://rvm.beginrescueend.com/releases/#{rvm_tar}",
-      {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).and_return(success_result)
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      '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"))}"}).and_return(success_result)
+    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', "http://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
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      './install', {:abort_on_failure=>"Failed to install rvm #{RVM_VERSION}"}).and_return(success_result)
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'use', '0').and_return(success_result('Using '))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '0@', 'gem', '--version').and_return(success_result('1'))
+    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)
     @configurator.run_linux
   end
 
   it 'should install rubygems if needed' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '--version').and_return(success_result("rvm #{RVM_VERSION}"))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'list').and_return(success_result("=> rvm #{RVM_VERSION}"))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'use', '0').and_return(success_result('Using '))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '0@', 'gem', '--version').and_return(success_result('0'))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '0@', 'rubygems', '1',
-      {:abort_on_failure=>'Failed to install rubygems'}).and_return(success_result)
+    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').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
 
   describe 'bashrc update' do
 