Skip to content

Commit

Permalink
Use default argument when testing generators without the need for ext…
Browse files Browse the repository at this point in the history
…ra args
  • Loading branch information
carlosantoniodasilva committed Jul 31, 2014
1 parent bfc2b23 commit 72c96de
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions railties/test/generators/app_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def test_config_jdbc_database

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
Expand Down Expand Up @@ -295,7 +295,7 @@ def test_generator_if_skip_sprockets_is_given
end

def test_inclusion_of_javascript_runtime
run_generator([destination_root])
run_generator
if defined?(JRUBY_VERSION)
assert_gem "therubyrhino"
else
Expand Down Expand Up @@ -398,7 +398,7 @@ def test_no_active_record_or_test_unit_if_skips_given
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
Expand Down
8 changes: 4 additions & 4 deletions railties/test/generators/plugin_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def test_generating_adds_dummy_app_rake_tasks_without_unit_test_files
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"

Expand Down Expand Up @@ -335,7 +335,7 @@ def test_creating_plugin_in_app_directory_adds_gemfile_entry
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
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_git_name_and_email_in_gemspec_file
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
Expand All @@ -386,7 +386,7 @@ def test_git_name_and_email_in_gemspec_file
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
Expand Down

0 comments on commit 72c96de

Please sign in to comment.