Skip to content

Commit 40069a2

Browse files
authored
Merge pull request #2794 from rspec/fix-ruby-3-3-5
Silence warning in mailer preview path check
2 parents ebe1ed2 + db9ce60 commit 40069a2

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

example_app_generator/spec/verify_mailer_preview_path_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ def capture_exec(*ops)
3333
.reject { |line| line =~ /DEPRECATION WARNING/ }
3434
.reject { |line| line =~ /warning: previous/ }
3535
.reject { |line| line =~ /warning: already/ }
36+
.reject { |line| line =~ /but will no longer be part of the default gems / }
37+
.reject { |line| line =~ /You can add .* to your Gemfile/ }
3638
.join
3739
.chomp
3840
CaptureExec.new(out, $?.exitstatus)

features/backtrace_filtering.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ Feature: Backtrace filtering
3939
Scenario: Using the bare `rspec` command
4040
When I run `rspec`
4141
Then the output should contain "1 example, 1 failure"
42-
And the output should not contain "activesupport"
42+
And the output should not contain "actionpack"
4343

4444
Scenario: Using `rspec --backtrace`
4545
When I run `rspec --backtrace`
4646
Then the output should contain "1 example, 1 failure"
47-
And the output should contain "activesupport"
47+
And the output should contain "actionpack"

spec/rspec/rails/matchers/have_enqueued_mail_spec.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,13 @@ def self.name; "NonMailerJob"; end
373373
}
374374
end
375375

376-
context 'when parameterized', skip: !RSpec::Rails::FeatureCheck.has_action_mailer_parameterized? do
376+
context 'when parameterized' do
377+
before do
378+
unless RSpec::Rails::FeatureCheck.has_action_mailer_parameterized?
379+
skip "This version of Rails does not support parameterized mailers"
380+
end
381+
end
382+
377383
it "passes when mailer is parameterized" do
378384
expect {
379385
TestMailer.with('foo' => 'bar').test_email.deliver_later

0 commit comments

Comments
 (0)