Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run bundler update to fix bundler audit vulnerabilities #367

Merged
merged 2 commits into from
Feb 12, 2024
Merged

Run bundler update to fix bundler audit vulnerabilities #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e1d52d
Run bundler update to fix bundler audit vulnerabilities
Janell-Huyck Feb 12, 2024
e78b2fb
Fix mailer test after bundle update
Janell-Huyck Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ GEM
date (3.3.4)
diff-lcs (1.5.1)
docile (1.4.0)
dotenv (2.8.1)
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
dotenv (3.0.0)
dotenv-rails (3.0.0)
dotenv (= 3.0.0)
railties (>= 6.1)
ed25519 (1.3.0)
erubi (1.12.0)
execjs (2.9.1)
Expand Down Expand Up @@ -171,11 +171,11 @@ GEM
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.5)
minitest (5.21.2)
minitest (5.22.2)
msgpack (1.7.2)
mutex_m (0.2.0)
mysql2 (0.5.5)
net-imap (0.4.9.1)
mysql2 (0.5.6)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -190,17 +190,17 @@ GEM
net-protocol
net-ssh (7.2.1)
nio4r (2.7.0)
nokogiri (1.16.0-aarch64-linux)
nokogiri (1.16.2-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.0-arm-linux)
nokogiri (1.16.2-arm-linux)
racc (~> 1.4)
nokogiri (1.16.0-arm64-darwin)
nokogiri (1.16.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.0-x86-linux)
nokogiri (1.16.2-x86-linux)
racc (~> 1.4)
nokogiri (1.16.0-x86_64-darwin)
nokogiri (1.16.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.0-x86_64-linux)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
pagy (6.4.3)
parallel (1.24.0)
Expand Down Expand Up @@ -255,14 +255,14 @@ GEM
rb-readline (0.5.5)
regexp_parser (2.9.0)
rexml (3.2.6)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
Expand All @@ -271,7 +271,7 @@ GEM
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rspec-support (3.13.0)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.60.2)
Expand Down Expand Up @@ -362,7 +362,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.12)
zeitwerk (2.6.13)

PLATFORMS
aarch64-linux
Expand Down
21 changes: 15 additions & 6 deletions spec/mailers/publication_mailer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
let(:mail) { described_class.publication_submit(submitter, publication).deliver_now }

context 'when MAIL_SENDER has name and email' do
before do
stub_const('ENV', { 'MAIL_SENDER' => 'Sender Name <sender@example.com>' })
around do |example|
original_mail_sender = ENV.fetch('MAIL_SENDER', nil)
ENV['MAIL_SENDER'] = 'Sender Name <sender@example.com>'
example.run
ENV['MAIL_SENDER'] = original_mail_sender
end

let(:mail) { described_class.publication_submit(submitter, publication).deliver_now }
Expand All @@ -22,8 +25,11 @@
end

context 'when MAIL_SENDER is only an email' do
before do
stub_const('ENV', { 'MAIL_SENDER' => 'sender@example.com' })
around do |example|
original_mail_sender = ENV.fetch('MAIL_SENDER', nil)
ENV['MAIL_SENDER'] = 'sender@example.com'
example.run
ENV['MAIL_SENDER'] = original_mail_sender
end

let(:mail) { described_class.publication_submit(submitter, publication).deliver_now }
Expand Down Expand Up @@ -64,8 +70,11 @@
end

context 'when MAIL_SENDER is empty' do
before do
allow(ENV).to receive(:fetch).with('MAIL_SENDER').and_return(nil)
around do |example|
original_mail_sender = ENV.fetch('MAIL_SENDER', nil)
ENV['MAIL_SENDER'] = ''
example.run
ENV['MAIL_SENDER'] = original_mail_sender
end

it 'raises an error' do
Expand Down