diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-23 07:36:44 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-23 07:36:44 -0700 |
| commit | 1327660bfd7332f6db673669eb16c5a8b9e56e4b (patch) | |
| tree | bcafedf60185ec56cc9c79fd5fd6e3859d85fdf8 /railties/test | |
| parent | 95b0f6305e31800df7be66ab1c4cbcdaa2a4a528 (diff) | |
| parent | a6a48130837d7d573da641375093e877f8225a79 (diff) | |
| download | rails-1327660bfd7332f6db673669eb16c5a8b9e56e4b.tar.gz rails-1327660bfd7332f6db673669eb16c5a8b9e56e4b.tar.bz2 rails-1327660bfd7332f6db673669eb16c5a8b9e56e4b.zip | |
Merge pull request #6836 from flyerhzm/ruby_19_hash
Ruby 1.9 hash syntax for generated code
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/configuration_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index c1aa98e481..c813defe93 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -69,11 +69,11 @@ module ApplicationTests Rails.env = "development" assert_equal [:default, "development"], Rails.groups - assert_equal [:default, "development", :assets], Rails.groups(:assets => [:development]) - assert_equal [:default, "development", :another, :assets], Rails.groups(:another, :assets => %w(development)) + assert_equal [:default, "development", :assets], Rails.groups(assets: [:development]) + assert_equal [:default, "development", :another, :assets], Rails.groups(:another, assets: %w(development)) Rails.env = "test" - assert_equal [:default, "test"], Rails.groups(:assets => [:development]) + assert_equal [:default, "test"], Rails.groups(assets: [:development]) ENV["RAILS_GROUPS"] = "javascripts,stylesheets" assert_equal [:default, "test", "javascripts", "stylesheets"], Rails.groups @@ -567,7 +567,7 @@ module ApplicationTests app_file 'app/controllers/application_controller.rb', <<-RUBY class ApplicationController < ActionController::Base - protect_from_forgery :with => :reset_session # as we are testing API here + protect_from_forgery with: :reset_session # as we are testing API here end RUBY |