Correct test running for subtests.

Re-added connect tests to Rakefile.
Fixed changes to Bundler environment variables to remove them entirely.
Added an explicit bundle installation before each test.

Author: DylanLacey

Rakefile

@@ -28,10 +28,10 @@ namespace :spec do
   end
 
   task :connect do
-    STDERR.puts "Connect spec is busted, and might have been for a while"
-    # desc "Ensure sauce-connect is starting correctly"
-    # ensure_rvm!
-    # sh "bash --login -c \"cd spec/helpers && ./run_in_own_rvm.sh ./integration/connect\""
+  #  STDERR.puts "Connect spec is busted, and might have been for a while"
+    desc "Ensure sauce-connect is starting correctly"
+    ensure_rvm!
+    sh "bash --login -c \"cd spec/helpers && ./run_in_own_rvm.sh ./integration/connect\""
   end
 end
 

spec/helpers/run_in_own_rvm.sh

@@ -1,8 +1,9 @@
-#!/bin/bash --login
+#!/bin/bash
 
 # Reset the environment and allow RVM to create its own
-export BUNDLE_GEMFILE=
-export RUBYOPT=
+unset BUNDLE_GEMFILE
+unset BUNDLE_BIN_PATH
+unset RUBYOPT
 
 echo "Running tests in" $1
 cd ../$1 && ./run-test.sh

spec/integration/connect/run-test.sh

@@ -1,5 +1,5 @@
-#!/bin/bash -xe
-
+#!/bin/bash --login
+gem install bundler
 RAKE="bundle exec rake"
 
 bundle install

spec/integration/rspec-capybara/run-test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash --login
+gem install bundler
 RAKE="bundle exec rake"
 
 bundle install

spec/integration/rspec/run-test.sh

@@ -1,5 +1,5 @@
 #!/bin/bash --login
-rvm current
+gem install bundler
 
 RAKE="bundle exec rake"
 bundle update

spec/integration/testunit/run-test.sh

@@ -1,4 +1,5 @@
 #!/bin/bash --login
+gem install bundler
 RAKE="bundle exec rake"
 
 bundle install