diff options
| author | Matthew Eagar <meagar@gmail.com> | 2017-01-26 08:32:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 08:32:05 -0500 |
| commit | 4cf981f84637022bcf225afd3f13e088d3b0d154 (patch) | |
| tree | 88421e27bcf10b4dc4ae0beae62d2e8c198b8454 /railties/test | |
| parent | 255babc98b650db7469653aba6405a60efc9e608 (diff) | |
| parent | f543b97fcc52168119d4e016eb50afbda702e601 (diff) | |
| download | rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.gz rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.bz2 rails-4cf981f84637022bcf225afd3f13e088d3b0d154.zip | |
Merge branch 'master' into fix-missing-partial-iteration
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/bin_setup_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb index 2f34e55a91..0fb995900f 100644 --- a/railties/test/application/bin_setup_test.rb +++ b/railties/test/application/bin_setup_test.rb @@ -40,7 +40,7 @@ module ApplicationTests output = `bin/setup 2>&1` # Ignore line that's only output by Bundler < 1.14 - output.sub! /^Resolving dependencies\.\.\.\n/, "" + output.sub!(/^Resolving dependencies\.\.\.\n/, "") assert_equal(<<-OUTPUT, output) == Installing dependencies == |