summaryrefslogtreecommitdiff
path: root/test/integration/api
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/api')
-rw-r--r--test/integration/api/cert_test.rb1
-rw-r--r--test/integration/api/smtp_cert_test.rb12
-rw-r--r--test/integration/api/srp_test.rb9
3 files changed, 17 insertions, 5 deletions
diff --git a/test/integration/api/cert_test.rb b/test/integration/api/cert_test.rb
index 118fb9f..772901d 100644
--- a/test/integration/api/cert_test.rb
+++ b/test/integration/api/cert_test.rb
@@ -2,6 +2,7 @@ require 'test_helper'
class CertTest < ApiIntegrationTest
+
test "retrieve eip cert" do
login
get '/1/cert', {}, RACK_ENV
diff --git a/test/integration/api/smtp_cert_test.rb b/test/integration/api/smtp_cert_test.rb
index 2f50ef3..681d509 100644
--- a/test/integration/api/smtp_cert_test.rb
+++ b/test/integration/api/smtp_cert_test.rb
@@ -3,8 +3,13 @@ require 'openssl'
class SmtpCertTest < ApiIntegrationTest
+ setup do
+ @testcode = InviteCode.new
+ @testcode.save!
+ end
+
test "retrieve smtp cert" do
- @user = FactoryGirl.create :user, effective_service_level_code: 2
+ @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
login
post '/1/smtp_cert', {}, RACK_ENV
assert_text_response
@@ -15,7 +20,7 @@ class SmtpCertTest < ApiIntegrationTest
end
test "cert and key" do
- @user = FactoryGirl.create :user, effective_service_level_code: 2
+ @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
login
post '/1/smtp_cert', {}, RACK_ENV
assert_text_response
@@ -27,7 +32,7 @@ class SmtpCertTest < ApiIntegrationTest
end
test "fingerprint is stored with identity" do
- @user = FactoryGirl.create :user, effective_service_level_code: 2
+ @user = FactoryGirl.create :user, effective_service_level_code: 2, :invite_code => @testcode.invite_code
login
post '/1/smtp_cert', {}, RACK_ENV
assert_text_response
@@ -41,6 +46,7 @@ class SmtpCertTest < ApiIntegrationTest
end
test "fetching smtp certs requires email account" do
+
login
post '/1/smtp_cert', {}, RACK_ENV
assert_access_denied
diff --git a/test/integration/api/srp_test.rb b/test/integration/api/srp_test.rb
index fbef47e..463abcd 100644
--- a/test/integration/api/srp_test.rb
+++ b/test/integration/api/srp_test.rb
@@ -1,5 +1,10 @@
class SrpTest < RackTest
+ setup do
+ @testcode = InviteCode.new
+ @testcode.save!
+ end
+
teardown do
if @user
cleanup_user
@@ -32,10 +37,10 @@ class SrpTest < RackTest
attr_reader :server_auth
- def register_user(login = "integration_test", password = 'srp, verify me!')
+ def register_user(login = "integration_test", password = 'srp, verify me!', invite_code = @testcode.invite_code)
cleanup_user(login)
post 'http://api.lvh.me:3000/1/users.json',
- user_params(login: login, password: password)
+ user_params(login: login, password: password, invite_code: invite_code)
assert(@user = User.find_by_login(login), 'user should have been created: %s' % last_response_errors)
@login = login
@password = password