aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2016-09-10 22:54:49 -0400
committerGitHub <noreply@github.com>2016-09-10 22:54:49 -0400
commit7c3cc0902cfe00a0565c02c02d008c1ea75937ea (patch)
treeee4b56c9bfdd3b333df0e5b73f00efb08744e6e6 /railties
parenta09135d6d27642a54a2b21b41b0a370f5a3357a1 (diff)
parent99620d1534ffb47d1496ccc1efae60a90967671c (diff)
downloadrails-7c3cc0902cfe00a0565c02c02d008c1ea75937ea.tar.gz
rails-7c3cc0902cfe00a0565c02c02d008c1ea75937ea.tar.bz2
rails-7c3cc0902cfe00a0565c02c02d008c1ea75937ea.zip
Merge pull request #26450 from y-yagi/fix_broken_test
use correct Gemfile in `bin/setup` test
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/bin_setup_test.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index 2f076ea2f6..0bbd25db2b 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -6,10 +6,17 @@ 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
@@ -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