aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-12-14 14:52:24 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2012-12-14 14:52:24 +0000
commit9c581d3811f6fba6d3d222896b017e783b6e497a (patch)
tree077ecbc1975194e3b87129c5286841e6d3019e54
parent6ab1a9540b73555f2cabb54860b9ca17e8f226cb (diff)
downloadrails-9c581d3811f6fba6d3d222896b017e783b6e497a.tar.gz
rails-9c581d3811f6fba6d3d222896b017e783b6e497a.tar.bz2
rails-9c581d3811f6fba6d3d222896b017e783b6e497a.zip
Don't use 1.9 hash syntax on 3-2-stable
-rw-r--r--actionpack/test/dispatch/routing/route_set_test.rb16
-rw-r--r--railties/test/application/routing_test.rb12
2 files changed, 14 insertions, 14 deletions
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index d57b1a5637..629b8ed8bd 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -19,7 +19,7 @@ module ActionDispatch
test "url helpers are added when route is added" do
draw do
- get 'foo', to: SimpleApp.new('foo#index')
+ get 'foo', :to => SimpleApp.new('foo#index')
end
assert_equal '/foo', url_helpers.foo_path
@@ -28,8 +28,8 @@ module ActionDispatch
end
draw do
- get 'foo', to: SimpleApp.new('foo#index')
- get 'bar', to: SimpleApp.new('bar#index')
+ get 'foo', :to => SimpleApp.new('foo#index')
+ get 'bar', :to => SimpleApp.new('bar#index')
end
assert_equal '/foo', url_helpers.foo_path
@@ -38,13 +38,13 @@ module ActionDispatch
test "url helpers are updated when route is updated" do
draw do
- get 'bar', to: SimpleApp.new('bar#index'), as: :bar
+ get 'bar', :to => SimpleApp.new('bar#index'), :as => :bar
end
assert_equal '/bar', url_helpers.bar_path
draw do
- get 'baz', to: SimpleApp.new('baz#index'), as: :bar
+ get 'baz', :to => SimpleApp.new('baz#index'), :as => :bar
end
assert_equal '/baz', url_helpers.bar_path
@@ -52,15 +52,15 @@ module ActionDispatch
test "url helpers are removed when route is removed" do
draw do
- get 'foo', to: SimpleApp.new('foo#index')
- get 'bar', to: SimpleApp.new('bar#index')
+ get 'foo', :to => SimpleApp.new('foo#index')
+ get 'bar', :to => SimpleApp.new('bar#index')
end
assert_equal '/foo', url_helpers.foo_path
assert_equal '/bar', url_helpers.bar_path
draw do
- get 'foo', to: SimpleApp.new('foo#index')
+ get 'foo', :to => SimpleApp.new('foo#index')
end
assert_equal '/foo', url_helpers.foo_path
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 07807c3620..e50d744e26 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -235,7 +235,7 @@ module ApplicationTests
controller :foo, <<-RUBY
class FooController < ApplicationController
def index
- render text: "foo"
+ render :text => "foo"
end
end
RUBY
@@ -243,14 +243,14 @@ module ApplicationTests
controller :bar, <<-RUBY
class BarController < ApplicationController
def index
- render text: "bar"
+ render :text => "bar"
end
end
RUBY
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do
- get 'foo', to: 'foo#index'
+ get 'foo', :to => 'foo#index'
end
RUBY
@@ -266,8 +266,8 @@ module ApplicationTests
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do
- get 'foo', to: 'foo#index'
- get 'bar', to: 'bar#index'
+ get 'foo', :to => 'foo#index'
+ get 'bar', :to => 'bar#index'
end
RUBY
@@ -283,7 +283,7 @@ module ApplicationTests
app_file 'config/routes.rb', <<-RUBY
AppTemplate::Application.routes.draw do
- get 'foo', to: 'foo#index'
+ get 'foo', :to => 'foo#index'
end
RUBY