From 195224a989fa57e9a70fa10c0cdd6603295bb0dd Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Jan 2013 10:52:36 +0100 Subject: removing the leap_ca namespacing from certs --- certs/test/unit/cert_test.rb | 39 ------------------------------ certs/test/unit/client_certificate_test.rb | 39 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 certs/test/unit/cert_test.rb create mode 100644 certs/test/unit/client_certificate_test.rb (limited to 'certs/test/unit') diff --git a/certs/test/unit/cert_test.rb b/certs/test/unit/cert_test.rb deleted file mode 100644 index 0b21d0b..0000000 --- a/certs/test/unit/cert_test.rb +++ /dev/null @@ -1,39 +0,0 @@ -require 'test_helper' - -class CertTest < ActiveSupport::TestCase - - setup do - @sample = LeapCA::Cert.new LeapCA::Cert.valid_attributes_hash - end - - test "stub cert for testing is valid" do - assert @sample.valid? - end - - test "setting random on create validation" do - @sample.random = "asdf" - assert @sample.valid? - assert @sample.random.is_a? Float - assert @sample.random >= 0 - assert @sample.random < 1 - end - - test "validates random" do - @sample.save # make sure we are past the on_create - assert @sample.valid? - ["asdf", 1, 2, -0.1, nil, "asdf"].each do |invalid| - @sample.random = invalid - assert !@sample.valid?, "#{invalid} should not be a valid value for random" - end - end - - test "validates key" do - @sample.key = nil - assert !@sample.valid?, "Cert should require key" - end - - test "validates cert" do - @sample.cert = nil - assert !@sample.valid?, "Cert should require cert" - end -end diff --git a/certs/test/unit/client_certificate_test.rb b/certs/test/unit/client_certificate_test.rb new file mode 100644 index 0000000..a721483 --- /dev/null +++ b/certs/test/unit/client_certificate_test.rb @@ -0,0 +1,39 @@ +require 'test_helper' + +class ClientCertificateTest < ActiveSupport::TestCase + + setup do + @sample = ClientCertificate.new ClientCertificate.valid_attributes_hash + end + + test "stub cert for testing is valid" do + assert @sample.valid? + end + + test "setting random on create validation" do + @sample.random = "asdf" + assert @sample.valid? + assert @sample.random.is_a? Float + assert @sample.random >= 0 + assert @sample.random < 1 + end + + test "validates random" do + @sample.save # make sure we are past the on_create + assert @sample.valid? + ["asdf", 1, 2, -0.1, nil, "asdf"].each do |invalid| + @sample.random = invalid + assert !@sample.valid?, "#{invalid} should not be a valid value for random" + end + end + + test "validates key" do + @sample.key = nil + assert !@sample.valid?, "Cert should require key" + end + + test "validates cert" do + @sample.cert = nil + assert !@sample.valid?, "Cert should require cert" + end +end -- cgit v1.2.3 From 0975583e3c6ec9d2bf0269841073031537db1c37 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Jan 2013 11:08:05 +0100 Subject: we're not using a cert pool anymore - remove anything related --- certs/test/unit/cert_pool_test.rb | 52 --------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 certs/test/unit/cert_pool_test.rb (limited to 'certs/test/unit') diff --git a/certs/test/unit/cert_pool_test.rb b/certs/test/unit/cert_pool_test.rb deleted file mode 100644 index 06f7ce0..0000000 --- a/certs/test/unit/cert_pool_test.rb +++ /dev/null @@ -1,52 +0,0 @@ -require 'test_helper' - -class CertPoolTest < ActiveSupport::TestCase - - setup do - 2.times { LeapCA::Cert.create(LeapCA::Cert.valid_attributes_hash) } - end - - teardown do - LeapCA::Cert.all.each {|c| c.destroy} - end - - test "picks random sample" do - # with 3 certs chances are pretty low we pick the same one 40 times. - LeapCA::Cert.create! LeapCA::Cert.valid_attributes_hash - picked = [] - first = LeapCA::Cert.sample.id - current = LeapCA::Cert.sample.id - 40.times do - break if current != first - current = LeapCA::Cert.sample.id - end - assert_not_equal current, first - end - - test "picks cert from the pool" do - assert_difference "LeapCA::Cert.count", -1 do - cert = LeapCA::Cert.pick_from_pool - end - end - - test "err's out if all certs have been destroyed" do - sample = LeapCA::Cert.first.tap{|c| c.destroy} - LeapCA::Cert.all.each {|c| c.destroy} - assert_raises RECORD_NOT_FOUND do - LeapCA::Cert.expects(:sample).returns(sample) - cert = LeapCA::Cert.pick_from_pool - end - end - - test "picks other cert if first pick has been destroyed" do - first = LeapCA::Cert.first.tap{|c| c.destroy} - second = LeapCA::Cert.first - LeapCA::Cert.expects(:sample).at_least_once. - returns(first). - then.returns(second) - cert = LeapCA::Cert.pick_from_pool - assert_equal second, cert - assert_nil LeapCA::Cert.first - end - -end -- cgit v1.2.3 From 0f8efed9afa480174c77c89d4d9d4a40f99bddab Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Jan 2013 11:13:24 +0100 Subject: adopting tests to the way certs work now. should pass. * We now generate cert and key on validate. * we don't expect the controller to pick from the pool anymore - just create instead --- certs/test/unit/client_certificate_test.rb | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'certs/test/unit') diff --git a/certs/test/unit/client_certificate_test.rb b/certs/test/unit/client_certificate_test.rb index a721483..7dbb8a9 100644 --- a/certs/test/unit/client_certificate_test.rb +++ b/certs/test/unit/client_certificate_test.rb @@ -10,30 +10,15 @@ class ClientCertificateTest < ActiveSupport::TestCase assert @sample.valid? end - test "setting random on create validation" do - @sample.random = "asdf" - assert @sample.valid? - assert @sample.random.is_a? Float - assert @sample.random >= 0 - assert @sample.random < 1 - end - - test "validates random" do - @sample.save # make sure we are past the on_create - assert @sample.valid? - ["asdf", 1, 2, -0.1, nil, "asdf"].each do |invalid| - @sample.random = invalid - assert !@sample.valid?, "#{invalid} should not be a valid value for random" - end - end - test "validates key" do @sample.key = nil - assert !@sample.valid?, "Cert should require key" + assert @sample.valid? + assert @sample.key, "Cert should generate key" end test "validates cert" do @sample.cert = nil - assert !@sample.valid?, "Cert should require cert" + assert @sample.valid? + assert @sample.cert, "Cert should generate cert" end end -- cgit v1.2.3 From 8d9c2e90b77d417f9715c95de91c629e80ca6603 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 26 Jan 2013 11:23:43 +0100 Subject: no need to store the cert anymore - just new initialize and send it --- certs/test/unit/client_certificate_test.rb | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'certs/test/unit') diff --git a/certs/test/unit/client_certificate_test.rb b/certs/test/unit/client_certificate_test.rb index 7dbb8a9..492a44a 100644 --- a/certs/test/unit/client_certificate_test.rb +++ b/certs/test/unit/client_certificate_test.rb @@ -3,22 +3,12 @@ require 'test_helper' class ClientCertificateTest < ActiveSupport::TestCase setup do - @sample = ClientCertificate.new ClientCertificate.valid_attributes_hash + @sample = ClientCertificate.new end - test "stub cert for testing is valid" do - assert @sample.valid? + test "new cert has all we need" do + assert @sample.key + assert @sample.cert end - test "validates key" do - @sample.key = nil - assert @sample.valid? - assert @sample.key, "Cert should generate key" - end - - test "validates cert" do - @sample.cert = nil - assert @sample.valid? - assert @sample.cert, "Cert should generate cert" - end end -- cgit v1.2.3