1 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
index 37ee4591db0..f5b44d30c50 100644
--- a/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Email::Handler::CreateMergeRequestHandler do
-  include_context :email_shared_context
+  include_context 'email shared context'
   let!(:user) do
     create(
       :user,
@@ -16,16 +16,16 @@ RSpec.describe Gitlab::Email::Handler::CreateMergeRequestHandler do
   let(:namespace) { create(:namespace, path: 'gitlabhq') }
   let(:email_raw) { email_fixture('emails/valid_new_merge_request.eml') }
 
-  it_behaves_like :reply_processing_shared_examples
+  after do
+    TestEnv.clean_test_path
+  end
 
   before do
     stub_incoming_email_setting(enabled: true, address: "incoming+%{key}@appmail.adventuretime.ooo")
     stub_config_setting(host: 'localhost')
   end
 
-  after do
-    TestEnv.clean_test_path
-  end
+  it_behaves_like 'reply processing shared examples'
 
   context "when email key" do
     let(:mail) { Mail::Message.new(email_raw) }