From 15ac2f0b6b2702f180707f480eb966a4e3b96e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 5 May 2014 14:08:36 -0300 Subject: [PATCH] Fix tests with bundler 1.6 --- actionmailer/CHANGELOG.md | 2 +- actionpack/CHANGELOG.md | 2 +- activemodel/CHANGELOG.md | 2 +- activerecord/CHANGELOG.md | 2 +- activesupport/CHANGELOG.md | 2 +- guides/CHANGELOG.md | 2 +- railties/CHANGELOG.md | 2 +- railties/test/generators/plugin_new_generator_test.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 3c54bba216826..df34b58d1a8ea 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 4.0.5 (May 5, 2014) ## +## Rails 4.0.5 (May 6, 2014) ## *No changes* diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index c69c1cfcf6489..3339719b7c259 100644 --- a/actionpack/CHANGELOG.md +++ b/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. diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 8cc743f0bb191..fa4741cd0f8e0 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 4.0.5 (May 5, 2014) ## +## Rails 4.0.5 (May 6, 2014) ## *No changes* diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index ced94b8241552..b859784676e07 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 4.0.5 (May 5, 2014) ## +## Rails 4.0.5 (May 6, 2014) ## *No changes* diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 5a7d12e671355..d87f36a17fdac 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 4.0.5 (May 5, 2014) ## +## Rails 4.0.5 (May 6, 2014) ## *No changes* diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index 111fe72d37b9a..c2ac1b1fc5095 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 4.0.5 (May 5, 2014) ## +## Rails 4.0.5 (May 6, 2014) ## *No changes* diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 20eff93e7c263..f865b0bc1fd75 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 4.0.5 (May 5, 2014) ## +## Rails 4.0.5 (May 6, 2014) ## *No changes* diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index ac71fb58843e1..14b2b7d1ddcd8 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/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