From da96cba2e79268ce75d00d21639dd5ce955b5299 Mon Sep 17 00:00:00 2001
From: Andrejs Cunskis <acunskis@gitlab.com>
Date: Sun, 24 Nov 2024 21:46:17 +0000
Subject: [PATCH] Remove hardcoded root user usage in e2e tests
---
.../api/12_systems/gitaly/praefect_replication_queue_spec.rb | 2 +-
.../api/3_create/repository/add_list_delete_branches_spec.rb | 2 +-
.../3_create/repository/default_branch_name_setting_spec.rb | 2 +-
.../features/browser_ui/3_create/repository/clone_spec.rb | 2 +-
.../3_create/repository/protocol_v2_push_http_spec.rb | 5 +----
.../3_create/repository/protocol_v2_push_ssh_spec.rb | 5 +----
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb
index 80ff1f250a25e..2c9940f29b384 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb
@@ -44,7 +44,7 @@ module QA
repository.uri = project.repository_http_location.uri
repository.use_default_credentials
repository.clone
- repository.configure_identity('GitLab QA', 'root@gitlab.com')
+ repository.use_default_identity
1.upto(queue_size_target) do |i|
repository.checkout("branch#{i}", new_branch: true)
repository.commit_file("file#{i}", SecureRandom.random_bytes(10000000), "Add file#{i}")
diff --git a/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb b/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb
index 277e707aa037f..122491e55fccd 100644
--- a/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb
@@ -18,7 +18,7 @@ module QA
repository.act do
init_repository
- configure_identity('GitLab QA', 'root@gitlab.com')
+ use_default_identity
commit_file(filename, 'Test file content', default_branch_commit_message)
push_changes
diff --git a/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb b/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb
index 184c6d2419cfc..5e671a73d8acf 100644
--- a/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb
@@ -37,7 +37,7 @@ module QA
repository.init_repository
repository.uri = "#{Runtime::Scenario.gitlab_address}/#{group.full_path}/#{project_name}"
repository.use_default_credentials
- repository.configure_identity('GitLab QA', 'root@gitlab.com')
+ repository.use_default_identity
repository.checkout('trunk', new_branch: true)
repository.commit_file('README.md', 'Created via the CLI', 'initial commit via CLI')
repository.push_changes('trunk')
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
index 9dd50541d53e3..1568c0174efb5 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
@@ -13,7 +13,7 @@ module QA
repository.act do
clone
- configure_identity('GitLab QA', 'root@gitlab.com')
+ use_default_identity
checkout(default_branch, new_branch: true)
commit_file('test.rb', 'class Test; end', 'Add Test class')
commit_file('README.md', '# Test', 'Add Readme')
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb
index ff46294fe37b9..a9e0129c80698 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb
@@ -17,13 +17,10 @@ module QA
# Use Git to clone the project, push a file to it, and then check the
# supported Git protocol
Git::Repository.perform do |repository|
- username = 'GitLab QA'
- email = 'root@gitlab.com'
-
repository.uri = project.repository_http_location.uri
repository.use_default_credentials
repository.clone
- repository.configure_identity(username, email)
+ repository.use_default_identity
repository.default_branch = project.default_branch
repository.checkout(project.default_branch, new_branch: true)
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb
index 42003eec19939..bbfe8e3585488 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb
@@ -36,15 +36,12 @@ module QA
# Use Git to clone the project, push a file to it, and then check the
# supported Git protocol
Git::Repository.perform do |repository|
- username = 'GitLab QA'
- email = 'root@gitlab.com'
-
repository.uri = project.repository_ssh_location.uri
begin
repository.use_ssh_key(ssh_key)
repository.clone
- repository.configure_identity(username, email)
+ repository.use_default_identity
repository.default_branch = project.default_branch
repository.checkout(project.default_branch, new_branch: true)
--
GitLab