aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-16 22:59:22 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-16 22:59:22 +0100
commit60bbd1571a87b59b32eb4f5487ddc4e6b8b40bbd (patch)
tree5c4f7e52e2e71a5cc425bae7231584d7a1237768 /railties
parent5e406a3311d73473d846030b423aa26fafa021a2 (diff)
downloadrails-60bbd1571a87b59b32eb4f5487ddc4e6b8b40bbd.tar.gz
rails-60bbd1571a87b59b32eb4f5487ddc4e6b8b40bbd.tar.bz2
rails-60bbd1571a87b59b32eb4f5487ddc4e6b8b40bbd.zip
Fix test
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/actions_test.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index b4fbea4af4..1a928295fd 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -261,7 +261,15 @@ class ActionsTest < Rails::Generators::TestCase
content.gsub!(/^\n/, '')
File.open(route_path, "wb") { |file| file.write(content) }
- assert_file "config/routes.rb", /\.routes\.draw do\n root 'welcome#index'\nend\n\z/
+
+ routes = <<-F
+Rails.application.routes.draw do
+ root 'welcome#index'
+ mount ActionCable.server => '/cable'
+end
+F
+
+ assert_file "config/routes.rb", routes
action :route, "resources :product_lines"
@@ -269,6 +277,7 @@ class ActionsTest < Rails::Generators::TestCase
Rails.application.routes.draw do
resources :product_lines
root 'welcome#index'
+ mount ActionCable.server => '/cable'
end
F
assert_file "config/routes.rb", routes