From 886b86e795941874daf381c21f7fab18ccfa66b7 Mon Sep 17 00:00:00 2001 From: Sanad Liaquat Date: Wed, 12 Jun 2019 16:48:23 +0500 Subject: Port changes from EE branch qa-saml-group-git-http-access-test --- qa/qa/resource/project.rb | 6 +++++- qa/qa/resource/sandbox.rb | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1