Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 14 deletions

diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
index 90290b4f2a0..eecf485a518 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
@@ -22,8 +22,15 @@ module QA
 
         expect(page).to have_content(/@#{user.username}(\n| )?Given access/)
 
-        # Wait for Action Mailer to deliver messages
-        mailhog_json = Support::Retrier.retry_until(sleep_interval: 1) do
+        mailhog_items = mailhog_json.dig('items')
+
+        expect(mailhog_items).to include(an_object_satisfying { |o| /project was granted/ === o.dig('Content', 'Headers', 'Subject', 0) })
+      end
+
+      private
+
+      def mailhog_json
+        Support::Retrier.retry_until(sleep_interval: 1) do
           Runtime::Logger.debug(%Q[retrieving "#{QA::Runtime::MailHog.api_messages_url}"])
 
           mailhog_response = get QA::Runtime::MailHog.api_messages_url
@@ -33,10 +40,6 @@ module QA
           # Expect at least two invitation messages: group and project
           mailhog_data if mailhog_data.dig('total') >= 2
         end
-
-        # Check json result from mailhog
-        mailhog_items = mailhog_json.dig('items')
-        expect(mailhog_items).to include(an_object_satisfying { |o| /project was granted/ === o.dig('Content', 'Headers', 'Subject', 0) })
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
index 254efb741b3..32605bc8970 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
@@ -28,11 +28,9 @@ module QA
         end
 
         before do
-          issue = Resource::Issue.fabricate_via_api! do |issue|
+          Resource::Issue.fabricate_via_api! do |issue|
             issue.title = issue_title
-          end
-
-          issue.visit!
+          end.visit!
         end
 
         it 'user comments on an issue with an attachment' do
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
index a4f6b0bb1bf..a0652971693 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
@@ -8,11 +8,9 @@ module QA
       before do
         Flow::Login.sign_in
 
-        issue = Resource::Issue.fabricate_via_api! do |issue|
+        Resource::Issue.fabricate_via_api! do |issue|
           issue.title = issue_title
-        end
-
-        issue.visit!
+        end.visit!
       end
 
       it 'user filters comments and activities in an issue' do