Merge pull request #8626 from joshcooper/ruby3_windows_encoding_11049

(PUP-11049) Update external encoding tests on Windows for Ruby 3

Author: GabrielNagy

.github/workflows/rspec_tests.yaml

@@ -16,10 +16,12 @@ jobs:
           - {os: ubuntu-18.04, ruby: 2.5}
           - {os: ubuntu-18.04, ruby: 2.6}
           - {os: ubuntu-18.04, ruby: 2.7}
+          - {os: ubuntu-18.04, ruby: 3.0}
           - {os: ubuntu-18.04, ruby: jruby-9.2.9.0}
           - {os: windows-2016, ruby: 2.5}
           - {os: windows-2016, ruby: 2.6}
           - {os: windows-2016, ruby: 2.7}
+          - {os: windows-2016, ruby: 3.0}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

spec/unit/pops/loaders/dependency_loader_spec.rb

@@ -84,10 +84,6 @@ def foo
 
       context 'when loading files from disk' do
         it 'should always read files as UTF-8' do
-          if Puppet::Util::Platform.windows? && Encoding.default_external == Encoding::UTF_8
-            raise 'This test must be run in a codepage other than 65001 to validate behavior'
-          end
-
           module_dir = dir_containing('testmodule', {
           'lib' => { 'puppet' => { 'functions' => { 'testmodule' => {
             'foo.rb' => code_utf8
@@ -101,11 +97,6 @@ def foo
 
         it 'currently ignores the UTF-8 BOM (Byte Order Mark) when loading module files' do
           bom = "\uFEFF"
-
-          if Puppet::Util::Platform.windows? && Encoding.default_external == Encoding::UTF_8
-            raise 'This test must be run in a codepage other than 65001 to validate behavior'
-          end
-
           module_dir = dir_containing('testmodule', {
           'lib' => { 'puppet' => { 'functions' => { 'testmodule' => {
             'foo.rb' => "#{bom}#{code_utf8}"

spec/unit/pops/parser/lexer2_spec.rb

@@ -918,10 +918,6 @@ def expect_issue(code, issue)
 
   context 'when lexing files from disk' do
     it 'should always read files as UTF-8' do
-      if Puppet::Util::Platform.windows? && Encoding.default_external == Encoding::UTF_8
-        raise 'This test must be run in a codepage other than 65001 to validate behavior'
-      end
-
       manifest_code = "notify { '#{rune_utf8}': }"
       manifest = file_containing('manifest.pp', manifest_code)
       lexed_file = described_class.new.lex_file(manifest)

spec/unit/util_spec.rb

@@ -142,9 +142,7 @@ def withenv_utf8(&block)
 
     # In 2.3, the behavior is mostly correct when external codepage is 65001 / UTF-8
     it "works around Ruby bug 8822 (which fails to preserve UTF-8 properly when accessing ENV) (Ruby >= 2.3.x) ",
-      :if => Puppet::Util::Platform.windows? do
-
-      raise 'This test requires a non-UTF8 codepage' if Encoding.default_external == Encoding::UTF_8
+      :if => Puppet::Util::Platform.windows? && RUBY_VERSION.to_f < 3 do
 
       withenv_utf8 do |utf_8_key, utf_8_value, codepage_key|
         # Ruby 2.3 fixes access by the original UTF-8 key, and behaves differently than 2.1