diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-03 20:17:07 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-03 20:17:07 -0700 |
| commit | 60b8bfa653713bae8bdca266d52f9d00d4acf189 (patch) | |
| tree | fd7474d989ca79c655766109002e66b209529717 /railties/lib/rails | |
| parent | 0a38e2a5ce2eaf7393958721edbfcf2a7fe87334 (diff) | |
| parent | a6c60222c580e4002152b1ac1857673038b1fd42 (diff) | |
| download | rails-60b8bfa653713bae8bdca266d52f9d00d4acf189.tar.gz rails-60b8bfa653713bae8bdca266d52f9d00d4acf189.tar.bz2 rails-60b8bfa653713bae8bdca266d52f9d00d4acf189.zip | |
Merge pull request #2844 from arunagw/warnings_removed_master
Warnings removed from master
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/actions.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_case.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index a7462f39ba..c43a99e85c 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -119,8 +119,8 @@ module Rails if commands.is_a?(Symbol) run "git #{commands}" else - commands.each do |command, options| - run "git #{command} #{options}" + commands.each do |cmd, options| + run "git #{cmd} #{options}" end end end diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb index ee85b70bb5..7319fb79f6 100644 --- a/railties/lib/rails/generators/test_case.rb +++ b/railties/lib/rails/generators/test_case.rb @@ -81,7 +81,7 @@ module Rails # # assert_file "app/controller/products_controller.rb" do |controller| # assert_instance_method :index, content do |index| - # assert_match /Product\.all/, index + # assert_match(/Product\.all/, index) # end # end # @@ -148,7 +148,7 @@ module Rails # # assert_migration "db/migrate/create_products.rb" do |migration| # assert_class_method :up, migration do |up| - # assert_match /create_table/, up + # assert_match(/create_table/, up) # end # end # @@ -161,7 +161,7 @@ module Rails # # assert_file "app/controller/products_controller.rb" do |controller| # assert_instance_method :index, content do |index| - # assert_match /Product\.all/, index + # assert_match(/Product\.all/, index) # end # end # |