aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/lib/active_support/testing/isolation.rb2
-rw-r--r--railties/test/application/rack/logger_test.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index 8f22df6f2b..50ec50ca52 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -39,7 +39,7 @@ module ActiveSupport
include Enumerable
# default to 2 cores
- CORES = ENV['TEST_CORES'].to_i || 2
+ CORES = (ENV['TEST_CORES'] || 2).to_i
def initialize list
@list = list
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index a77c6f472c..46fd09cb26 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -5,6 +5,7 @@ require "rack/test"
module ApplicationTests
module RackTests
class LoggerTest < ActiveSupport::TestCase
+ include ActiveSupport::Testing::Isolation
include ActiveSupport::LogSubscriber::TestHelper
include Rack::Test::Methods
@@ -17,6 +18,7 @@ module ApplicationTests
end
def teardown
+ super
teardown_app
end