Add latest changes from gitlab-org/gitlab@master

11 files changed, 27 insertions, 20 deletions

diff --git a/qa/qa/page/merge_request/new.rb b/qa/qa/page/merge_request/new.rb
index 909b37943ff..dc2f908a906 100644
--- a/qa/qa/page/merge_request/new.rb
+++ b/qa/qa/page/merge_request/new.rb
@@ -13,7 +13,7 @@ module QA
           element :source_branch_dropdown
         end
 
-        view 'app/views/projects/merge_requests/show.html.haml' do
+        view 'app/views/projects/merge_requests/_page.html.haml' do
           element :diffs_tab
         end
 
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index fba9dad2be9..aacff7c4172 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -126,7 +126,7 @@ module QA
           element :title_content, required: true
         end
 
-        view 'app/views/projects/merge_requests/show.html.haml' do
+        view 'app/views/projects/merge_requests/_page.html.haml' do
           element :notes_tab, required: true
           element :commits_tab, required: true
           element :diffs_tab, required: true
diff --git a/qa/qa/resource/base.rb b/qa/qa/resource/base.rb
index 4a1a60f4da1..00c002cae9c 100644
--- a/qa/qa/resource/base.rb
+++ b/qa/qa/resource/base.rb
@@ -23,7 +23,7 @@ module QA
         end
 
         def fabricate_via_api_unless_fips!
-          if QA::Support::FIPS.enabled?
+          if Runtime::Env.personal_access_tokens_disabled?
             fabricate!
           else
             fabricate_via_api!
@@ -31,7 +31,7 @@ module QA
         end
 
         def fabricate!(*args, &prepare_block)
-          if QA::Support::FIPS.enabled?
+          if Runtime::Env.personal_access_tokens_disabled?
             fabricate_via_browser_ui!(*args, &prepare_block)
           else
             fabricate_via_api!(*args, &prepare_block)
@@ -107,7 +107,7 @@ module QA
 
             Support::FabricationTracker.save_fabrication(:"#{fabrication_method}_fabrication", fabrication_time)
 
