Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 0 deletions

diff --git a/spec/mailers/devise_mailer_spec.rb b/spec/mailers/devise_mailer_spec.rb
new file mode 100644
index 00000000000..3a82b118ada
--- /dev/null
+++ b/spec/mailers/devise_mailer_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'email_spec'
+
+RSpec.describe DeviseMailer do
+  describe "#confirmation_instructions" do
+    subject { described_class.confirmation_instructions(user, 'faketoken', {}) }
+
+    context "when confirming the unconfirmed_email" do
+      let(:user) { build(:user, unconfirmed_email: 'jdoe@example.com') }
+
+      it "shows the unconfirmed_email" do
+        expect(subject.body.encoded).to have_text user.unconfirmed_email
+        expect(subject.body.encoded).not_to have_text user.email
+      end
+    end
+
+    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
+        expect(subject.body.encoded).to have_text user.email
+      end
+    end
+  end
+end