Make sure the bundler environment is correct

We need an unbundled env and after removing spring we need to make
sure the Gemfile.lock is updated.

Author: rafaelfranca

lib/spring/application_manager.rb

@@ -93,7 +93,7 @@ def stop
     def start_child(preload = false)
       @child, child_socket = UNIXSocket.pair
 
-      Bundler.with_original_env do
+      Bundler.with_unbundled_env do
         bundler_dir = File.expand_path("../..", $LOADED_FEATURES.grep(/bundler\/setup\.rb$/).first)
         @pid = Process.spawn(
           {

test/support/acceptance_test.rb

@@ -271,6 +271,7 @@ def exec_name
       test "binstub when spring gem is missing" do
         without_gem "spring-#{Spring::VERSION}" do
           File.write(app.gemfile, app.gemfile.read.gsub(/gem 'spring.*/, ""))
+          app.run! "bundle install", timeout: nil
           assert_success "bin/rake -T", stdout: "rake db:migrate"
         end
       end
@@ -540,7 +541,7 @@ def exec_name
         File.write(app.path("script.rb"), <<-RUBY.strip_heredoc)
           gemfile = Rails.root.join("Gemfile")
           File.write(gemfile, "\#{gemfile.read}gem 'text'\\n")
-          Bundler.with_clean_env do
+          Bundler.with_unbundled_env do
             system(#{app.env.inspect}, "bundle install")
           end
           output = `\#{Rails.root.join('bin/rails')} runner 'require "text"; puts "done";'`
@@ -557,7 +558,7 @@ def exec_name
         File.write(app.path("script.rb"), <<-RUBY.strip_heredoc)
           gemfile = Rails.root.join("gems.rb")
           File.write(gemfile, "\#{gemfile.read}gem 'text'\\n")
-          Bundler.with_clean_env do
+          Bundler.with_unbundled_env do
             system(#{app.env.inspect}, "bundle install")
           end
           output = `\#{Rails.root.join('bin/rails')} runner 'require "text"; puts "done";'`

test/support/application.rb

@@ -111,7 +111,7 @@ def spring_client_config
       def run(command, opts = {})
         start_time = Time.now
 
-        Bundler.with_original_env do
+        Bundler.with_unbundled_env do
           Process.spawn(
             env.merge(opts[:env] || {}),
             command.to_s,

test/support/application_generator.rb

@@ -31,7 +31,7 @@ def system(command)
       end
 
       def generate
-        Bundler.with_original_env { generate_files }
+        Bundler.with_unbundled_env { generate_files }
         install_spring
         generate_scaffold
       end