-            unless resource.retrieved_from_cache || QA::Support::FIPS.enabled?
+            unless resource.retrieved_from_cache || Runtime::Env.personal_access_tokens_disabled?
               Tools::TestResourceDataProcessor.collect(
                 resource: resource,
                 info: resource.identifier,
diff --git a/qa/qa/resource/group.rb b/qa/qa/resource/group.rb
index 835ee0b5335..f53bb531d9a 100644
--- a/qa/qa/resource/group.rb
+++ b/qa/qa/resource/group.rb
@@ -18,7 +18,7 @@ module QA
       end
 
       attribute :sandbox do
-        if QA::Support::FIPS.enabled?
+        if Runtime::Env.personal_access_tokens_disabled?
           Resource::Sandbox.fabricate! do |sandbox|
             sandbox.path = Runtime::Namespace.sandbox_name
           end
diff --git a/qa/qa/resource/sandbox.rb b/qa/qa/resource/sandbox.rb
index 18526448b00..f5cd51bf9cf 100644
--- a/qa/qa/resource/sandbox.rb
+++ b/qa/qa/resource/sandbox.rb
@@ -10,7 +10,7 @@ module QA
       class << self
         # Force top level group creation via UI if test is executed on dot_com environment
         def fabricate!(*args, &prepare_block)
-          if Specs::Helpers::ContextSelector.dot_com? || QA::Support::FIPS.enabled?
+          if Specs::Helpers::ContextSelector.dot_com? || Runtime::Env.personal_access_tokens_disabled?
             return fabricate_via_browser_ui!(*args, &prepare_block)
           end
 
diff --git a/qa/qa/resource/user.rb b/qa/qa/resource/user.rb
index 56ab60466c4..0398509396f 100644
--- a/qa/qa/resource/user.rb
+++ b/qa/qa/resource/user.rb
@@ -155,7 +155,7 @@ module QA
       end
 
       def self.fabricate_or_use(username = nil, password = nil)
-        if Runtime::Env.signup_disabled? && !QA::Support::FIPS.enabled?
+        if Runtime::Env.signup_disabled? && !Runtime::Env.personal_access_tokens_disabled?
           fabricate_via_api! do |user|
             user.username = username
             user.password = password
diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index 3d958ecd75b..d4d9ffe62e6 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -133,6 +133,11 @@ module QA
         enabled?(ENV['SIGNUP_DISABLED'], default: false)
       end
 
+      # PATs are disabled for FedRamp
+      def personal_access_tokens_disabled?
+        enabled?(ENV['PERSONAL_ACCESS_TOKENS_DISABLED'], default: false)
+      end
+
       def admin_password
         ENV['GITLAB_ADMIN_PASSWORD']
       end
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
index 36cfb9dfb6e..fd818c3797b 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
@@ -17,7 +17,7 @@ module QA
       before do
         Flow::Login.sign_in
 
-        if QA::Support::FIPS.enabled?
+        if Runtime::Env.personal_access_tokens_disabled?
           # Ensure user exists
           user
           Flow::Login.sign_in_as_admin
@@ -31,7 +31,7 @@ module QA
           project.add_member(user)
         end
 
-        if QA::Support::FIPS.enabled?
+        if Runtime::Env.personal_access_tokens_disabled?
           Resource::Issue.fabricate_via_browser_ui! do |issue|
             issue.project = project
           end.visit!
diff --git a/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb b/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb
index 0e5fcea438d..aeb8e7d27bf 100644
--- a/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/snippet/create_personal_snippet_spec.rb
@@ -18,7 +18,7 @@ module QA
       end
 
       after do
-        if QA::Support::FIPS.enabled?
+        if Runtime::Env.personal_access_tokens_disabled?
           snippet.visit!
           Page::Dashboard::Snippet::Show.perform(&:click_delete_button)
         else
diff --git a/qa/spec/resource/base_spec.rb b/qa/spec/resource/base_spec.rb
index 0ec27da7277..e0bfccf5e78 100644
--- a/qa/spec/resource/base_spec.rb
+++ b/qa/spec/resource/base_spec.rb
@@ -94,9 +94,9 @@ RSpec.describe QA::Resource::Base do
       end
     end
 
-    context 'when FIPS mode is enabled' do
+    context 'when personal_access_tokens_disabled returns true' do
       before do
-        stub_env('FIPS', '1')
+        stub_env('PERSONAL_ACCESS_TOKENS_DISABLED', true)
       end
 
       it 'calls .fabricate_via_browser_ui!' do
@@ -108,7 +108,7 @@ RSpec.describe QA::Resource::Base do
   end
 
   describe '.fabricate_via_api_unless_fips!' do
-    context 'when FIPS mode is not enabled' do
+    context 'when personal_access_tokens_disabled returns false' do
       it 'calls .fabricate_via_api!!' do
         expect(described_class).to receive(:fabricate_via_api!)
 
@@ -116,9 +116,9 @@ RSpec.describe QA::Resource::Base do
       end
     end
 
-    context 'when FIPS mode is enabled' do
+    context 'when personal_access_tokens_disabled returns true' do
       before do
-        stub_env('FIPS', '1')
+        stub_env('PERSONAL_ACCESS_TOKENS_DISABLED', true)
       end
 
       it 'calls .fabricate_via_browser_ui!' do
diff --git a/qa/spec/resource/user_spec.rb b/qa/spec/resource/user_spec.rb
index 6b26ec999fa..547c27dc2ff 100644
--- a/qa/spec/resource/user_spec.rb
+++ b/qa/spec/resource/user_spec.rb
@@ -145,17 +145,19 @@ RSpec.describe QA::Resource::User do
   end
 
   describe '#fabricate_or_use' do
-    # Signup Disabled, FIPS enabled, method used, method that is not used
+    # Signup Disabled, Personal Access Tokens disabled, method used, method that is not used
     [
       [true,  false, :fabricate_via_api!, :fabricate!],
       [false, false, :fabricate!, :fabricate_via_api!],
       [false, true,  :fabricate!, :fabricate_via_api!],
       [true,  true,  :fabricate!, :fabricate_via_api!]
-    ].each do |signup_disabled, fips_enabled, method_used, method_not_used|
-      it "when signup_disabled is #{signup_disabled}, fips_enabled is #{fips_enabled}, "\
+    ].each do |signup_disabled, personal_access_tokens_disabled, method_used, method_not_used|
+      it "when signup_disabled is #{signup_disabled}, "\
+         "personal_access_tokens_disabled is #{personal_access_tokens_disabled}, "\
          "calls #{method_used}, does not call #{method_not_used}" do
         allow(QA::Runtime::Env).to receive(:signup_disabled?).and_return(signup_disabled)
-        allow(QA::Support::FIPS).to receive(:enabled?).and_return(fips_enabled)
+        allow(QA::Runtime::Env).to receive(:personal_access_tokens_disabled?)
+          .and_return(personal_access_tokens_disabled)
 
         expect(described_class).to receive(method_used)
         expect(described_class).not_to receive(method_not_used)