Commit e468067a authored by Mark Lapierre's avatar Mark Lapierre

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
parents 7c874afd 9b4b4e74
...@@ -12,7 +12,11 @@ module QA ...@@ -12,7 +12,11 @@ module QA
end end
def within_submenu def within_submenu
within('.fly-out-list') do if has_css?('.fly-out-list')
within('.fly-out-list') do
yield
end
else
yield yield
end end
end end
......
...@@ -9,6 +9,7 @@ module QA ...@@ -9,6 +9,7 @@ module QA
:description, :description,
:source_branch, :source_branch,
:target_branch, :target_branch,
:target_new_branch,
:assignee, :assignee,
:milestone, :milestone,
:labels, :labels,
...@@ -27,6 +28,7 @@ module QA ...@@ -27,6 +28,7 @@ module QA
Repository::ProjectPush.fabricate! do |resource| Repository::ProjectPush.fabricate! do |resource|
resource.project = project resource.project = project
resource.branch_name = 'master' resource.branch_name = 'master'
resource.new_branch = @target_new_branch
resource.remote_branch = target_branch resource.remote_branch = target_branch
end end
end end
...@@ -52,6 +54,7 @@ module QA ...@@ -52,6 +54,7 @@ module QA
@labels = [] @labels = []
@file_name = "added_file.txt" @file_name = "added_file.txt"
@file_content = "File Added" @file_content = "File Added"
@target_new_branch = true
end end
def fabricate! def fabricate!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment