Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop ambiguous first arg warnings #226

Closed
wants to merge 2 commits into from
Closed

Stop ambiguous first arg warnings #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
513be4d
use parens and silence ambiguous args warnings
jackdempsey Mar 13, 2011
d070313
silence @dummy_path not defined warnings
jackdempsey Mar 13, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class PluginNewGenerator < AppBase
def initialize(*args)
raise Error, "Options should be given after the plugin name. For details run: rails plugin --help" if args[0].blank?

@dummy_path = nil
super
end

Expand Down
12 changes: 6 additions & 6 deletions railties/test/generators/plugin_new_generator_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_generating_test_files_in_full_mode

def test_ensure_that_plugin_options_are_not_passed_to_app_generator
FileUtils.cd(Rails.root)
assert_no_match /It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"])
assert_no_match(/It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"]))
end

def test_ensure_that_test_dummy_can_be_generated_from_a_template
Expand Down Expand Up @@ -85,7 +85,7 @@ def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
def test_ensure_that_skip_active_record_option_is_passed_to_app_generator
run_generator [destination_root, "--skip_active_record"]
assert_no_file "test/dummy/config/database.yml"
assert_no_match /ActiveRecord/, File.read(File.join(destination_root, "test/test_helper.rb"))
assert_no_match(/ActiveRecord/, File.read(File.join(destination_root, "test/test_helper.rb")))
end

def test_ensure_that_database_option_is_passed_to_app_generator
Expand Down Expand Up @@ -134,21 +134,21 @@ def test_ensure_that_skip_javascript_option_is_passed_to_app_generator

def test_template_from_dir_pwd
FileUtils.cd(Rails.root)
assert_match /It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"])
assert_match(/It works from file!/, run_generator([destination_root, "-m", "lib/template.rb"]))
end

def test_ensure_that_tests_works
run_generator
FileUtils.cd destination_root
`bundle install`
assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`
assert_match(/1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
end

def test_ensure_that_tests_works_in_full_mode
run_generator [destination_root, "--full", "--skip_active_record"]
FileUtils.cd destination_root
`bundle install`
assert_match /2 tests, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test`
assert_match(/2 tests, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
end

def test_creating_engine_in_full_mode
Expand All @@ -159,7 +159,7 @@ def test_creating_engine_in_full_mode
end

def test_being_quiet_while_creating_dummy_application
assert_no_match /create\s+config\/application.rb/, run_generator
assert_no_match(/create\s+config\/application.rb/, run_generator)
end

def test_create_mountable_application_with_mountable_option
Expand Down
24 changes: 12 additions & 12 deletions railties/test/generators/shared_generator_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_plugin_new_generate_pretend

def test_invalid_database_option_raises_an_error
content = capture(:stderr){ run_generator([destination_root, "-d", "unknown"]) }
assert_match /Invalid value for \-\-database option/, content
assert_match(/Invalid value for \-\-database option/, content)
end

def test_test_unit_is_skipped_if_required
Expand All @@ -42,21 +42,21 @@ def test_test_unit_is_skipped_if_required

def test_options_before_application_name_raises_an_error
content = capture(:stderr){ run_generator(["--pretend", destination_root]) }
assert_match /Options should be given after the \w+ name. For details run: rails( plugin)? --help\n/, content
assert_match(/Options should be given after the \w+ name. For details run: rails( plugin)? --help\n/, content)
end

def test_name_collision_raises_an_error
reserved_words = %w[application destroy plugin runner test]
reserved_words.each do |reserved|
content = capture(:stderr){ run_generator [File.join(destination_root, reserved)] }
assert_match /Invalid \w+ name #{reserved}. Please give a name which does not match one of the reserved rails words.\n/, content
assert_match(/Invalid \w+ name #{reserved}. Please give a name which does not match one of the reserved rails words.\n/, content)
end
end

def test_name_raises_an_error_if_name_already_used_constant
%w{ String Hash Class Module Set Symbol }.each do |ruby_class|
content = capture(:stderr){ run_generator [File.join(destination_root, ruby_class)] }
assert_match /Invalid \w+ name #{ruby_class}, constant #{ruby_class} is already in use. Please choose another \w+ name.\n/, content
assert_match(/Invalid \w+ name #{ruby_class}, constant #{ruby_class} is already in use. Please choose another \w+ name.\n/, content)
end
end

Expand All @@ -72,8 +72,8 @@ def test_shebang_when_is_the_same_as_default_use_env

def test_template_raises_an_error_with_invalid_path
content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
assert_match /The template \[.*\] could not be loaded/, content
assert_match /non\/existant\/path/, content
assert_match(/The template \[.*\] could not be loaded/, content)
assert_match(/non\/existant\/path/, content)
end

def test_template_is_executed_when_supplied
Expand All @@ -82,7 +82,7 @@ def test_template_is_executed_when_supplied
template.instance_eval "def read; self; end" # Make the string respond to read

generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
assert_match /It works!/, silence(:stdout){ generator.invoke_all }
assert_match(/It works!/, silence(:stdout){ generator.invoke_all })
end

def test_dev_option
Expand All @@ -100,8 +100,8 @@ def test_edge_option

def test_template_raises_an_error_with_invalid_path
content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
assert_match /The template \[.*\] could not be loaded/, content
assert_match /non\/existant\/path/, content
assert_match(/The template \[.*\] could not be loaded/, content)
assert_match(/non\/existant\/path/, content)
end

def test_template_is_executed_when_supplied
Expand All @@ -110,7 +110,7 @@ def test_template_is_executed_when_supplied
template.instance_eval "def read; self; end" # Make the string respond to read

generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
assert_match /It works!/, silence(:stdout){ generator.invoke_all }
assert_match(/It works!/, silence(:stdout){ generator.invoke_all })
end

def test_template_is_executed_when_supplied_an_https_path
Expand All @@ -119,7 +119,7 @@ def test_template_is_executed_when_supplied_an_https_path
template.instance_eval "def read; self; end" # Make the string respond to read

generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
assert_match /It works!/, silence(:stdout){ generator.invoke_all }
assert_match(/It works!/, silence(:stdout){ generator.invoke_all })
end

def test_dev_option
Expand Down Expand Up @@ -191,6 +191,6 @@ def test_builder_option_with_http
generator([destination_root], :builder => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
capture(:stdout) { generator.invoke_all }

default_files.each{ |path| assert_no_file path }
default_files.each{ |path| assert_no_file(path) }
end
end