diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-07-30 23:13:59 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-07-30 23:41:19 -0300 |
| commit | 72c96dea2de542feef692b4abce30282d6151d64 (patch) | |
| tree | 15a42e8eb830d611eb026f44c745b1fd9eeb73dd | |
| parent | bfc2b23128fb6157d9bdaa2d2e957162fc4090db (diff) | |
| download | rails-72c96dea2de542feef692b4abce30282d6151d64.tar.gz rails-72c96dea2de542feef692b4abce30282d6151d64.tar.bz2 rails-72c96dea2de542feef692b4abce30282d6151d64.zip | |
Use default argument when testing generators without the need for extra args
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 | ||||
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 55691e373b..f3b439d51a 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -253,7 +253,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_config_jdbc_database_when_no_option_given if defined?(JRUBY_VERSION) - run_generator([destination_root]) + run_generator assert_file "config/database.yml", /sqlite3/ assert_gem "activerecord-jdbcsqlite3-adapter" end @@ -295,7 +295,7 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_inclusion_of_javascript_runtime - run_generator([destination_root]) + run_generator if defined?(JRUBY_VERSION) assert_gem "therubyrhino" else @@ -398,7 +398,7 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_new_hash_style - run_generator [destination_root] + run_generator assert_file "config/initializers/session_store.rb" do |file| assert_match(/config.session_store :cookie_store, key: '_.+_session'/, file) end diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 129515a17b..985644e8af 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -95,7 +95,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase end def test_generating_adds_dummy_app_without_javascript_and_assets_deps - run_generator [destination_root] + run_generator assert_file "test/dummy/app/assets/stylesheets/application.css" @@ -335,7 +335,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase Object.const_set('APP_PATH', Rails.root) FileUtils.touch gemfile_path - run_generator [destination_root] + run_generator assert_file gemfile_path, /gem 'bukkits', path: 'tmp\/bukkits'/ ensure @@ -376,7 +376,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase name = `git config user.name`.chomp rescue "TODO: Write your name" email = `git config user.email`.chomp rescue "TODO: Write your email address" - run_generator [destination_root] + run_generator assert_file "bukkits.gemspec" do |contents| assert_match name, contents assert_match email, contents @@ -386,7 +386,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase def test_git_name_in_license_file name = `git config user.name`.chomp rescue "TODO: Write your name" - run_generator [destination_root] + run_generator assert_file "MIT-LICENSE" do |contents| assert_match name, contents end |