diff options
| author | Azul <azul@leap.se> | 2012-12-17 12:33:15 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-17 12:33:15 +0100 |
| commit | 251400a1bf4497fd1f26beb89302187d465a5faa (patch) | |
| tree | 680760fd67d25ab3c4e09ab0a16de1d3996720c6 /certs/test/functional/certs_controller_test.rb | |
| parent | d64ab283b7bce0d296bb743f030c5361af663456 (diff) | |
| parent | a8f5a1ec486d5ee378f7b820c9f2c046e5c03672 (diff) | |
Merge branch 'feature/certs-from-ca-deamon' into develop
Conflicts:
certs/app/models/leap_ca/cert.rb
Diffstat (limited to 'certs/test/functional/certs_controller_test.rb')
| -rw-r--r-- | certs/test/functional/certs_controller_test.rb | 6 |
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 |