diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-14 21:09:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-14 21:09:55 +0300 |
commit | 18ffa5e88194d8f3fd63bee0221de5bc1fbdfe94 (patch) | |
tree | 02a3b1d84d0dbe876dc16dcf7de381af88d5e879 /spec/mailers/devise_mailer_spec.rb | |
parent | 66bd1f0fdcaf84fa3412c70d7962b49eb8a48fde (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers/devise_mailer_spec.rb')
-rw-r--r-- | spec/mailers/devise_mailer_spec.rb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/spec/mailers/devise_mailer_spec.rb b/spec/mailers/devise_mailer_spec.rb index 3a82b118ada..4637df9c8a3 100644 --- a/spec/mailers/devise_mailer_spec.rb +++ b/spec/mailers/devise_mailer_spec.rb @@ -7,10 +7,20 @@ RSpec.describe DeviseMailer do describe "#confirmation_instructions" do subject { described_class.confirmation_instructions(user, 'faketoken', {}) } + context "when confirming a new account" do + let(:user) { build(:user, created_at: 1.minute.ago, unconfirmed_email: nil) } + + it "shows the expected text" do + expect(subject.body.encoded).to have_text "Welcome" + expect(subject.body.encoded).not_to have_text user.email + end + end + context "when confirming the unconfirmed_email" do let(:user) { build(:user, unconfirmed_email: 'jdoe@example.com') } - it "shows the unconfirmed_email" do + it "shows the expected text" do + expect(subject.body.encoded).not_to have_text "Welcome" expect(subject.body.encoded).to have_text user.unconfirmed_email expect(subject.body.encoded).not_to have_text user.email end @@ -19,7 +29,8 @@ RSpec.describe DeviseMailer do context "when re-confirming the primary email after a security issue" do let(:user) { build(:user, created_at: 10.days.ago, unconfirmed_email: nil) } - it "shows the primary email" do + it "shows the expected text" do + expect(subject.body.encoded).not_to have_text "Welcome" expect(subject.body.encoded).to have_text user.email end end |