Merge branch 'sl-qa-staging-39-fix-assign-code-owners-spec-ce' into 'master'

CE port of "Fix assign code owners spec" on EE

See merge request gitlab-org/gitlab-ce!30743

2 files changed, 8 insertions, 1 deletions

diff --git a/qa/qa/page/project/sub_menus/common.rb b/qa/qa/page/project/sub_menus/common.rb
index c94e1e85256..3c9e8085748 100644
--- a/qa/qa/page/project/sub_menus/common.rb
+++ b/qa/qa/page/project/sub_menus/common.rb
@@ -12,7 +12,11 @@ module QA
           end
 
           def within_submenu
-            within('.fly-out-list') do
+            if has_css?('.fly-out-list')
+              within('.fly-out-list') do
+                yield
+              end
+            else
               yield
             end
           end
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index 45cb317e0eb..7969de726e4 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -9,6 +9,7 @@ module QA
                     :description,
                     :source_branch,
                     :target_branch,
+                    :target_new_branch,
                     :assignee,
                     :milestone,
                     :labels,
@@ -27,6 +28,7 @@ module QA
         Repository::ProjectPush.fabricate! do |resource|
           resource.project = project
           resource.branch_name = 'master'
+          resource.new_branch = @target_new_branch
           resource.remote_branch = target_branch
         end
       end
@@ -52,6 +54,7 @@ module QA
         @labels = []
         @file_name = "added_file.txt"
         @file_content = "File Added"
+        @target_new_branch = true
       end
 
       def fabricate!