summaryrefslogtreecommitdiff
path: root/spec/ruby/library/openssl
diff options
context:
space:
mode:
authorBenoit Daloze <[email protected]>2020-03-28 00:22:51 +0100
committerBenoit Daloze <[email protected]>2020-03-28 00:22:51 +0100
commitf234d51eaba861edea925eabb564a0bee41b96a0 (patch)
tree3334f36a91fe81ec704f2980ab169231f52c41d0 /spec/ruby/library/openssl
parent296f68816cf575b3ff920f92aec8a4109a7d81d4 (diff)
Update to ruby/spec@ec84479
Diffstat (limited to 'spec/ruby/library/openssl')
-rw-r--r--spec/ruby/library/openssl/config/freeze_spec.rb3
-rw-r--r--spec/ruby/library/openssl/shared/version.rb16
2 files changed, 1 insertions, 18 deletions
diff --git a/spec/ruby/library/openssl/config/freeze_spec.rb b/spec/ruby/library/openssl/config/freeze_spec.rb
index d63c243d72..c814341b86 100644
--- a/spec/ruby/library/openssl/config/freeze_spec.rb
+++ b/spec/ruby/library/openssl/config/freeze_spec.rb
@@ -1,10 +1,9 @@
require_relative '../../../spec_helper'
require_relative '../shared/constants'
-require_relative '../shared/version'
require 'openssl'
-openssl_version_is(""..."2.2") do
+version_is(OpenSSL::VERSION, ""..."2.2") do
describe "OpenSSL::Config#freeze" do
it "needs to be reviewed for completeness"
diff --git a/spec/ruby/library/openssl/shared/version.rb b/spec/ruby/library/openssl/shared/version.rb
deleted file mode 100644
index 63837d3375..0000000000
--- a/spec/ruby/library/openssl/shared/version.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'openssl'
-
-class OpenSSLVersionGuard < VersionGuard
- FULL_OPENSSL_VERSION = SpecVersion.new OpenSSL::VERSION
- def match?
- if Range === @version
- @version.include? FULL_OPENSSL_VERSION
- else
- FULL_OPENSSL_VERSION >= @version
- end
- end
-end
-
-def openssl_version_is(*args, &block)
- OpenSSLVersionGuard.new(*args).run_if(:openssl_version_is, &block)
-end