aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-18 11:27:01 -0700
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-08-18 11:27:01 -0700
commit6d9050bae4879994782bb5a9e4bd0ac3ae3be3ef (patch)
treea8d1947539016f98ccc4f6829b697ad97a06fed0
parent946ad5d9f92af5295305069c4549de79501bdcaa (diff)
parent93f1a7219b1fdad34d575d4a8fb8b0278aba7697 (diff)
downloadrails-6d9050bae4879994782bb5a9e4bd0ac3ae3be3ef.tar.gz
rails-6d9050bae4879994782bb5a9e4bd0ac3ae3be3ef.tar.bz2
rails-6d9050bae4879994782bb5a9e4bd0ac3ae3be3ef.zip
Merge pull request #11930 from UncleGene/ties_test
Fix test incompatible with 1.8.7
-rw-r--r--railties/test/application/routing_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 6b2b2c590c..7d6033c54c 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -330,7 +330,7 @@ module ApplicationTests
controller :foo, <<-RUBY
class FooController < ApplicationController
def index
- render text: "foo"
+ render :text => "foo"
end
end
RUBY
@@ -338,14 +338,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
Rails.application.routes.draw do
- get ':locale/foo', to: 'foo#index', as: 'foo'
+ get ':locale/foo', :to => 'foo#index', :as => 'foo'
end
RUBY
@@ -355,7 +355,7 @@ module ApplicationTests
app_file 'config/routes.rb', <<-RUBY
Rails.application.routes.draw do
- get ':locale/bar', to: 'bar#index', as: 'foo'
+ get ':locale/bar', :to => 'bar#index', :as => 'foo'
end
RUBY