From afb714541c2ffad284884f20bd4a56380ce6bf04 Mon Sep 17 00:00:00 2001
From: John McDonnell <jmcdonnell@gitlab.com>
Date: Mon, 5 Jun 2023 08:07:58 +0000
Subject: [PATCH] Tidy up codeowners E2E use Commit over ProjectPush
---
.../3_create/repository/code_owners_spec.rb | 33 ++++++++++---------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb
index 2d0b3669424b7..8c01ad030a172 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb
@@ -30,6 +30,13 @@ module QA
Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2)
end
+ let(:codeowners_file_content) do
+ <<-CONTENT
+ * @#{user2.username}
+ *.txt @#{user.username}
+ CONTENT
+ end
+
before do
Flow::Login.sign_in
@@ -40,26 +47,20 @@ module QA
members_page.add_member(user.username)
members_page.add_member(user2.username)
end
+
+ Resource::Repository::Commit.fabricate_via_api! do |commit|
+ commit.project = project
+ commit.commit_message = 'Add CODEOWNERS and test files'
+ commit.add_files([
+ { file_path: 'file.txt', content: 'foo' },
+ { file_path: 'README.md', content: 'bar' },
+ { file_path: 'CODEOWNERS', content: codeowners_file_content }
+ ])
+ end
end
it 'displays owners specified in CODEOWNERS file',
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347763' do
- codeowners_file_content =
- <<-CONTENT
- * @#{user2.username}
- *.txt @#{user.username}
- CONTENT
- files << {
- name: 'CODEOWNERS',
- content: codeowners_file_content
- }
-
- # Push CODEOWNERS and test files to the project
- Resource::Repository::ProjectPush.fabricate! do |push|
- push.project = project
- push.files = files
- push.commit_message = 'Add CODEOWNERS and test files'
- end
project.visit!
# Check the files and code owners
--
GitLab