Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

2 files changed, 2 insertions, 2 deletions

diff --git a/certs/test/functional/certs_controller_test.rb b/certs/test/functional/certs_controller_test.rb
index 04669f5..295515b 100644
--- a/certs/test/functional/certs_controller_test.rb
+++ b/certs/test/functional/certs_controller_test.rb
@@ -10,6 +10,5 @@ class CertsControllerTest < ActionController::TestCase
     get :show
     assert_response :success
     assert_equal cert.zipped, @response.body
-    assert_attachement_filename "cert_stub.zip"
   end
 end
diff --git a/certs/test/unit/cert_test.rb b/certs/test/unit/cert_test.rb
index 21ef169..9362da2 100644
--- a/certs/test/unit/cert_test.rb
+++ b/certs/test/unit/cert_test.rb
@@ -17,8 +17,9 @@ class CertTest < ActiveSupport::TestCase
   end
 
   test "cert.zipped returns the actual data" do
-    @sample.save # This is required!
+    @sample.save # This is required !
     assert lines = @sample.zipped.split("\n")
+    assert_equal 56, lines.count
     assert_equal "-----BEGIN RSA PRIVATE KEY-----", lines.first.chomp
     assert_equal "-----END CERTIFICATE-----", lines.last.chomp
   end