diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-22 03:10:26 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-22 03:10:26 -0700 |
| commit | f909e146e41f1eb4e465f17491c7126af8c83845 (patch) | |
| tree | c4edab8348ee85aaa0cecf4fa86757ffaf4f80de /railties/test | |
| parent | 0638e6bb14541d128b11f21c308ae7717196cb6f (diff) | |
| parent | fe7038eac8c1a4df57a0aacf4dd77da5ef87f6df (diff) | |
| download | rails-f909e146e41f1eb4e465f17491c7126af8c83845.tar.gz rails-f909e146e41f1eb4e465f17491c7126af8c83845.tar.bz2 rails-f909e146e41f1eb4e465f17491c7126af8c83845.zip | |
Merge pull request #6437 from avakhov/gen-gem-method
Use new hash syntax for generators gem method
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/actions_test.rb | 8 | ||||
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb index a8c8fcd5b7..bc086c5986 100644 --- a/railties/test/generators/actions_test.rb +++ b/railties/test/generators/actions_test.rb @@ -67,6 +67,14 @@ class ActionsTest < Rails::Generators::TestCase assert_file 'Gemfile', /^gem "rspec-rails"$/ end + def test_gem_should_include_options + run_generator + + action :gem, 'rspec', github: 'dchelimsky/rspec', tag: '1.2.9.rc1' + + assert_file 'Gemfile', /gem "rspec", github: "dchelimsky\/rspec", tag: "1\.2\.9\.rc1"/ + end + def test_gem_group_should_wrap_gems_in_a_group run_generator diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 51374e5f3f..58740978aa 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -279,7 +279,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase run_generator [destination_root] - assert_file gemfile_path, /gem 'bukkits', :path => 'tmp\/bukkits'/ + assert_file gemfile_path, /gem 'bukkits', path: 'tmp\/bukkits'/ ensure Object.send(:remove_const, 'APP_PATH') FileUtils.rm gemfile_path @@ -294,7 +294,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase run_generator [destination_root, "--skip-gemfile-entry"] assert_file gemfile_path do |contents| - assert_no_match(/gem 'bukkits', :path => 'tmp\/bukkits'/, contents) + assert_no_match(/gem 'bukkits', path: 'tmp\/bukkits'/, contents) end ensure Object.send(:remove_const, 'APP_PATH') |