Automatic merge of gitlab-org/gitlab master

qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :requires_admin, :skip_live_env do
+  RSpec.describe 'Manage', :requires_admin, :skip_live_env do
     describe '2FA' do
       let(:owner_user) do
         Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_2fa_owner_username_1, Runtime::Env.gitlab_qa_2fa_owner_password_1)

qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :requires_admin, :skip_live_env do
+  RSpec.describe 'Manage', :requires_admin, :skip_live_env do
     describe '2FA' do
       let(:owner_user) do
         Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_2fa_owner_username_1, Runtime::Env.gitlab_qa_2fa_owner_password_1)

qa/qa/specs/features/ee/browser_ui/3_create/contribution_analytics_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Contribution Analytics' do
       let(:group) do
         Resource::Group.fabricate_via_api! do |group|

qa/qa/specs/features/ee/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb

@@ -2,7 +2,7 @@
 require 'securerandom'
 
 module QA
-  context 'Create', :requires_admin, :skip_live_env, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/195179', type: :flaky } do
+  RSpec.describe 'Create', :requires_admin, :skip_live_env, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/195179', type: :flaky } do
     describe 'Jenkins integration' do
       let(:project_name) { "project_with_jenkins_#{SecureRandom.hex(4)}" }
 

qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'batch comments in merge request' do
       let(:project) do
         Resource::Project.fabricate_via_api! do |project|

qa/qa/specs/features/ee/browser_ui/3_create/merge_request/approval_rules_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Approval rules', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/225595', type: :investigating } do
       let(:approver1) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
       let(:approver2) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) }

qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Codeowners' do
       # Create one user to be the assigned approver and another user who will not be an approver
       let(:approver) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }

qa/qa/specs/features/ee/browser_ui/3_create/repository/code_owners_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Codeowners' do
       let(:files) do
         [

qa/qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'File Locking' do
       before do
         Flow::Login.sign_in

qa/qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_root_group_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Codeowners' do
       context 'when the project is in the root group', :requires_admin do
         let(:approver) do

qa/qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_subgroup_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Codeowners' do
       context 'when the project is in a subgroup', :requires_admin do
         let(:approver) do

qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_http_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Pull mirror a repository over HTTP' do
       it 'configures and syncs a (pull) mirrored repository with password auth', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/520' do
         Flow::Login.sign_in

qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Pull mirror a repository over SSH with a private key' do
       let(:source) do
         Resource::Repository::ProjectPush.fabricate! do |project_push|

qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     context 'Push Rules' do
       describe 'using non signed commits' do
         before(:context) do

qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create' do
+  RSpec.describe 'Create' do
     describe 'Restricted protected branch push and merge' do
       let(:user_developer) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
       let(:user_maintainer) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) }

qa/qa/specs/features/ee/browser_ui/3_create/web_ide/web_terminal_spec.rb

@@ -3,7 +3,7 @@
 module QA
   # This test was quarantined because relative URL isn't supported
   # See https://gitlab.com/gitlab-org/gitlab/issues/13833
-  context 'Create', :runner, :quarantine do
+  RSpec.describe 'Create', :runner, :quarantine do
     describe 'Web IDE web terminal' do
       before do
         project = Resource::Project.fabricate_via_api! do |project|

qa/spec/service/docker_run/gitlab_runner_spec.rb

 # frozen_string_literal: true
 
 module QA
-  describe Service::DockerRun::GitlabRunner do
+  RSpec.describe Service::DockerRun::GitlabRunner do
     let(:runner_name) { 'test-runner' }
     let(:address) { 'gitlab.test' }
     let(:token) { 'abc123' }

qa/spec/service/docker_run/k3s_spec.rb

 # frozen_string_literal: true
 
 module QA
-  describe Service::DockerRun::K3s do
+  RSpec.describe Service::DockerRun::K3s do
     describe '#host_name' do
       context 'in CI' do
         let(:name) { 'k3s-12345' }

qa/spec/support/shared_examples/merge_with_code_owner_shared_examples.rb

 # frozen_string_literal: true
 
 module QA
-  shared_examples 'code owner merge request' do
+  RSpec.shared_examples 'code owner merge request' do
     let(:branch_name) { 'new-branch' }
 
     it 'is approved and merged' do

qa/spec/support/shared_examples/scenario_shared_examples.rb

 # frozen_string_literal: true
 
-shared_examples 'a QA scenario class' do
+module QA
+  RSpec.shared_examples 'a QA scenario class' do
     let(:attributes) { spy('Runtime::Scenario') }
     let(:runner) { spy('Specs::Runner') }
     let(:release) { spy('Runtime::Release') }
@@ -70,4 +71,5 @@ shared_examples 'a QA scenario class' do
         described_class.launch!(named_options.push(*%w[-- --tag quarantine]))
       end
     end
+  end
 end

spec/requests/api/graphql/project/terraform/states_spec.rb

@@ -58,8 +58,8 @@ RSpec.describe 'query terraform states' do
     expect(state.dig('lockedByUser', 'id')).to eq(terraform_state.locked_by_user.to_global_id.to_s)
 
     expect(version['id']).to eq(latest_version.to_global_id.to_s)
-    expect(version['createdAt']).to eq(terraform_state.created_at.iso8601)
-    expect(version['updatedAt']).to eq(terraform_state.updated_at.iso8601)
+    expect(version['createdAt']).to eq(latest_version.created_at.iso8601)
+    expect(version['updatedAt']).to eq(latest_version.updated_at.iso8601)
     expect(version.dig('createdByUser', 'id')).to eq(latest_version.created_by_user.to_global_id.to_s)
   end