Add latest changes from gitlab-org/gitlab@master

7 files changed, 7 insertions, 24 deletions

diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index ce17ca986a6..f718311fbf2 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -58,10 +58,9 @@ module QA
 
             within_element(:"allowed_to_#{action}_dropdown") do
               click_on allowed[:roles]
+              allowed[:users].each { |user| click_on user.username } if allowed.key?(:users)
+              allowed[:groups].each { |group| click_on group.name } if allowed.key?(:groups)
             end
-
-            # Click the select element again to close the dropdown
-            click_element :"allowed_to_#{action}_select"
           end
         end
       end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
index 98178880be3..aa88937504e 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
@@ -28,7 +28,6 @@ module QA
         Flow::Project.add_member(project: project, username: user.username)
 
         Resource::Issue.fabricate_via_api! do |issue|
-          issue.title = 'issue title'
           issue.project = project
         end.visit!
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
index 314a951ba89..e505c0991a6 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/collapse_comments_in_discussions_spec.rb
@@ -8,9 +8,7 @@ module QA
       before do
         Flow::Login.sign_in
 
-        Resource::Issue.fabricate_via_api! do |issue|
-          issue.title = 'issue title'
-        end.visit!
+        Resource::Issue.fabricate_via_api!.visit!
 
         Page::Project::Issue::Show.perform do |show|
           show.select_all_activities_filter
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
index 9234227eff7..6c37e3ecbb9 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
@@ -6,9 +6,7 @@ module QA
       before do
         Flow::Login.sign_in
 
-        Resource::Issue.fabricate_via_api! do |issue|
-          issue.title = 'issue title'
-        end.visit!
+        Resource::Issue.fabricate_via_api!.visit!
       end
 
       it 'user comments on an issue and edits the comment' do
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 32605bc8970..3b231b9930e 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
@@ -3,16 +3,12 @@
 module QA
   context 'Plan', :smoke do
     describe 'Issue creation' do
-      let(:issue_title) { 'issue title' }
-
       before do
         Flow::Login.sign_in
       end
 
       it 'user creates an issue' do
-        issue = Resource::Issue.fabricate_via_browser_ui! do |issue|
-          issue.title = issue_title
-        end
+        issue = Resource::Issue.fabricate_via_browser_ui!
 
         Page::Project::Menu.perform(&:click_issues)
 
@@ -28,9 +24,7 @@ module QA
         end
 
         before do
-          Resource::Issue.fabricate_via_api! do |issue|
-            issue.title = issue_title
-          end.visit!
+          Resource::Issue.fabricate_via_api!.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 a0652971693..4156ba54785 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
@@ -3,14 +3,10 @@
 module QA
   context 'Plan' do
     describe 'filter issue comments activities' do
-      let(:issue_title) { 'issue title' }
-
       before do
         Flow::Login.sign_in
 
-        Resource::Issue.fabricate_via_api! do |issue|
-          issue.title = issue_title
-        end.visit!
+        Resource::Issue.fabricate_via_api!.visit!
       end
 
       it 'user filters comments and activities in an issue' do
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
index b323ee26e47..a0647df4097 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
@@ -16,7 +16,6 @@ module QA
         project.add_member(@user)
 
         Resource::Issue.fabricate_via_api! do |issue|
-          issue.title = 'issue to test mention'
           issue.project = project
         end.visit!
       end