From a314d1265bcf7b0c6dd66d61d03e1d2a7545cfb8 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 25 Feb 2013 12:35:00 +0100 Subject: enable free certs in the controller --- certs/test/functional/certs_controller_test.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'certs/test') diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb index 75256ca..6ebd08e 100644 --- a/certs/test/functional/certs_controller_test.rb +++ b/certs/test/functional/certs_controller_test.rb @@ -4,16 +4,18 @@ class CertsControllerTest < ActionController::TestCase setup do end - test "should require login" do + test "should send free cert without login" do + cert = stub :cert => "free cert", :key => "key" + ClientCertificate.expects(:new).with(free: true).returns(cert) get :show - assert_response :redirect - assert_redirected_to login_url + assert_response :success + assert_equal cert.key + cert.cert, @response.body end test "should send cert" do login cert = stub :cert => "adsf", :key => "key" - ClientCertificate.expects(:new).returns(cert) + ClientCertificate.expects(:new).with(free: false).returns(cert) get :show assert_response :success assert_equal cert.key + cert.cert, @response.body -- cgit v1.2.3 From d99bcf4b0d0b8716ab0da58ea7320fb33bac78bb Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 25 Feb 2013 13:01:07 +0100 Subject: enable free certs with a common name postfix --- certs/test/functional/certs_controller_test.rb | 8 ++++---- certs/test/unit/client_certificate_test.rb | 23 +++++++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'certs/test') diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb index 6ebd08e..a579a00 100644 --- a/certs/test/functional/certs_controller_test.rb +++ b/certs/test/functional/certs_controller_test.rb @@ -5,19 +5,19 @@ class CertsControllerTest < ActionController::TestCase end test "should send free cert without login" do - cert = stub :cert => "free cert", :key => "key" + cert = stub :to_s => "free cert" ClientCertificate.expects(:new).with(free: true).returns(cert) get :show assert_response :success - assert_equal cert.key + cert.cert, @response.body + assert_equal cert.to_s, @response.body end test "should send cert" do login - cert = stub :cert => "adsf", :key => "key" + cert = stub :to_s => "real cert" ClientCertificate.expects(:new).with(free: false).returns(cert) get :show assert_response :success - assert_equal cert.key + cert.cert, @response.body + assert_equal cert.to_s, @response.body end end diff --git a/certs/test/unit/client_certificate_test.rb b/certs/test/unit/client_certificate_test.rb index 71a1d90..bcc61cc 100644 --- a/certs/test/unit/client_certificate_test.rb +++ b/certs/test/unit/client_certificate_test.rb @@ -2,17 +2,28 @@ require 'test_helper' class ClientCertificateTest < ActiveSupport::TestCase - setup do - @sample = ClientCertificate.new + test "new cert has all we need" do + sample = ClientCertificate.new + assert sample.key + assert sample.cert + assert sample.to_s end - test "new cert has all we need" do - assert @sample.key - assert @sample.cert + test "free cert has configured postfix" do + sample = ClientCertificate.new(free: true) + postfix = APP_CONFIG[:free_cert_postfix] + assert sample.cert.subject.common_name.include?(postfix) + end + + test "real cert has no free cert postfix" do + sample = ClientCertificate.new + postfix = APP_CONFIG[:free_cert_postfix] + assert !sample.cert.subject.common_name.include?(postfix) end test "cert issuer matches ca subject" do - cert = OpenSSL::X509::Certificate.new(@sample.cert) + sample = ClientCertificate.new + cert = OpenSSL::X509::Certificate.new(sample.cert.to_pem) assert_equal ClientCertificate.root_ca.openssl_body.subject, cert.issuer end -- cgit v1.2.3 From 494ebdab860a4db792e1c61836f1efcb7593dfe7 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 25 Feb 2013 13:15:50 +0100 Subject: added configuration setting for disabling free certs --- certs/test/functional/certs_controller_test.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'certs/test') diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb index a579a00..70ca56d 100644 --- a/certs/test/functional/certs_controller_test.rb +++ b/certs/test/functional/certs_controller_test.rb @@ -1,10 +1,8 @@ require 'test_helper' class CertsControllerTest < ActionController::TestCase - setup do - end - test "should send free cert without login" do + test "send free cert without login" do cert = stub :to_s => "free cert" ClientCertificate.expects(:new).with(free: true).returns(cert) get :show @@ -12,7 +10,7 @@ class CertsControllerTest < ActionController::TestCase assert_equal cert.to_s, @response.body end - test "should send cert" do + test "send cert" do login cert = stub :to_s => "real cert" ClientCertificate.expects(:new).with(free: false).returns(cert) @@ -20,4 +18,16 @@ class CertsControllerTest < ActionController::TestCase assert_response :success assert_equal cert.to_s, @response.body end + + test "login required if free certs disabled" do + begin + old_setting = APP_CONFIG[:free_certs_enabled] + APP_CONFIG[:free_certs_enabled] = false + get :show + assert_response :redirect + ensure + APP_CONFIG[:free_certs_enabled] = old_setting + end + end + end -- cgit v1.2.3 From 9c4eb32c22e6bf49d84b6ac1fa4fc5cde5374a7a Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 25 Feb 2013 13:19:23 +0100 Subject: tests refactored with with_config helper also added test for getting paid certs if free certs are disabled --- certs/test/functional/certs_controller_test.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'certs/test') diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb index 70ca56d..7826dd6 100644 --- a/certs/test/functional/certs_controller_test.rb +++ b/certs/test/functional/certs_controller_test.rb @@ -20,13 +20,20 @@ class CertsControllerTest < ActionController::TestCase end test "login required if free certs disabled" do - begin - old_setting = APP_CONFIG[:free_certs_enabled] - APP_CONFIG[:free_certs_enabled] = false + with_config free_certs_enabled: false do get :show assert_response :redirect - ensure - APP_CONFIG[:free_certs_enabled] = old_setting + end + end + + test "get paid cert if free certs disabled" do + with_config free_certs_enabled: false do + login + cert = stub :to_s => "real cert" + ClientCertificate.expects(:new).with(free: false).returns(cert) + get :show + assert_response :success + assert_equal cert.to_s, @response.body end end -- cgit v1.2.3