Merge branch 'feature/certs-from-ca-deamon' into develop

Conflicts:
	certs/app/models/leap_ca/cert.rb

1 files changed, 18 insertions, 28 deletions

diff --git a/certs/test/unit/cert_test.rb b/certs/test/unit/cert_test.rb
index 9362da2..0b21d0b 100644
--- a/certs/test/unit/cert_test.rb
+++ b/certs/test/unit/cert_test.rb
@@ -3,47 +3,37 @@ require 'test_helper'
 class CertTest < ActiveSupport::TestCase
 
   setup do
-    @sample = Cert.new
-    @sample.set_random
-    @sample.attach_zip
+    @sample = LeapCA::Cert.new LeapCA::Cert.valid_attributes_hash
   end
 
-  test "certs come with attachments" do
-    assert @sample.has_attachment? "cert.txt"
-  end
-
-  test "cert.zip_attachment returns couchDB attachment" do
-    assert_equal "text/plain", @sample.zip_attachment["content_type"]
-  end
-
-  test "cert.zipped returns the actual data" do
-    @sample.save # This is required !
-    assert lines = @sample.zipped.split("\n")
-    assert_equal 56, lines.count
-    assert_equal "-----BEGIN RSA PRIVATE KEY-----", lines.first.chomp
-    assert_equal "-----END CERTIFICATE-----", lines.last.chomp
-  end
-
-  test "cert.zipname returns name for the zip file" do
-    assert_equal "cert.txt", @sample.zipname
+  test "stub cert for testing is valid" do
+    assert @sample.valid?
   end
 
-  test "test data is valid" do
+  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.stubs(:set_random)
-    [0, 1, nil, "asdf"].each do |invalid|
+    @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 attachment" do
-    @sample.stubs(:attach_zip)
-    @sample.delete_attachment(@sample.zipname)
-    assert !@sample.valid?, "Cert should require zipped attachment"
+  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