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

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

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