diff --git a/test/integration/default/controls/cert.rb b/test/integration/default/controls/cert.rb index 711cdfa..68ff60a 100644 --- a/test/integration/default/controls/cert.rb +++ b/test/integration/default/controls/cert.rb @@ -6,10 +6,10 @@ crts = { 'standalone.gn98.de' => { 'alias' => 'www.standalone.gn98.de', - 'keylength' => 2048, + 'keylength' => 2048 }, 'alpn.gn98.de' => { - 'keylength' => 4096, + 'keylength' => 4096 } } crts.each do |cn, conf| @@ -19,7 +19,9 @@ it { should be_certificate } its('subject.CN') { should eq cn } its('keylength') { should eq conf['keylength'] } - its('subject_alt_names') { should include "DNS:#{conf['alias']}" } if conf['alias'] + if conf['alias'] + its('subject_alt_names') { should include "DNS:#{conf['alias']}" } + end its('validity_in_days') { should be > 30 } end end diff --git a/test/integration/default/controls/file.rb b/test/integration/default/controls/file.rb index 6473a62..ca75b03 100644 --- a/test/integration/default/controls/file.rb +++ b/test/integration/default/controls/file.rb @@ -4,7 +4,7 @@ title 'Test cert files' crts = ['standalone.gn98.de', 'alpn.gn98.de'] - + crts.each do |crt| dir = "/home/vagrant/crt/#{crt}"