diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-01-16 20:23:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 20:23:51 +0100 |
| commit | 7e52e3b1c004eb22521c844b6adf69a2689cc1da (patch) | |
| tree | cc79ff2e45951541fb8e2d2802c05adab0e5738a /railties/lib/rails | |
| parent | 80873a49af6f52d48224d9c18c60e67c3f9d4731 (diff) | |
| parent | d7097cf5e00faf2ac4d02bd1a5c37801671ce70c (diff) | |
| download | rails-7e52e3b1c004eb22521c844b6adf69a2689cc1da.tar.gz rails-7e52e3b1c004eb22521c844b6adf69a2689cc1da.tar.bz2 rails-7e52e3b1c004eb22521c844b6adf69a2689cc1da.zip | |
Merge pull request #34947 from bogdanvlviv/actioncable-testing-34933
Add `rails test:channels` and fix Action Cable templates
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/channels/application_cable/connection_test.rb.tt | 2 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/test/channels/application_cable/connection_test.rb.tt b/railties/lib/rails/generators/rails/app/templates/test/channels/application_cable/connection_test.rb.tt index cc8337fc6d..800405f15e 100644 --- a/railties/lib/rails/generators/rails/app/templates/test/channels/application_cable/connection_test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/test/channels/application_cable/connection_test.rb.tt @@ -1,5 +1,3 @@ -# frozen_string_literal: true - require "test_helper" class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index ecc458b21e..3a1b62d9d1 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -28,7 +28,7 @@ namespace :test do desc "Run tests quickly, but also reset db" task db: %w[db:test:prepare test] - ["models", "helpers", "controllers", "mailers", "integration", "jobs", "mailboxes"].each do |name| + ["models", "helpers", "channels", "controllers", "mailers", "integration", "jobs", "mailboxes"].each do |name| task name => "test:prepare" do $: << "test" Rails::TestUnit::Runner.rake_run(["test/#{name}"]) |