diff options
author | Dan Davison <ddavison@gitlab.com> | 2019-06-17 22:53:12 +0000 |
---|---|---|
committer | Dan Davison <ddavison@gitlab.com> | 2019-06-17 22:53:12 +0000 |
commit | 6fa0878880783ff4a007c8c23c167e44b2d6dacc (patch) | |
tree | 5ed536f3cc88ab3d6b83df7a4c41ae8320399a46 /qa | |
parent | 8a153abd2dba2f91908e9805a74cd3e276f28e08 (diff) | |
parent | 886b86e795941874daf381c21f7fab18ccfa66b7 (diff) | |
download | gitlab-ce-6fa0878880783ff4a007c8c23c167e44b2d6dacc.tar.gz |
Merge branch 'qa-saml-group-git-http-access-test-ce' into 'master'
CE port of "Add test for git http operations for SSO enforced SAML group"
See merge request gitlab-org/gitlab-ce!29550
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/resource/project.rb | 6 | ||||
-rw-r--r-- | qa/qa/resource/sandbox.rb | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb index d706439a891..e8ea947581a 100644 --- a/qa/qa/resource/project.rb +++ b/qa/qa/resource/project.rb @@ -18,7 +18,11 @@ module QA end attribute :path_with_namespace do - "#{group.sandbox.path}/#{group.path}/#{name}" if group + "#{sandbox_path}#{group.path}/#{name}" if group + end + + def sandbox_path + group.respond_to?('sandbox') ? "#{group.sandbox.path}/" : '' end attribute :repository_ssh_location do diff --git a/qa/qa/resource/sandbox.rb b/qa/qa/resource/sandbox.rb index 942eea5cc40..e2b1c4c0831 100644 --- a/qa/qa/resource/sandbox.rb +++ b/qa/qa/resource/sandbox.rb @@ -44,6 +44,10 @@ module QA "/groups/#{path}" end + def api_members_path + "#{api_get_path}/members" + end + def api_post_path '/groups' end |