1 files changed, 22 insertions, 4 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index ba700df1d6..0bbd25db2b 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -1,4 +1,4 @@
-require 'isolation/abstract_unit'
+require "isolation/abstract_unit"
 
 module ApplicationTests
   class BinSetupTest < ActiveSupport::TestCase
@@ -6,15 +6,22 @@ module ApplicationTests
 
     def setup
       build_app
+
+      create_gemfile
+      update_boot_file_to_use_bundler
+      @old_gemfile_env = ENV["BUNDLE_GEMFILE"]
+      ENV["BUNDLE_GEMFILE"] = app_path + "/Gemfile"
     end
 
     def teardown
       teardown_app
+
+      ENV["BUNDLE_GEMFILE"] = @old_gemfile_env
     end
 
     def test_bin_setup
       Dir.chdir(app_path) do
-        app_file 'db/schema.rb', <<-RUBY
+        app_file "db/schema.rb", <<-RUBY
           ActiveRecord::Schema.define(version: 20140423102712) do
             create_table(:articles) {}
           end
@@ -23,7 +30,7 @@ module ApplicationTests
         list_tables = lambda { `bin/rails runner 'p ActiveRecord::Base.connection.tables'`.strip }
         File.write("log/test.log", "zomg!")
 
-        assert_equal '[]', list_tables.call
+        assert_equal "[]", list_tables.call
         assert_equal 5, File.size("log/test.log")
         assert_not File.exist?("tmp/restart.txt")
         `bin/setup 2>&1`
@@ -35,7 +42,7 @@ module ApplicationTests
 
     def test_bin_setup_output
       Dir.chdir(app_path) do
-        app_file 'db/schema.rb', ""
+        app_file "db/schema.rb", ""
 
         output = `bin/setup 2>&1`
         assert_equal(<<-OUTPUT, output)
@@ -52,5 +59,16 @@ Created database 'db/test.sqlite3'
         OUTPUT
       end
     end
+
+    private
+      def create_gemfile
+        app_file("Gemfile", "source 'https://rubygems.org'")
+        app_file("Gemfile", "gem 'rails', path: '#{RAILS_FRAMEWORK_ROOT}'", "a")
+        app_file("Gemfile", "gem 'sqlite3'", "a")
+      end
+
+      def update_boot_file_to_use_bundler
+        app_file("config/boot.rb", "require 'bundler/setup'")
+      end
   end
 end