diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-25 12:44:02 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-25 12:44:02 +1030 |
| commit | d81a9d79accb37a52cedc3e4049b50a2fcb7122e (patch) | |
| tree | f89fbfcd6daca18e77cac98a56eeeadee791b53d /railties/test | |
| parent | 8db771bb6977b83408317b6588967d288f5a44cc (diff) | |
| parent | 1afd414488fe73c927242e072af0ff9ab21d2599 (diff) | |
| download | rails-d81a9d79accb37a52cedc3e4049b50a2fcb7122e.tar.gz rails-d81a9d79accb37a52cedc3e4049b50a2fcb7122e.tar.bz2 rails-d81a9d79accb37a52cedc3e4049b50a2fcb7122e.zip | |
Merge pull request #23488 from maclover7/actioncable-defaults
Enable ActionCable routes by default
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/rake_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb index d1c828b509..3db467256e 100644 --- a/railties/test/application/rake_test.rb +++ b/railties/test/application/rake_test.rb @@ -118,7 +118,7 @@ module ApplicationTests end def test_code_statistics_sanity - assert_match "Code LOC: 14 Test LOC: 0 Code to Test Ratio: 1:0.0", + assert_match "Code LOC: 16 Test LOC: 0 Code to Test Ratio: 1:0.0", Dir.chdir(app_path){ `bin/rails stats` } end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index c2c3638f07..bc80c7eb1b 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -406,9 +406,6 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_file "config/cable.yml" assert_no_file "app/assets/javascripts/cable.coffee" assert_no_file "app/channels" - assert_file "app/views/layouts/application.html.erb" do |content| - assert_no_match(/action_cable_meta_tag/, content) - end assert_file "Gemfile" do |content| assert_no_match(/redis/, content) end |