Add latest changes from gitlab-org/gitlab@16-0-stable-ee

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/lib/gitlab_settings/settings_spec.rb b/spec/lib/gitlab_settings/settings_spec.rb
index 161c26dbb9f..4422bea4a63 100644
--- a/spec/lib/gitlab_settings/settings_spec.rb
+++ b/spec/lib/gitlab_settings/settings_spec.rb
@@ -31,6 +31,15 @@ RSpec.describe GitlabSettings::Settings, :aggregate_failures, feature_category:
       expect { described_class.new(source, '') }
         .to raise_error(ArgumentError, 'config section is required')
     end
+
+    it 'sets encodings' do
+      expect(Encoding).to receive(:default_external=).with(Encoding::UTF_8).and_call_original
+      expect(Encoding).to receive(:default_internal=).with(Encoding::UTF_8).and_call_original
+
+      File.write(source, { section1: { config1: { value1: 2 } } }.to_yaml)
+
+      described_class.new(source, 'section1')
+    end
   end
 
   describe '#reload!' do