diff options
author | Sanad Liaquat <sliaquat@gitlab.com> | 2019-06-12 16:48:23 +0500 |
---|---|---|
committer | Sanad Liaquat <sliaquat@gitlab.com> | 2019-06-12 16:48:23 +0500 |
commit | 886b86e795941874daf381c21f7fab18ccfa66b7 (patch) | |
tree | 56c3cedc6c5f55e46ed37c23e484b3939ab8ccfa /qa | |
parent | 4c26b2f204aba7b07868c5d002d89c9a50e60851 (diff) | |
download | gitlab-ce-886b86e795941874daf381c21f7fab18ccfa66b7.tar.gz |
Port changes from EE branch qa-saml-group-git-http-access-testqa-saml-group-git-http-access-test-ce
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 |