Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

4 files changed, 26 insertions, 62 deletions

diff --git a/spec/initializers/6_validations_spec.rb b/spec/initializers/6_validations_spec.rb
index b909fc9db0a..cdd96640933 100644
--- a/spec/initializers/6_validations_spec.rb
+++ b/spec/initializers/6_validations_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-require_relative '../../config/initializers/6_validations.rb'
+require_relative '../../config/initializers/6_validations'
 
 RSpec.describe '6_validations' do
   describe 'validate_storages_config' do
diff --git a/spec/initializers/mail_encoding_patch_spec.rb b/spec/initializers/mail_encoding_patch_spec.rb
index efacaf6b1b4..52a0d041f48 100644
--- a/spec/initializers/mail_encoding_patch_spec.rb
+++ b/spec/initializers/mail_encoding_patch_spec.rb
@@ -3,7 +3,7 @@
 require 'fast_spec_helper'
 
 require 'mail'
-require_relative '../../config/initializers/mail_encoding_patch.rb'
+require_relative '../../config/initializers/mail_encoding_patch'
 
 RSpec.describe 'Mail quoted-printable transfer encoding patch and Unicode characters' do
   shared_examples 'email encoding' do |email|
diff --git a/spec/initializers/pages_storage_check_spec.rb b/spec/initializers/pages_storage_check_spec.rb
index a76002dbdcf..e81802ae669 100644
--- a/spec/initializers/pages_storage_check_spec.rb
+++ b/spec/initializers/pages_storage_check_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe 'pages storage check' do
 
   context 'when local store does not exist yet' do
     before do
-      Settings.pages['local_store'] = nil
+      stub_config(pages: { enabled: true, local_store: nil })
     end
 
     it { is_expected.to be_truthy }
@@ -17,78 +17,42 @@ RSpec.describe 'pages storage check' do
 
   context 'when pages is not enabled' do
     before do
-      Settings.pages['enabled'] = false
+      stub_config(pages: { enabled: false })
     end
 
     it { is_expected.to be_truthy }
   end
 
   context 'when pages is enabled' do
-    before do
-      Settings.pages['enabled'] = true
-      Settings.pages['local_store'] = Settingslogic.new({})
+    using RSpec::Parameterized::TableSyntax
+
+    where(:local_storage_enabled, :object_storage_enabled, :raises_exception) do
+      false | false | true
+      false | true  | false
+      true  | false | false
+      true  | true  | false
+      1     | 0     | false
+      nil   | nil   | true
     end
 
-    context 'when pages object storage is not enabled' do
+    with_them do
       before do
-        Settings.pages['object_store']['enabled'] = false
+        stub_config(
+          pages: {
+            enabled: true,
+            local_store: { enabled: local_storage_enabled },
+            object_store: { enabled: object_storage_enabled }
+          }
+        )
       end
 
-      context 'when pages local storage is not enabled' do
-        it 'raises an exception' do
-          Settings.pages['local_store']['enabled'] = false
-
+      it 'validates pages storage configuration' do
+        if raises_exception
           expect { subject }.to raise_error(main_error_message)
-        end
-      end
-
-      context 'when pages local storage is enabled' do
-        it 'is true' do
-          Settings.pages['local_store']['enabled'] = true
-
-          expect(subject).to be_truthy
-        end
-      end
-    end
-
-    context 'when pages object storage is enabled' do
-      before do
-        Settings.pages['object_store']['enabled'] = true
-      end
-
-      context 'when pages local storage is not enabled' do
-        it 'is true' do
-          Settings.pages['local_store']['enabled'] = false
-
+        else
           expect(subject).to be_truthy
         end
       end
-
-      context 'when pages local storage is enabled' do
-        it 'is true' do
-          Settings.pages['local_store']['enabled'] = true
-
-          expect(subject).to be_truthy
-        end
-      end
-    end
-
-    context 'when using integers instead of booleans' do
-      it 'is true' do
-        Settings.pages['local_store']['enabled'] = 1
-        Settings.pages['object_store']['enabled'] = 0
-
-        expect(subject).to be_truthy
-      end
-    end
-
-    context 'when both enabled attributes are not set' do
-      it 'raises an exception' do
-        Settings.pages['local_store']['enabled'] = nil
-        Settings.pages['object_store']['enabled'] = nil
-
-        expect { subject }.to raise_error(main_error_message)
-      end
     end
   end
 end
diff --git a/spec/initializers/secret_token_spec.rb b/spec/initializers/secret_token_spec.rb
index ab16dbad3fc..2c396a18361 100644
--- a/spec/initializers/secret_token_spec.rb
+++ b/spec/initializers/secret_token_spec.rb
@@ -84,7 +84,7 @@ RSpec.describe 'create_tokens' do
 
       it 'writes the secrets to secrets.yml' do
         expect(File).to receive(:write).with('config/secrets.yml', any_args) do |filename, contents, options|
-          new_secrets = YAML.load(contents)[Rails.env]
+          new_secrets = YAML.safe_load(contents)[Rails.env]
 
           expect(new_secrets['secret_key_base']).to eq(secrets.secret_key_base)
           expect(new_secrets['otp_key_base']).to eq(secrets.otp_key_base)
@@ -179,7 +179,7 @@ RSpec.describe 'create_tokens' do
 
         it 'uses the file secret' do
           expect(File).to receive(:write) do |filename, contents, options|
-            new_secrets = YAML.load(contents)[Rails.env]
+            new_secrets = YAML.safe_load(contents)[Rails.env]
 
             expect(new_secrets['secret_key_base']).to eq('file_key')
             expect(new_secrets['otp_key_base']).to eq('file_key')