1 files changed, 8 insertions, 9 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
index 3c2c068dfd1..15c41581e6b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
@@ -3,31 +3,30 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Download merge request patch and diff' do
-      before(:context) do
-        @merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
+      let(:merge_request) do
+        Resource::MergeRequest.fabricate_via_api! do |merge_request|
           merge_request.title = 'This is a merge request'
           merge_request.description = '... for downloading patches and diffs'
         end
       end
 
-      it 'views the merge request email patches' do
+      before do
         Flow::Login.sign_in
+        merge_request.visit!
+      end
 
-        @merge_request.visit!
+      it 'views the merge request email patches' do
         Page::MergeRequest::Show.perform(&:view_email_patches)
 
         expect(page.text).to start_with('From')
         expect(page).to have_content('Subject: [PATCH] This is a test commit')
-        expect(page).to have_content("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
+        expect(page).to have_content("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
       end
 
       it 'views the merge request plain diff' do
-        Flow::Login.sign_in
-
-        @merge_request.visit!
         Page::MergeRequest::Show.perform(&:view_plain_diff)
 
-        expect(page.text).to start_with("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
+        expect(page.text).to start_with("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
         expect(page).to have_content('+File Added')
       end
     end