summaryrefslogtreecommitdiff
path: root/qa/qa/resource
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 00:06:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 00:06:28 +0000
commit8d0aed5e4a6ae59232cfa5ca168fa1b87073520d (patch)
treea1a62a553c1b0d4b2ea6b0e9dd3f8ed67666382c /qa/qa/resource
parentaaf124b0f7698f5def277b02ab97f3992fe1569d (diff)
downloadgitlab-ce-8d0aed5e4a6ae59232cfa5ca168fa1b87073520d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/resource')
-rw-r--r--qa/qa/resource/group.rb5
-rw-r--r--qa/qa/resource/merge_request.rb2
2 files changed, 4 insertions, 3 deletions
diff --git a/qa/qa/resource/group.rb b/qa/qa/resource/group.rb
index e11bd5728fb..7511396251d 100644
--- a/qa/qa/resource/group.rb
+++ b/qa/qa/resource/group.rb
@@ -8,7 +8,10 @@ module QA
attr_accessor :path, :description
attribute :sandbox do
- Sandbox.fabricate!
+ Sandbox.fabricate_via_api! do |sandbox|
+ sandbox.user = user
+ sandbox.api_client = api_client
+ end
end
attribute :id
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index fe7eeeed37a..1a6de8de456 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -26,8 +26,6 @@ module QA
end
attribute :target do
- project.visit!
-
Repository::ProjectPush.fabricate! do |resource|
resource.project = project
resource.branch_name = 'master'