summaryrefslogtreecommitdiff
path: root/certs/test/functional/certs_controller_test.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-18 02:29:45 +0100
committerAzul <azul@leap.se>2012-12-18 02:29:45 +0100
commitcd0c59ae6177b8b93971735887657314b6888a3c (patch)
treed39b06cd424e3345a3cba97f56a44c920c06ec97 /certs/test/functional/certs_controller_test.rb
parentbe2d8fbd65f4ed2e1e97b19a3322da20e2fb4eda (diff)
parente899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff)
Merge branch 'master' into feature/removing-email-aliases
Diffstat (limited to 'certs/test/functional/certs_controller_test.rb')
-rw-r--r--certs/test/functional/certs_controller_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb
index 9bba8c0..3d6946e 100644
--- a/certs/test/functional/certs_controller_test.rb
+++ b/certs/test/functional/certs_controller_test.rb
@@ -12,10 +12,10 @@ class CertsControllerTest < ActionController::TestCase
test "should send cert" do
login
- cert = stub :zipped => "adsf", :zipname => "cert_stub.zip"
- Cert.expects(:pick_from_pool).returns(cert)
+ cert = stub :cert => "adsf", :key => "key"
+ LeapCA::Cert.expects(:pick_from_pool).returns(cert)
get :show
assert_response :success
- assert_equal cert.zipped, @response.body
+ assert_equal cert.key + cert.cert, @response.body
end
end