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

3 files changed, 5 insertions, 22 deletions

diff --git a/certs/app/models/client_certificate.rb b/certs/app/models/client_certificate.rb
index 6abc1ee..b664ff0 100644
--- a/certs/app/models/client_certificate.rb
+++ b/certs/app/models/client_certificate.rb
@@ -11,8 +11,6 @@ require 'date'
 
 class ClientCertificate < CouchRest::Model::Base
 
-  use_database 'client_certificates'
-
   timestamps!
 
   property :key, String                          # the client private RSA key
diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb
index 3d6946e..887d5f0 100644
--- a/certs/test/functional/certs_controller_test.rb
+++ b/certs/test/functional/certs_controller_test.rb
@@ -13,7 +13,7 @@ class CertsControllerTest < ActionController::TestCase
   test "should send cert" do
     login
     cert = stub :cert => "adsf", :key => "key"
-    LeapCA::Cert.expects(:pick_from_pool).returns(cert)
+    ClientCertificate.expects(:create).returns(cert)
     get :show
     assert_response :success
     assert_equal cert.key + cert.cert, @response.body
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