Merge pull request rails#52415 from Shopify/fix-rails-test-wrong-file

Fix test command to exit 1 on LoadError

Author: byroot

railties/lib/rails/commands/test/test_command.rb

@@ -32,7 +32,7 @@ def perform(*args)
         run_prepare_task if self.args.none?(EXACT_TEST_ARGUMENT_PATTERN)
         Rails::TestUnit::Runner.run(args)
       rescue Rails::TestUnit::InvalidTestError => error
-        say error.message
+        raise ArgumentError, error.message
       end
 
       # Define Thor tasks to avoid going through Rake and booting twice when using bin/rails test:*

railties/lib/rails/test_unit/runner.rb

@@ -58,15 +58,20 @@ def load_tests(argv)
           patterns = extract_filters(argv)
           tests = list_tests(patterns)
           tests.to_a.each do |path|
-            require File.expand_path(path)
+            abs_path = File.expand_path(path)
+            require abs_path
           rescue LoadError => exception
-            all_tests = list_tests([default_test_glob])
-            corrections = DidYouMean::SpellChecker.new(dictionary: all_tests).correct(path)
+            if exception.path == abs_path
+              all_tests = list_tests([default_test_glob])
+              corrections = DidYouMean::SpellChecker.new(dictionary: all_tests).correct(path)
 
-            if corrections.empty?
-              raise exception
+              if corrections.empty?
+                raise exception
+              end
+              raise InvalidTestError.new(path, DidYouMean::Formatter.message_for(corrections))
+            else
+              raise
             end
-            raise InvalidTestError.new(path, DidYouMean::Formatter.message_for(corrections))
           end
         end
 

railties/test/application/test_runner_test.rb

@@ -971,6 +971,25 @@ def test_did_you_mean_when_specified_file_name_is_close
 
       assert_match(%r{Could not load test file.+test/models/accnt\.rb}, output)
       assert_match(%r{Did you mean?.+test/models/account_test\.rb}, output)
+      assert_not_predicate $?, :success?
+    end
+
+    def test_unrelated_load_error
+      app_file "test/models/account_test.rb", <<-RUBY
+        require "test_helper"
+
+        require "does-not-exist"
+
+        class AccountsTest < ActiveSupport::TestCase
+          def test_truth
+            assert true
+          end
+        end
+      RUBY
+
+      output = run_test_command("test/models/account_test.rb")
+      assert_match("cannot load such file -- does-not-exist", output)
+      assert_not_predicate $?, :success?
     end
 
     def test_pass_TEST_env_on_rake_test