diff options
| author | Arun Agrawal <arunagw@gmail.com> | 2012-08-24 12:55:55 +0530 |
|---|---|---|
| committer | Arun Agrawal <arunagw@gmail.com> | 2012-08-24 12:55:55 +0530 |
| commit | 0ec7b35e34dd6614e058ba4850fc2809455b5278 (patch) | |
| tree | b39baa66b5efee84620a5d05628f6389082f71ae | |
| parent | d5fe242d2a8aad4868a905da97da3a242fa265a4 (diff) | |
| download | rails-0ec7b35e34dd6614e058ba4850fc2809455b5278.tar.gz rails-0ec7b35e34dd6614e058ba4850fc2809455b5278.tar.bz2 rails-0ec7b35e34dd6614e058ba4850fc2809455b5278.zip | |
We need to have 1-0-stable for joureny gem in edge
Problem : Edge rails can't bundle
Fixes #7437
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 52a2df350f..398319ca55 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -138,13 +138,13 @@ module Rails if options.dev? <<-GEMFILE.strip_heredoc gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}' - gem 'journey', :git => 'git://github.com/rails/journey.git' + gem 'journey', :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable' gem 'arel', :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable' GEMFILE elsif options.edge? <<-GEMFILE.strip_heredoc gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '3-2-stable' - gem 'journey', :git => 'git://github.com/rails/journey.git' + gem 'journey', :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable' gem 'arel', :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable' GEMFILE else diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index c072aaab26..ff4b0f865c 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -120,13 +120,14 @@ module SharedGeneratorTests 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', %r{^gem\s+["']journey["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/journey.git")}["'],\s+:branch\s+=>\s+["']1-0-stable["']$} 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+: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+["']journey["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/journey.git")}["'],\s+:branch\s+=>\s+["']1-0-stable["']$} assert_file 'Gemfile', %r{^gem\s+["']arel["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/arel.git")}["'].*$} end |