From c309073c7476f50dfb1e796d058580f176101c36 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Mon, 23 Jan 2017 12:49:16 -0500
Subject: Bundler 1.14 compat

---
 railties/test/application/bin_setup_test.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'railties/test')

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 ==
-- 
cgit v1.2.3