Merge pull request #22 from leapcode/feature/merge_leap_ca

merge leap ca

3 files changed, 14 insertions, 91 deletions

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
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..492a44a
--- /dev/null
+++ b/certs/test/unit/client_certificate_test.rb
@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class ClientCertificateTest < ActiveSupport::TestCase
+
+  setup do
+    @sample = ClientCertificate.new
+  end
+
+  test "new cert has all we need" do
+    assert @sample.key
+    assert @sample.cert
+  end
+
+end