Permalink
Browse files

Fix tests with bundler 1.6

  • Loading branch information...
1 parent 250741d commit 15ac2f0b6b2702f180707f480eb966a4e3b96e25 @rafaelfranca rafaelfranca committed May 5, 2014
View
2 actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
*No changes*
View
2 actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
* Only accept actions without File::SEPARATOR in the name.
View
2 activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
*No changes*
View
2 activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
*No changes*
View
2 activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
*No changes*
View
2 guides/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
*No changes*
View
2 railties/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 4.0.5 (May 5, 2014) ##
+## Rails 4.0.5 (May 6, 2014) ##
*No changes*
View
2 railties/test/generators/plugin_new_generator_test.rb
@@ -139,7 +139,7 @@ def test_generation_runs_bundle_install_with_full_and_mountable
assert_match(/bukkits/, contents)
end
assert_match(/run bundle install/, result)
- assert_match(/Using bukkits \(0\.0\.1\)/, result)
+ assert_match(/Using bukkits \(?0\.0\.1\)?/, result)
assert_match(/Your bundle is complete/, result)
assert_equal 1, result.scan("Your bundle is complete").size
end

0 comments on commit 15ac2f0

Please sign in to comment.