summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/factories.rb1
-rw-r--r--test/functional/identities_controller_test.rb4
-rw-r--r--test/functional/v1/messages_controller_test.rb1
-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
-rw-r--r--test/integration/browser/account_test.rb36
-rw-r--r--test/support/api_integration_test.rb7
-rw-r--r--test/support/browser_integration_test.rb37
-rw-r--r--test/unit/account_test.rb44
-rw-r--r--test/unit/invite_code_test.rb67
-rw-r--r--test/unit/invite_code_validator_test.rb30
-rw-r--r--test/unit/tmp_user_test.rb4
-rw-r--r--test/unit/token_test.rb1
-rw-r--r--test/unit/user_test.rb3
15 files changed, 223 insertions, 34 deletions
diff --git a/test/factories.rb b/test/factories.rb
index 0734688..b6e1475 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -11,6 +11,7 @@ FactoryGirl.define do
login { Faker::Internet.user_name + '_' + SecureRandom.hex(4) }
password_verifier "1234ABCD"
password_salt "4321AB"
+ invite_code "testcode"
factory :user_with_settings do
email_forward { Faker::Internet.email }
diff --git a/test/functional/identities_controller_test.rb b/test/functional/identities_controller_test.rb
index fcdeaa2..e491c52 100644
--- a/test/functional/identities_controller_test.rb
+++ b/test/functional/identities_controller_test.rb
@@ -2,6 +2,10 @@ require 'test_helper'
class IdentitiesControllerTest < ActionController::TestCase
+ setup do
+ InviteCodeValidator.any_instance.stubs(:validate)
+ end
+
test "admin can list active and blocked ids" do
login :is_admin? => true
get :index
diff --git a/test/functional/v1/messages_controller_test.rb b/test/functional/v1/messages_controller_test.rb
index 6f7ea5d..720d862 100644
--- a/test/functional/v1/messages_controller_test.rb
+++ b/test/functional/v1/messages_controller_test.rb
@@ -3,6 +3,7 @@ require 'test_helper'
class V1::MessagesControllerTest < ActionController::TestCase
setup do
+ InviteCodeValidator.any_instance.stubs(:validate)
@user = FactoryGirl.build(:user)
@user.save
@message = Message.new(:text => 'a test message')
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
diff --git a/test/integration/browser/account_test.rb b/test/integration/browser/account_test.rb
index aea5406..cbe7ba9 100644
--- a/test/integration/browser/account_test.rb
+++ b/test/integration/browser/account_test.rb
@@ -6,7 +6,7 @@ class AccountTest < BrowserIntegrationTest
Identity.destroy_all_disabled
end
- test "signup successfully" do
+ test "signup successfully when invited" do
username, password = submit_signup
assert page.has_content?("Welcome #{username}")
click_on 'Log Out'
@@ -16,6 +16,22 @@ class AccountTest < BrowserIntegrationTest
user.account.destroy
end
+ test "signup successfully without invitation" do
+ with_config invite_required: false do
+
+ username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
+ password ||= SecureRandom.base64
+
+ visit '/users/new'
+ fill_in 'Username', with: username
+ fill_in 'Password', with: password
+ fill_in 'Password confirmation', with: password
+ click_on 'Sign Up'
+
+ assert page.has_content?("Welcome #{username}")
+ end
+ end
+
test "signup with username ending in dot json" do
username = Faker::Internet.user_name + '.json'
submit_signup username
@@ -47,6 +63,7 @@ class AccountTest < BrowserIntegrationTest
test "account destruction" do
username, password = submit_signup
+
click_on I18n.t('account_settings')
click_on I18n.t('destroy_my_account')
assert page.has_content?(I18n.t('account_destroyed'))
@@ -81,21 +98,6 @@ class AccountTest < BrowserIntegrationTest
end
end
- test "change password" do
- with_config user_actions: ['change_password'] do
- login
- click_on "Account Settings"
- within('#update_login_and_password') do
- fill_in 'Password', with: "other password"
- fill_in 'Password confirmation', with: "other password"
- click_on 'Save'
- end
- click_on 'Log Out'
- attempt_login(@user.login, "other password")
- assert page.has_content?("Welcome #{@user.login}")
- end
- end
-
test "change pgp key" do
with_config user_actions: ['change_pgp_key'] do
pgp_key = FactoryGirl.build :pgp_key
@@ -117,6 +119,8 @@ class AccountTest < BrowserIntegrationTest
# trying to seed an invalid A for srp login
test "detects attempt to circumvent SRP" do
+ InviteCodeValidator.any_instance.stubs(:validate)
+
user = FactoryGirl.create :user
visit '/login'
fill_in 'Username', with: user.login
diff --git a/test/support/api_integration_test.rb b/test/support/api_integration_test.rb
index bd10f11..4077920 100644
--- a/test/support/api_integration_test.rb
+++ b/test/support/api_integration_test.rb
@@ -3,8 +3,13 @@ class ApiIntegrationTest < ActionDispatch::IntegrationTest
DUMMY_TOKEN = Token.new
RACK_ENV = {'HTTP_AUTHORIZATION' => %Q(Token token="#{DUMMY_TOKEN.to_s}")}
+ setup do
+ @testcode = InviteCode.new
+ @testcode.save!
+ end
+
def login(user = nil)
- @user ||= user ||= FactoryGirl.create(:user)
+ @user ||= user ||= FactoryGirl.create(:user, :invite_code => @testcode.invite_code)
# DUMMY_TOKEN will be frozen. So let's use a dup
@token ||= DUMMY_TOKEN.dup
# make sure @token is up to date if it already exists
diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb
index 1e2aa51..35887cc 100644
--- a/test/support/browser_integration_test.rb
+++ b/test/support/browser_integration_test.rb
@@ -37,6 +37,8 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
setup do
Capybara.current_driver = Capybara.javascript_driver
page.driver.add_headers 'ACCEPT-LANGUAGE' => 'en-EN'
+ @testcode = InviteCode.new
+ @testcode.save!
end
teardown do
@@ -45,19 +47,38 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest
end
def submit_signup(username = nil, password = nil)
- username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
- password ||= SecureRandom.base64
- visit '/users/new'
- fill_in 'Username', with: username
- fill_in 'Password', with: password
- fill_in 'Password confirmation', with: password
- click_on 'Sign Up'
- return username, password
+
+ with_config invite_required: true do
+
+ username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
+ password ||= SecureRandom.base64
+ visit '/users/new'
+ fill_in 'Username', with: username
+ fill_in 'Password', with: password
+ fill_in 'Invite code', with: @testcode.invite_code
+ fill_in 'Password confirmation', with: password
+ click_on 'Sign Up'
+ return username, password
+ end
+
+ with_config invite_required: false do
+
+ username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
+ password ||= SecureRandom.base64
+ visit '/users/new'
+ fill_in 'Username', with: username
+ fill_in 'Password', with: password
+ fill_in 'Password confirmation', with: password
+ click_on 'Sign Up'
+ return username, password
+ end
+
end
# currently this only works for tests with poltergeist.
# ApiIntegrationTest has a working implementation for RackTest
def login(user = nil)
+ InviteCodeValidator.any_instance.stubs(:validate)
@user ||= user ||= FactoryGirl.create(:user)
token = Token.create user_id: user.id
page.driver.add_header "Authorization", %Q(Token token="#{token}")
diff --git a/test/unit/account_test.rb b/test/unit/account_test.rb
index b2bfe27..6b814b6 100644
--- a/test/unit/account_test.rb
+++ b/test/unit/account_test.rb
@@ -2,12 +2,17 @@ require 'test_helper'
class AccountTest < ActiveSupport::TestCase
+ setup do
+ @testcode = InviteCode.new
+ @testcode.save!
+ end
+
teardown do
Identity.destroy_all_disabled
end
- test "create a new account" do
- user = Account.create(FactoryGirl.attributes_for(:user))
+ test "create a new account when invited" do
+ user = Account.create(FactoryGirl.attributes_for(:user, :invite_code => @testcode.invite_code))
assert user.valid?, "unexpected errors: #{user.errors.inspect}"
assert user.persisted?
assert id = user.identity
@@ -16,18 +21,28 @@ class AccountTest < ActiveSupport::TestCase
user.account.destroy
end
+ test "create a new account" do
+ with_config invite_required: false do
+ user = Account.create(FactoryGirl.attributes_for(:user))
+ assert user.valid?, "unexpected errors: #{user.errors.inspect}"
+ assert user.persisted?
+ user.account.destroy
+ end
+ end
+
+
test "create and remove a user account" do
# We keep an identity that will block the handle from being reused.
assert_difference "Identity.count" do
assert_no_difference "User.count" do
- user = Account.create(FactoryGirl.attributes_for(:user))
+ user = Account.create(FactoryGirl.attributes_for(:user, :invite_code => @testcode.invite_code))
user.account.destroy
end
end
end
test "change username and create alias" do
- user = Account.create(FactoryGirl.attributes_for(:user))
+ user = Account.create(FactoryGirl.attributes_for(:user, :invite_code => @testcode.invite_code))
old_id = user.identity
old_email = user.email_address
user.account.update(FactoryGirl.attributes_for(:user))
@@ -44,4 +59,25 @@ class AccountTest < ActiveSupport::TestCase
user.account.destroy
end
+ test "Invite code count goes up by 1 when the invite code is entered" do
+ with_config invite_required: true do
+ user = Account.create(FactoryGirl.attributes_for(:user, :invite_code => @testcode.invite_code))
+ user_code = InviteCode.find_by_invite_code user.invite_code
+ user_code.save
+ user.save
+ assert user.persisted?
+ assert_equal 1, user_code.invite_count
+ end
+
+ end
+
+ test "Invite code stays zero when invite code is not used" do
+ #user = Account.create(FactoryGirl.attributes_for(:user, :invite_code => @testcode.invite_code))
+ invalid_user = FactoryGirl.build(:user, :invite_code => @testcode.invite_code)
+ invalid_user.save
+ user_code = InviteCode.find_by_invite_code invalid_user.invite_code
+ user_code.save
+
+ assert_equal 0, user_code.invite_count
+ end
end
diff --git a/test/unit/invite_code_test.rb b/test/unit/invite_code_test.rb
new file mode 100644
index 0000000..b17d1bc
--- /dev/null
+++ b/test/unit/invite_code_test.rb
@@ -0,0 +1,67 @@
+require 'test_helper'
+
+class InviteCodeTest < ActiveSupport::TestCase
+
+ test "it is created with an invite code" do
+ code = InviteCode.new
+ assert_not_nil code.invite_code
+ end
+
+ test "the invite code can be read from couch db correctly" do
+ code1 = InviteCode.new
+ code1.save
+ code2 = InviteCode.find_by_invite_code code1.invite_code
+ assert_equal code1.invite_code, code2.invite_code
+ end
+
+ test "the invite code count gets set to 0 upon creation" do
+ code1 = InviteCode.new
+ code1.save
+ assert_equal code1.invite_count, 0
+ end
+
+
+ test "Invite count >0 is not accepted for new account signup" do
+ validator = InviteCodeValidator.new nil
+
+ user_code = InviteCode.new
+ user_code.invite_count = 1
+ user_code.save
+
+ user = FactoryGirl.build :user
+ user.invite_code = user_code.invite_code
+
+ validator.validate(user)
+
+ assert_equal ["This code has already been used"], user.errors[:invite_code]
+
+ end
+
+ test "Invite count 0 is accepted for new account signup" do
+ validator = InviteCodeValidator.new nil
+
+ user_code = InviteCode.create
+
+ user = FactoryGirl.build :user
+ user.invite_code = user_code.invite_code
+
+ validator.validate(user)
+
+ assert_equal [], user.errors[:invite_code]
+ end
+
+ test "There is an error message if the invite code does not exist" do
+ validator = InviteCodeValidator.new nil
+
+ user = FactoryGirl.build :user
+ user.invite_code = "wrongcode"
+
+ validator.validate(user)
+
+ assert_equal ["This is not a valid code"], user.errors[:invite_code]
+
+ end
+
+
+end
+
diff --git a/test/unit/invite_code_validator_test.rb b/test/unit/invite_code_validator_test.rb
new file mode 100644
index 0000000..ee8f1b3
--- /dev/null
+++ b/test/unit/invite_code_validator_test.rb
@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class InviteCodeValidatorTest < ActiveSupport::TestCase
+ test "user should not be created with invalid invite code" do
+ with_config invite_required: true do
+ invalid_user = FactoryGirl.build(:user)
+
+ assert !invalid_user.valid?
+ end
+ end
+
+ test "user should be created with valid invite code" do
+ valid_user = FactoryGirl.build(:user)
+ valid_code = InviteCode.create
+ valid_user.invite_code = valid_code.invite_code
+
+ assert valid_user.valid?
+ end
+
+ test "trying to create a user with invalid invite code should add error" do
+ with_config invite_required: true do
+ invalid_user = FactoryGirl.build(:user, :invite_code => "a non-existent code")
+
+ invalid_user.valid?
+
+ errors = {invite_code: ["This is not a valid code"]}
+ assert_equal errors, invalid_user.errors.messages
+ end
+ end
+end \ No newline at end of file
diff --git a/test/unit/tmp_user_test.rb b/test/unit/tmp_user_test.rb
index 55b117f..9494377 100644
--- a/test/unit/tmp_user_test.rb
+++ b/test/unit/tmp_user_test.rb
@@ -2,6 +2,10 @@ require 'test_helper'
class TmpUserTest < ActiveSupport::TestCase
+ setup do
+ InviteCodeValidator.any_instance.stubs(:validate)
+ end
+
test "test_user saved to tmp_users" do
begin
assert User.ancestors.include?(TemporaryUser)
diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb
index 5468650..51c8d8e 100644
--- a/test/unit/token_test.rb
+++ b/test/unit/token_test.rb
@@ -4,6 +4,7 @@ class TokenTest < ActiveSupport::TestCase
include StubRecordHelper
setup do
+ InviteCodeValidator.any_instance.stubs(:validate)
@user = find_record :user
end
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index c301923..9501d34 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -4,6 +4,7 @@ class UserTest < ActiveSupport::TestCase
include SRP::Util
setup do
+ InviteCodeValidator.any_instance.stubs(:validate)
@user = FactoryGirl.build(:user)
end
@@ -70,6 +71,8 @@ class UserTest < ActiveSupport::TestCase
assert_equal key, @user.public_key
end
+
+
#
## Regression tests
#
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 22:48:14 +0000