diff options
author | kennyj <kennyj@gmail.com> | 2012-02-01 02:44:06 +0900 |
---|---|---|
committer | kennyj <kennyj@gmail.com> | 2012-02-01 15:12:05 +0900 |
commit | c8c84397cdbd44f47ff9f8594a3dabfe8b3b1502 (patch) | |
tree | 1965e60f201f5bea2d9b7e9f0995a15f24da18ff /railties/test/generators | |
parent | f532cd10401cc7b61cae41c6f2d547c2cf790d9c (diff) | |
download | rails-c8c84397cdbd44f47ff9f8594a3dabfe8b3b1502.tar.gz rails-c8c84397cdbd44f47ff9f8594a3dabfe8b3b1502.tar.bz2 rails-c8c84397cdbd44f47ff9f8594a3dabfe8b3b1502.zip |
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
Diffstat (limited to 'railties/test/generators')
-rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 1534f0d828..b558ef8276 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -126,6 +126,11 @@ module SharedGeneratorTests generator([destination_root], :edge => true).expects(:bundle_command).with('install').once quietly { generator.invoke_all } assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$} + 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{^\s+gem\s+["']sass-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/sass-rails.git")}["']$} + assert_file 'Gemfile', %r{^\s+gem\s+["']coffee-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/coffee-rails.git")}["']$} end def test_skip_gemfile |