aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/assets_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
commit6338e1e68dfbe77c39eaaa17bb4950ef7db73704 (patch)
tree6bca387ebcc859a5f277a65f268cd885c7e1b00c /railties/test/application/assets_test.rb
parent1974911b8d5780ec16e138027a0099bd8482f88f (diff)
parent5ad7f8ab418f0c760dbb584f7c78d94ce32e9ee3 (diff)
downloadrails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.gz
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.bz2
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.zip
Merge pull request #7941 from robin850/master
Use 1.9 Hash syntax in railties
Diffstat (limited to 'railties/test/application/assets_test.rb')
-rw-r--r--railties/test/application/assets_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 8a76b2f614..2506d19e6d 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -8,7 +8,7 @@ module ApplicationTests
include Rack::Test::Methods
def setup
- build_app(:initializers => true)
+ build_app(initializers: true)
boot_rails
end
@@ -44,7 +44,7 @@ module ApplicationTests
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do
- get '*path', :to => lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
+ get '*path', to: lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
end
RUBY
@@ -353,7 +353,7 @@ module ApplicationTests
class ::OmgController < ActionController::Base
def index
flash[:cool_story] = true
- render :text => "ok"
+ render text: "ok"
end
end