Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 0 insertions, 24 deletions

diff --git a/certs/test/unit/client_certificate_test.rb b/certs/test/unit/client_certificate_test.rb
deleted file mode 100644
index 036e724..0000000
--- a/certs/test/unit/client_certificate_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'test_helper'
-
-class ClientCertificateTest < ActiveSupport::TestCase
-
-  test "new cert has all we need" do
-    sample = ClientCertificate.new
-    assert sample.key
-    assert sample.cert
-    assert sample.to_s
-  end
-
-  test "cert has configured prefix" do
-    prefix = "PREFIX"
-    sample = ClientCertificate.new(:prefix => prefix)
-    assert sample.cert.subject.common_name.starts_with?(prefix)
-  end
-
-  test "cert issuer matches ca subject" do
-    sample = ClientCertificate.new
-    cert = OpenSSL::X509::Certificate.new(sample.cert.to_pem)
-    assert_equal ClientCertificate.root_ca.openssl_body.subject, cert.issuer
-  end
-
-end