diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-01-23 12:49:16 -0500 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-01-23 12:49:16 -0500 |
| commit | c309073c7476f50dfb1e796d058580f176101c36 (patch) | |
| tree | 0b72429ee92390535a0a91a166f477349f19f363 /railties | |
| parent | 1e2e2d2d50e3be152658b44086b62a929bfc734e (diff) | |
| download | rails-c309073c7476f50dfb1e796d058580f176101c36.tar.gz rails-c309073c7476f50dfb1e796d058580f176101c36.tar.bz2 rails-c309073c7476f50dfb1e796d058580f176101c36.zip | |
Bundler 1.14 compat
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/application/bin_setup_test.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb index f62313f3e1..2f34e55a91 100644 --- a/railties/test/application/bin_setup_test.rb +++ b/railties/test/application/bin_setup_test.rb @@ -38,9 +38,12 @@ module ApplicationTests app_file "db/schema.rb", "" output = `bin/setup 2>&1` + + # Ignore line that's only output by Bundler < 1.14 + output.sub! /^Resolving dependencies\.\.\.\n/, "" + assert_equal(<<-OUTPUT, output) == Installing dependencies == -Resolving dependencies... The Gemfile's dependencies are satisfied == Preparing database == |