1 files changed, 22 insertions, 23 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
index 4a9901f2a84..a002779d7d9 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb
@@ -1,29 +1,31 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Create a new merge request' do
-      before do
-        Flow::Login.sign_in
-
-        @project = Resource::Project.fabricate_via_api! do |project|
+      let(:project) do
+        Resource::Project.fabricate_via_api! do |project|
           project.name = 'project'
         end
+      end
+
+      let(:merge_request_title) { 'One merge request to rule them all' }
+      let(:merge_request_description) { '... to find them, to bring them all, and in the darkness bind them' }
 
-        @merge_request_title = 'One merge request to rule them all'
-        @merge_request_description = '... to find them, to bring them all, and in the darkness bind them'
+      before do
+        Flow::Login.sign_in
       end
 
       it 'creates a basic merge request' do
         Resource::MergeRequest.fabricate_via_browser_ui! do |merge_request|
-          merge_request.project = @project
-          merge_request.title = @merge_request_title
-          merge_request.description = @merge_request_description
+          merge_request.project = project
+          merge_request.title = merge_request_title
+          merge_request.description = merge_request_description
         end
 
         Page::MergeRequest::Show.perform do |merge_request|
-          expect(merge_request).to have_title(@merge_request_title)
-          expect(merge_request).to have_description(@merge_request_description)
+          expect(merge_request).to have_title(merge_request_title)
+          expect(merge_request).to have_description(merge_request_description)
         end
       end
 
@@ -31,32 +33,29 @@ module QA
         gitlab_account_username = "@#{Runtime::User.username}"
 
         milestone = Resource::ProjectMilestone.fabricate_via_api! do |milestone|
-          milestone.project = @project
+          milestone.project = project
         end
 
         label = Resource::Label.fabricate_via_api! do |label|
-          label.project = @project
+          label.project = project
           label.title = 'label'
         end
 
         Resource::MergeRequest.fabricate_via_browser_ui! do |merge_request|
-          merge_request.title = @merge_request_title
-          merge_request.description = @merge_request_description
-          merge_request.project = @project
+          merge_request.title = merge_request_title
+          merge_request.description = merge_request_description
+          merge_request.project = project
           merge_request.milestone = milestone
           merge_request.assignee = 'me'
           merge_request.labels.push(label)
         end
 
         Page::MergeRequest::Show.perform do |merge_request|
-          expect(merge_request).to have_title(@merge_request_title)
-          expect(merge_request).to have_description(@merge_request_description)
+          expect(merge_request).to have_title(merge_request_title)
+          expect(merge_request).to have_description(merge_request_description)
           expect(merge_request).to have_assignee(gitlab_account_username)
           expect(merge_request).to have_label(label.title)
-        end
-
-        Page::Issuable::Sidebar.perform do |sidebar|
-          expect(sidebar).to have_milestone(milestone.title)
+          expect(merge_request).to have_milestone(milestone.title)
         end
       end
     end