Skip to content

Commit 3d002c1

Browse files
committed
Fix test infra depending on CI=true
The CI env var was recently [changed][1] to be specific for the application being tested instead of the framework tests. Because of this, these lines which should have been true before are now false. [1]: 1f0262a
1 parent c4fbb0f commit 3d002c1

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

activesupport/lib/active_support/testing/strict_warnings.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def warn(message, *)
2828

2929
return unless message.include?(PROJECT_ROOT)
3030
return if ALLOWED_WARNINGS.match?(message)
31-
return unless ENV["RAILS_STRICT_WARNINGS"] || ENV["CI"]
31+
return unless ENV["RAILS_STRICT_WARNINGS"] || ENV["BUILDKITE"]
3232

3333
raise message
3434
end

tools/test_common.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
ENV.delete("CI") # CI has affect on the applications, and we don't want it applied to the apps.
66

77
Minitest::Ci.report_dir = File.join(__dir__, "../test-reports/#{ENV['BUILDKITE_JOB_ID']}")
8-
end
98

10-
if ENV["CI"]
119
module DisableSkipping # :nodoc:
1210
private
1311
def skip(message = nil, *)

0 commit comments

Comments
 (0)