Merge branch 'master' into feature/limit_user_leak

Conflicts:
	users/lib/warden/strategies/secure_remote_password.rb

1 files changed, 6 insertions, 6 deletions

diff --git a/certs/test/unit/client_certificate_test.rb b/certs/test/unit/client_certificate_test.rb
index bcc61cc..abb5560 100644
--- a/certs/test/unit/client_certificate_test.rb
+++ b/certs/test/unit/client_certificate_test.rb
@@ -9,16 +9,16 @@ class ClientCertificateTest < ActiveSupport::TestCase
     assert sample.to_s
   end
 
-  test "free cert has configured postfix" do
+  test "free cert has configured prefix" do
     sample = ClientCertificate.new(free: true)
-    postfix = APP_CONFIG[:free_cert_postfix]
-    assert sample.cert.subject.common_name.include?(postfix)
+    prefix = APP_CONFIG[:free_cert_prefix]
+    assert sample.cert.subject.common_name.starts_with?(prefix)
   end
 
-  test "real cert has no free cert postfix" do
+  test "real cert has no free cert prefix" do
     sample = ClientCertificate.new
-    postfix = APP_CONFIG[:free_cert_postfix]
-    assert !sample.cert.subject.common_name.include?(postfix)
+    prefix = APP_CONFIG[:free_cert_prefix]
+    assert !sample.cert.subject.common_name.starts_with?(prefix)
   end
 
   test "cert issuer matches ca subject" do