diff options
| author | Azul <azul@leap.se> | 2014-07-09 22:53:05 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-07-12 09:14:23 +0200 |
| commit | bdd5060ccc13951524c171e2d3b81eeddec1625d (patch) | |
| tree | bc07fcec83529a43c95cd1c54f0c4f43c77e51dd /test | |
| parent | cc1666d9832415058bf0b22bb5912e432261af4f (diff) | |
fix tests and simplify time calculations
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/v1/smtp_certs_controller_test.rb | 3 | ||||
| -rw-r--r-- | test/integration/api/smtp_cert_test.rb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test/functional/v1/smtp_certs_controller_test.rb b/test/functional/v1/smtp_certs_controller_test.rb index 9281ae6..3427e2d 100644 --- a/test/functional/v1/smtp_certs_controller_test.rb +++ b/test/functional/v1/smtp_certs_controller_test.rb @@ -27,7 +27,8 @@ class V1::SmtpCertsControllerTest < ActionController::TestCase protected def expect_cert(prefix) - cert = stub :to_s => "#{prefix.downcase} cert" + cert = stub to_s: "#{prefix.downcase} cert", + expiry: 1.month.from_now.utc.at_midnight ClientCertificate.expects(:new). with(:prefix => prefix). returns(cert) diff --git a/test/integration/api/smtp_cert_test.rb b/test/integration/api/smtp_cert_test.rb index f72362d..7697e44 100644 --- a/test/integration/api/smtp_cert_test.rb +++ b/test/integration/api/smtp_cert_test.rb @@ -33,8 +33,10 @@ class SmtpCertTest < ApiIntegrationTest assert_text_response cert = OpenSSL::X509::Certificate.new(get_response.body) fingerprint = OpenSSL::Digest::SHA1.hexdigest(cert.to_der).scan(/../).join(':') - today = DateTime.now.to_date.to_s - assert_equal({fingerprint => today}, @user.reload.identity.cert_fingerprints) + expiry = APP_CONFIG[:client_cert_lifespan].months.from_now.utc.midnight + expiry_string = expiry.to_date.to_s + fingerprints = {fingerprint => expiry_string} + assert_equal fingerprints, @user.reload.identity.cert_fingerprints end test "fetching smtp certs requires email account" do |