diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/account_test.rb | 7 | ||||
| -rw-r--r-- | test/unit/invite_code_validator_test.rb | 17 | ||||
| -rw-r--r-- | test/unit/token_test.rb | 17 | ||||
| -rw-r--r-- | test/unit/user_test.rb | 6 |
4 files changed, 27 insertions, 20 deletions
diff --git a/test/unit/account_test.rb b/test/unit/account_test.rb index ebfff6b..8923a81 100644 --- a/test/unit/account_test.rb +++ b/test/unit/account_test.rb @@ -58,7 +58,7 @@ class AccountTest < ActiveSupport::TestCase test "error on invalid username" do with_config invite_required: false do - attributes = FactoryGirl.attributes_for :user, login: "a" + attributes = user_attributes login: "a" @user = Account.create attributes assert !@user.valid? assert_has_errors @user, login: "Must have at least two characters" @@ -155,7 +155,8 @@ class AccountTest < ActiveSupport::TestCase end test "Invite code stays zero when invite code is not used" do - invalid_user = FactoryGirl.build(:user, :invite_code => @testcode.invite_code) + invalid_user = FactoryBot.build :user, + :invite_code => @testcode.invite_code invalid_user.save user_code = InviteCode.find_by_invite_code invalid_user.invite_code user_code.save @@ -206,7 +207,7 @@ class AccountTest < ActiveSupport::TestCase end def user_attributes(attrs = {}) - FactoryGirl.attributes_for :user, attrs + FactoryBot.attributes_for :user, attrs end end diff --git a/test/unit/invite_code_validator_test.rb b/test/unit/invite_code_validator_test.rb index 934ba2e..7c3501a 100644 --- a/test/unit/invite_code_validator_test.rb +++ b/test/unit/invite_code_validator_test.rb @@ -3,14 +3,14 @@ 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) + invalid_user = build_user assert !invalid_user.valid? end end test "user should be created with valid invite code" do - valid_user = FactoryGirl.build(:user) + valid_user = build_user valid_code = InviteCode.create valid_user.invite_code = valid_code.invite_code @@ -19,7 +19,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase 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 = build_user :invite_code => "a non-existent code" invalid_user.valid? @@ -36,7 +36,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase user_code.invite_count = 1 user_code.save - user = FactoryGirl.build :user + user = build_user user.invite_code = user_code.invite_code validator.validate(user) @@ -51,7 +51,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase user_code = InviteCode.create user_code.save - user = FactoryGirl.build :user + user = build_user user.invite_code = user_code.invite_code validator.validate(user) @@ -64,7 +64,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase user_code = InviteCode.create - user = FactoryGirl.build :user + user = build_user user.invite_code = user_code.invite_code validator.validate(user) @@ -75,7 +75,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase test "There is an error message if the invite code does not exist" do validator = InviteCodeValidator.new - user = FactoryGirl.build :user + user = build_user user.invite_code = "wrongcode" validator.validate(user) @@ -83,4 +83,7 @@ class InviteCodeValidatorTest < ActiveSupport::TestCase assert_equal ["This is not a valid code"], user.errors[:invite_code] end + def build_user(attrs = {}) + FactoryBot.build :user, attrs + end end diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb index ce7edaa..3015c9a 100644 --- a/test/unit/token_test.rb +++ b/test/unit/token_test.rb @@ -64,7 +64,7 @@ class TokenTest < ActiveSupport::TestCase end test "Token.destroy_all_expired is noop if no expiry is set" do - expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago + expired = create_token last_seen_at: 2.hours.ago with_config auth: {} do Token.destroy_all_expired end @@ -72,8 +72,8 @@ class TokenTest < ActiveSupport::TestCase end test "Token.destroy_all_expired cleans up expired tokens only" do - expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago - fresh = FactoryGirl.create :token + expired = create_token last_seen_at: 2.hours.ago + fresh = create_token with_config auth: {token_expires_after: 60} do Token.destroy_all_expired end @@ -83,7 +83,7 @@ class TokenTest < ActiveSupport::TestCase end test "Token.destroy_all_expired does not interfere with expired.authenticate" do - expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago + expired = create_token last_seen_at: 2.hours.ago with_config auth: {token_expires_after: 60} do Token.destroy_all_expired end @@ -91,7 +91,7 @@ class TokenTest < ActiveSupport::TestCase end test "active logout (destroy) prevents reuse" do - token = FactoryGirl.create :token + token = create_token same = Token.find(token.id) token.destroy assert_raises CouchRest::NotFound do @@ -100,7 +100,7 @@ class TokenTest < ActiveSupport::TestCase end test "logout works on prolonged token" do - token = FactoryGirl.create :token + token = create_token same = Token.find(token.id) token.touch same.destroy @@ -108,11 +108,14 @@ class TokenTest < ActiveSupport::TestCase end test 'second destroy carries on' do - token = FactoryGirl.create :token + token = create_token same = Token.find(token.id) token.destroy same.destroy assert_nil Token.find(same.id) end + def create_token(attrs = {}) + FactoryBot.create :token, attrs + end end diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index ab7add0..bd05170 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -5,7 +5,7 @@ class UserTest < ActiveSupport::TestCase include SRP::Util setup do InviteCodeValidator.any_instance.stubs(:validate) - @user = FactoryGirl.build(:user) + @user = FactoryBot.build(:user) end test "don't find a user with login nil" do @@ -62,13 +62,13 @@ class UserTest < ActiveSupport::TestCase end test "login needs to be unique" do - other_user = FactoryGirl.create :user, login: @user.login + other_user = FactoryBot.create :user, login: @user.login assert !@user.valid? other_user.destroy end test "login needs to be unique amongst aliases" do - other_user = FactoryGirl.create :user + other_user = FactoryBot.create :user id = Identity.create_for other_user, address: @user.login assert !@user.valid? id.destroy |