diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/mailers/emails | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/mailers/emails')
-rw-r--r-- | spec/mailers/emails/merge_requests_spec.rb | 2 | ||||
-rw-r--r-- | spec/mailers/emails/pipelines_spec.rb | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/spec/mailers/emails/merge_requests_spec.rb b/spec/mailers/emails/merge_requests_spec.rb index 412cdff3aba..34665d943ab 100644 --- a/spec/mailers/emails/merge_requests_spec.rb +++ b/spec/mailers/emails/merge_requests_spec.rb @@ -64,7 +64,7 @@ RSpec.describe Emails::MergeRequests do } end - it { expect(subject).to have_content('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15MB.') } + it { expect(subject).to have_content('attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15 MB.') } end end end diff --git a/spec/mailers/emails/pipelines_spec.rb b/spec/mailers/emails/pipelines_spec.rb index f0f23fe2097..3ac68721357 100644 --- a/spec/mailers/emails/pipelines_spec.rb +++ b/spec/mailers/emails/pipelines_spec.rb @@ -11,8 +11,8 @@ RSpec.describe Emails::Pipelines do shared_examples_for 'correct pipeline information' do it 'has a correct information' do expect(subject) - .to have_subject "#{project.name} | Pipeline ##{pipeline.id} has " \ - "#{status} for #{pipeline.source_ref} | " \ + .to have_subject "#{status} pipeline for #{pipeline.source_ref} | " \ + "#{project.name} | " \ "#{pipeline.short_sha}".to_s expect(subject).to have_body_text pipeline.source_ref @@ -29,8 +29,8 @@ RSpec.describe Emails::Pipelines do it 'has correct information that there is no merge request link' do expect(subject) - .to have_subject "#{project.name} | Pipeline ##{pipeline.id} has " \ - "#{status} for #{pipeline.source_ref} | " \ + .to have_subject "#{status} pipeline for #{pipeline.source_ref} | " \ + "#{project.name} | " \ "#{pipeline.short_sha}".to_s expect(subject).to have_body_text pipeline.source_ref @@ -49,9 +49,9 @@ RSpec.describe Emails::Pipelines do it 'has correct information that there is a merge request link' do expect(subject) - .to have_subject "#{project.name} | Pipeline ##{pipeline.id} has " \ - "#{status} for #{pipeline.source_ref} | " \ - "#{pipeline.short_sha} in !#{merge_request.iid}".to_s + .to have_subject "#{status} pipeline for #{pipeline.source_ref} | " \ + "#{project.name} | " \ + "#{pipeline.short_sha}".to_s expect(subject).to have_body_text merge_request.to_reference expect(subject).to have_body_text pipeline.source_ref @@ -71,9 +71,9 @@ RSpec.describe Emails::Pipelines do it 'has correct information that there is a merge request link' do expect(subject) - .to have_subject "#{project.name} | Pipeline ##{pipeline.id} has " \ - "#{status} for #{pipeline.source_ref} | " \ - "#{pipeline.short_sha} in !#{merge_request.iid}".to_s + .to have_subject "#{status} pipeline for #{pipeline.source_ref} | " \ + "#{project.name} | " \ + "#{pipeline.short_sha}".to_s expect(subject).to have_body_text merge_request.to_reference expect(subject).to have_body_text pipeline.source_ref @@ -89,8 +89,8 @@ RSpec.describe Emails::Pipelines do let(:sha) { project.commit(ref).sha } it_behaves_like 'correct pipeline information' do - let(:status) { 'succeeded' } - let(:status_text) { 'Your pipeline has passed.' } + let(:status) { 'Succesful' } + let(:status_text) { "Pipeline ##{pipeline.id} has passed!" } end end @@ -102,8 +102,8 @@ RSpec.describe Emails::Pipelines do let(:sha) { project.commit(ref).sha } it_behaves_like 'correct pipeline information' do - let(:status) { 'failed' } - let(:status_text) { 'Your pipeline has failed.' } + let(:status) { 'Failed' } + let(:status_text) { "Pipeline ##{pipeline.id} has failed!" } end end @@ -115,8 +115,8 @@ RSpec.describe Emails::Pipelines do let(:sha) { project.commit(ref).sha } it_behaves_like 'correct pipeline information' do - let(:status) { 'been fixed' } - let(:status_text) { 'Your pipeline has been fixed!' } + let(:status) { 'Fixed' } + let(:status_text) { "Pipeline has been fixed and ##{pipeline.id} has passed!" } end end end |