Make tests OpenSSL 3 compatible.

rubygems · Aug 21, 2022 · 23d3cab · 23d3cab
1 parent e0f9782
commit 23d3cab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/models/concerns/user_multifactor_methods.rb b/app/models/concerns/user_multifactor_methods.rb
@@ -55,6 +55,7 @@ def mfa_required_weak_level_enabled?
 
     def otp_verified?(otp)
       otp = otp.to_s
+      return false if mfa_seed.blank?
       return true if verify_digit_otp(mfa_seed, otp)
 
       return false unless mfa_recovery_codes.include? otp

diff --git a/test/unit/pusher_test.rb b/test/unit/pusher_test.rb
@@ -582,7 +582,7 @@ def two_cert_chain(signing_key:, root_not_before: Time.current, cert_not_before:
       assert_not_nil @cutter.version
       assert_not_nil @cutter.version.cert_chain
       assert_equal 1, @cutter.version.cert_chain.size
-      assert_equal "/CN=snakeoil/DC=example/DC=invalid", @cutter.version.cert_chain.first.subject.to_s
+      assert_equal "CN=snakeoil/DC=example/DC=invalid", @cutter.version.cert_chain.first.subject.to_utf8
     end
 
     teardown { RubygemFs.mock! }