Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 19 insertions, 1 deletions

diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
index aa3a60b867a..f7b194abcee 100644
--- a/spec/models/email_spec.rb
+++ b/spec/models/email_spec.rb
@@ -3,8 +3,14 @@
 require 'spec_helper'
 
 describe Email do
+  describe 'modules' do
+    subject { described_class }
+
+    it { is_expected.to include_module(AsyncDeviseEmail) }
+  end
+
   describe 'validations' do
-    it_behaves_like 'an object with email-formated attributes', :email do
+    it_behaves_like 'an object with RFC3696 compliant email-formated attributes', :email do
       subject { build(:email) }
     end
   end
@@ -45,4 +51,16 @@ describe Email do
       expect(build(:email, user: user).username).to eq user.username
     end
   end
+
+  describe 'Devise emails' do
+    let!(:user) { create(:user) }
+
+    describe 'behaviour' do
+      it 'sends emails asynchronously' do
+        expect do
+          user.emails.create!(email: 'hello@hello.com')
+        end.to have_enqueued_job.on_queue('mailers')
+      end
+    end
+  end
 end