diff --git a/.github/workflows/rspec_tests.yaml b/.github/workflows/rspec_tests.yaml index 72f722918f1..dfe18eabab4 100644 --- a/.github/workflows/rspec_tests.yaml +++ b/.github/workflows/rspec_tests.yaml @@ -19,9 +19,11 @@ jobs: - {os: ubuntu-latest, ruby: '3.1'} - {os: ubuntu-20.04, ruby: '3.2'} # openssl 1.1.1 - {os: ubuntu-22.04, ruby: '3.2'} # openssl 3 + - {os: ubuntu-22.04, ruby: '3.3'} # openssl 3 / latest Ruby - {os: ubuntu-latest, ruby: 'jruby-9.4.3.0'} - {os: windows-2019, ruby: '3.1'} - {os: windows-2019, ruby: '3.2'} # openssl 3 + - {os: windows-2019, ruby: '3.3'} # openssl 3 / latest Ruby runs-on: ${{ matrix.cfg.os }} env: diff --git a/Gemfile b/Gemfile index ba712e6f6bb..366b326c390 100644 --- a/Gemfile +++ b/Gemfile @@ -43,6 +43,7 @@ group(:test) do # 1.16.0 - 1.16.2 are broken on Windows gem 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2', require: false gem "json-schema", "~> 2.0", require: false + gem "racc", "1.5.2", require: false gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0') gem "rspec", "~> 3.1", require: false gem "rspec-expectations", ["~> 3.9", "!= 3.9.3"] @@ -62,7 +63,6 @@ end group(:development, optional: true) do gem 'memory_profiler', require: false, platforms: [:mri] gem 'pry', require: false, platforms: [:ruby] - gem "racc", "1.5.2", require: false, platforms: [:ruby] if RUBY_PLATFORM != 'java' gem 'ruby-prof', '>= 0.16.0', require: false end diff --git a/spec/unit/x509/cert_provider_spec.rb b/spec/unit/x509/cert_provider_spec.rb index 7ad2dea0eb5..dcb51aa9c68 100644 --- a/spec/unit/x509/cert_provider_spec.rb +++ b/spec/unit/x509/cert_provider_spec.rb @@ -280,7 +280,7 @@ def expects_private_file(path) # password is 74695716c8b6 expect { provider.load_private_key('encrypted-key') - }.to raise_error(OpenSSL::PKey::PKeyError, /Could not parse PKey: (no start line|bad decrypt)/) + }.to raise_error(OpenSSL::PKey::PKeyError, /Could not parse PKey/) end it 'decrypts an RSA key previously saved using 3DES' do @@ -315,7 +315,7 @@ def expects_private_file(path) # password is 74695716c8b6 expect { provider.load_private_key('encrypted-ec-key') - }.to raise_error(OpenSSL::PKey::PKeyError, /(unknown|invalid) curve name|Could not parse PKey: (no start line|bad decrypt)/) + }.to raise_error(OpenSSL::PKey::PKeyError, /(unknown|invalid) curve name|Could not parse PKey/) end end end