diff options
| author | Sanad Liaquat <sliaquat@gitlab.com> | 2019-07-15 22:32:43 +0500 |
|---|---|---|
| committer | Sanad Liaquat <sliaquat@gitlab.com> | 2019-07-15 22:32:43 +0500 |
| commit | 9b4b4e74130839062932083c214589c67ccfea51 (patch) | |
| tree | cb19724ce42dfb4db666b7f3466d9fca5662fe41 | |
| parent | f2582fbcddb353a640cf65acae5714b025ef07ad (diff) | |
| download | gitlab-ce-sl-qa-staging-39-fix-assign-code-owners-spec-ce.tar.gz | |
Backport ee to cesl-qa-staging-39-fix-assign-code-owners-spec-ce
| -rw-r--r-- | qa/qa/page/project/sub_menus/common.rb | 6 | ||||
| -rw-r--r-- | qa/qa/resource/merge_request.rb | 3 |
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! |