Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-07 00:07:14 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-07 00:07:14 +0300
commitb04f912deb494b6dc0d0dba36776a5e53f622b43 (patch)
treeb6af17cf69082cda35c42801a123c6e090b28c12 /qa
parent9e5484cee690f8bb2c1796013345d8cbc1872d77 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/resource/merge_request.rb4
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb2
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index 62e27b3d1a8..0d1a0bb2cd4 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -182,6 +182,10 @@ module QA
end
def fabricate_large_merge_request
+ # requires admin access
+ QA::Support::Helpers::ImportSource.enable(%w[gitlab_project])
+ Flow::Login.sign_in
+
@project = Resource::ImportProject.fabricate_via_browser_ui!
# Setting the name here, since otherwise some tests will look for an existing file in
# the project without ever knowing what is in it.
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb
index 54e9d3ed6c8..a7071d5fe1b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/revert/reverting_merge_request_spec.rb
@@ -16,8 +16,6 @@ module QA
end
before do
- QA::Support::Helpers::ImportSource.enable(%w[gitlab_project])
-
Flow::Login.sign_in
end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
index 994baea7ad9..3b332e6b9f5 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
@@ -11,8 +11,6 @@ module QA
end
before do
- QA::Support::Helpers::ImportSource.enable(%w[gitlab_project])
-
Flow::Login.sign_in
merge_request.visit!
end