aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-12-21 16:46:42 +0100
committerYves Senn <yves.senn@gmail.com>2015-12-21 16:46:42 +0100
commita88ab73f7e050bc1962e93fe76e73f303c1eaaa5 (patch)
tree58b53dadb878e5d8fb01b385dcf9249cd4b18a1c /railties/test
parent78b523d1823518da698d240131875d84f23c938c (diff)
parent12dd2ca86397794a0b07c4c775fded7010a20e7e (diff)
downloadrails-a88ab73f7e050bc1962e93fe76e73f303c1eaaa5.tar.gz
rails-a88ab73f7e050bc1962e93fe76e73f303c1eaaa5.tar.bz2
rails-a88ab73f7e050bc1962e93fe76e73f303c1eaaa5.zip
Merge pull request #22684 from teknofire/fix-using-add_resource-with-a-block-after-gem-call
Fix using add_resource with a block after gem in custom generators
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/actions_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 2f42ce894b..a1a17d90d8 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -52,6 +52,15 @@ class ActionsTest < Rails::Generators::TestCase
assert_file 'Gemfile', /source 'http:\/\/gems\.github\.com' do\n gem 'rspec-rails'\nend/
end
+ def test_add_source_with_block_adds_source_to_gemfile_after_gem
+ run_generator
+ action :gem, 'will-paginate'
+ action :add_source, 'http://gems.github.com' do
+ gem 'rspec-rails'
+ end
+ assert_file 'Gemfile', /gem 'will-paginate'\nsource 'http:\/\/gems\.github\.com' do\n gem 'rspec-rails'\nend/
+ end
+
def test_gem_should_put_gem_dependency_in_gemfile
run_generator
action :gem, 'will-paginate'