diff options
| author | Michael Koziarski <michael@koziarski.com> | 2012-03-27 20:01:17 -0700 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2012-03-27 20:01:17 -0700 |
| commit | f8b4ef189e1aea954e400d9a49debfe930d12f75 (patch) | |
| tree | 8324a85d73fd1d9bb411309761f9ee051f9a8b2a | |
| parent | 460d2c7c28928ab0d880675c3a7a74e81605e835 (diff) | |
| parent | 79c8defa90541ba46d1f241f2adc24674e640d1b (diff) | |
| download | rails-f8b4ef189e1aea954e400d9a49debfe930d12f75.tar.gz rails-f8b4ef189e1aea954e400d9a49debfe930d12f75.tar.bz2 rails-f8b4ef189e1aea954e400d9a49debfe930d12f75.zip | |
Merge pull request #5624 from rafaelfranca/fix-build
Fix build
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index b262951b88..c072aaab26 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -127,7 +127,7 @@ module SharedGeneratorTests quietly { generator.invoke_all } assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["'],\s+:branch\s+=>\s+["']3-2-stable["']$} assert_file 'Gemfile', %r{^gem\s+["']journey["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/journey.git")}["']$} - assert_file 'Gemfile', %r{^gem\s+["']arel["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/arel.git")}["']$} + assert_file 'Gemfile', %r{^gem\s+["']arel["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/arel.git")}["'].*$} end def test_skip_gemfile |