Merge pull request #24258 from jeremy/cable/faye-and-isolated-tests

Cable: add isolated tests and FAYE=1 test runs

2 files changed, 15 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index b4517e2545..1d70ce96ea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,10 @@ task :default => %w(test test:isolated)
   task task_name do
     errors = []
     FRAMEWORKS.each do |project|
-      system(%(cd #{project} && #{$0} #{task_name})) || errors << project
+      system(%(cd #{project} && #{$0} #{task_name} --trace)) || errors << project
+    end
+    if task_name =~ /test/
+      system(%(cd actioncable && env FAYE=1 #{$0} #{task_name} --trace)) || errors << 'actioncable-faye'
     end
     fail("Errors in #{errors.join(', ')}") unless errors.empty?
   end
@@ -30,9 +33,10 @@ end
 desc "Smoke-test all projects"
 task :smoke do
   (FRAMEWORKS - %w(activerecord)).each do |project|
-    system %(cd #{project} && #{$0} test:isolated)
+    system %(cd #{project} && #{$0} test:isolated --trace)
   end
-  system %(cd activerecord && #{$0} sqlite3:isolated_test)
+  system %(cd activerecord && #{$0} sqlite3:isolated_test --trace)
+  system %(cd actioncable && env FAYE=1 #{$0} test:isolated --trace)
 end
 
 desc "Install gems for all projects."
diff --git a/actioncable/Rakefile b/actioncable/Rakefile
index 1d77fc7067..5ba7b7f7f6 100644
--- a/actioncable/Rakefile
+++ b/actioncable/Rakefile
@@ -19,6 +19,14 @@ Rake::TestTask.new do |t|
   t.ruby_opts = ["--dev"] if defined?(JRUBY_VERSION)
 end
 
+namespace :test do
+  task :isolated do
+    Dir.glob("test/**/*_test.rb").all? do |file|
+      sh(Gem.ruby, '-w', '-Ilib:test', file)
+    end or raise "Failures"
+  end
+end
+
 namespace :assets do
   root_path = Pathname.new(dir)
   destination_path = root_path.join("lib/assets/compiled")