Skip to content

Commit

Permalink
Fix tests with bundler 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelfranca committed May 6, 2014
1 parent 250741d commit 15ac2f0
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
## Rails 4.0.5 (May 5, 2014) ##
## Rails 4.0.5 (May 6, 2014) ##

*No changes*

Expand Down
2 changes: 1 addition & 1 deletion 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.

Expand Down
2 changes: 1 addition & 1 deletion activemodel/CHANGELOG.md
@@ -1,4 +1,4 @@
## Rails 4.0.5 (May 5, 2014) ##
## Rails 4.0.5 (May 6, 2014) ##

*No changes*

Expand Down
2 changes: 1 addition & 1 deletion activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
## Rails 4.0.5 (May 5, 2014) ##
## Rails 4.0.5 (May 6, 2014) ##

*No changes*

Expand Down
2 changes: 1 addition & 1 deletion activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
## Rails 4.0.5 (May 5, 2014) ##
## Rails 4.0.5 (May 6, 2014) ##

*No changes*

Expand Down
2 changes: 1 addition & 1 deletion guides/CHANGELOG.md
@@ -1,4 +1,4 @@
## Rails 4.0.5 (May 5, 2014) ##
## Rails 4.0.5 (May 6, 2014) ##

*No changes*

Expand Down
2 changes: 1 addition & 1 deletion railties/CHANGELOG.md
@@ -1,4 +1,4 @@
## Rails 4.0.5 (May 5, 2014) ##
## Rails 4.0.5 (May 6, 2014) ##

*No changes*

Expand Down
2 changes: 1 addition & 1 deletion railties/test/generators/plugin_new_generator_test.rb
Expand Up @@ -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
Expand Down

0 comments on commit 15ac2f0

Please sign in to comment.