TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Bundler 1.14 compat

Browse Source
This commit is contained in:
Matthew Draper 2017-01-23 12:49:16 -05:00
parent 1e2e2d2d50
commit c309073c74
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
railties/test/application/bin_setup_test.rb
View File

@ -38,9 +38,12 @@ def test_bin_setup_output
app_file "db/schema.rb", "" app_file "db/schema.rb", ""
output = `bin/setup 2>&1` output = `bin/setup 2>&1`
# Ignore line that's only output by Bundler < 1.14
output.sub! /^Resolving dependencies\.\.\.\n/, ""
assert_equal(<<-OUTPUT, output) assert_equal(<<-OUTPUT, output)
== Installing dependencies == == Installing dependencies ==
Resolving dependencies...
The Gemfile's dependencies are satisfied The Gemfile's dependencies are satisfied
== Preparing database == == Preparing database ==