Bundler 1.14 compat

c309073c · Matthew Draper · 1e2e2d2d · c309073c
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

railties/test/application/bin_setup_test.rb railties/test/application/bin_setup_test.rb +4 -1

未找到文件。
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -38,9 +38,12 @@ def test_bin_setup_output
        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 ==