diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-02 04:03:38 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-02 04:03:38 -0700 |
| commit | a03da41906be52aabf1b90c02adb601f05b06a8e (patch) | |
| tree | e221d9479fa86a8a06517aea22a80d4dbd72d3a2 | |
| parent | 07438f9ebb82b2d002563af8952db6fa812bbb94 (diff) | |
| parent | 1206e88a7535d29487b416121c31b23762a12abd (diff) | |
| download | rails-a03da41906be52aabf1b90c02adb601f05b06a8e.tar.gz rails-a03da41906be52aabf1b90c02adb601f05b06a8e.tar.bz2 rails-a03da41906be52aabf1b90c02adb601f05b06a8e.zip | |
Merge pull request #6118 from arunagw/build_fix_master
build fix for SharedGeneratorTests
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 33c6c0d856..325f9475e7 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -104,13 +104,13 @@ module SharedGeneratorTests generator([destination_root], :dev => true).expects(:bundle_command).with('install').once quietly { generator.invoke_all } rails_path = File.expand_path('../../..', Rails.root) - assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/ + assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+:\s+["']#{Regexp.escape(rails_path)}["']$/ end def test_edge_option generator([destination_root], :edge => true).expects(:bundle_command).with('install').once quietly { generator.invoke_all } - assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:github\s+=>\s+["']#{Regexp.escape("rails/rails")}["']$} + assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:github\s+:\s+["']#{Regexp.escape("rails/rails")}["']$} end def test_skip_gemfile |