summaryrefslogtreecommitdiff
path: root/certs/test
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-11 12:52:40 +0200
committerAzul <azul@leap.se>2012-10-11 12:52:40 +0200
commit10441deba145f53604ca3b981374f1ee6619c400 (patch)
tree90d2a851cd558652121182937a5ec8373722cab0 /certs/test
parent61d73ac517ccbcc7ca8892010ef89e861052807f (diff)
parent33ef3d2ac9a03b06ff29f1367c69731a89f1dfc7 (diff)
Merge branch 'release-0.1.0'
Diffstat (limited to 'certs/test')
-rw-r--r--certs/test/functional/certs_controller_test.rb1
-rw-r--r--certs/test/test_helper.rb2
-rw-r--r--certs/test/unit/cert_test.rb3
3 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 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/test_helper.rb b/certs/test/test_helper.rb
index b268c51..08d4d41 100644
--- a/certs/test/test_helper.rb
+++ b/certs/test/test_helper.rb
@@ -1,5 +1,5 @@
ENV["RAILS_ENV"] = "test"
-require File.expand_path('../dummy/config/environment', __FILE__)
+require File.expand_path('../../../test/dummy/config/environment', __FILE__)
require 'rails/test_help'
require 'mocha'
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