test/runner/runner_test.rb in testbot-0.6.9 vs test/runner/runner_test.rb in testbot-0.7.0

@@ -8,42 +8,44 @@
 
   class RunnerTest < Test::Unit::TestCase
     should "use bundle exec in when calling rake testbot:before_run if bundler is present" do
       job = flexmock(:job, :project => "/path")
       flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(true)
-      
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
+
       runner = Runner.new({:max_instances => 1})
       flexmock(File).should_receive(:exists?).with("/path/lib/tasks/testbot.rake").and_return(true)
       flexmock(File).should_receive(:exists?).with("/path/config/testbot/before_run.rb").and_return(false)
+      flexmock(File).should_receive(:exists?).with("/path/.rvmrc").and_return(false)
       flexmock(runner)
-      flexmock(runner).should_receive(:system).with("cd /path; bundle").once
-      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle exec rake testbot:before_run").once
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle && bundle exec rake testbot:before_run").once
       runner.send(:before_run, job)
     end
 
     should "be able to use a plain ruby before_run file" do
       job = flexmock(:job, :project => "/path")
       flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(true)
-      
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
+
       runner = Runner.new({:max_instances => 1})
       flexmock(File).should_receive(:exists?).with("/path/lib/tasks/testbot.rake").and_return(false)
       flexmock(File).should_receive(:exists?).with("/path/config/testbot/before_run.rb").and_return(true)
       flexmock(runner)
-      flexmock(runner).should_receive(:system).with("cd /path; bundle").once
-      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle exec ruby config/testbot/before_run.rb").once
+      flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1 bundle && bundle exec ruby config/testbot/before_run.rb").once
       runner.send(:before_run, job)
     end
 
     should "be able to run without bundler" do
       job = flexmock(:job, :project => "/path")
       flexmock(RubyEnv).should_receive(:bundler?).with("/path").returns(false)
-      
+      flexmock(RubyEnv).should_receive(:rvm?).returns(false)
+
       runner = Runner.new({:max_instances => 1})
       flexmock(File).should_receive(:exists?).with("/path/lib/tasks/testbot.rake").and_return(false)
       flexmock(File).should_receive(:exists?).with("/path/config/testbot/before_run.rb").and_return(true)
       flexmock(runner)
       flexmock(runner).should_receive(:system).with("cd /path; RAILS_ENV=test TEST_INSTANCES=1  ruby config/testbot/before_run.rb").once
       runner.send(:before_run, job)
-    end 
+    end
   end
 end