diff options
author | azul <azul@riseup.net> | 2017-12-09 05:45:47 -0800 |
---|---|---|
committer | azul <azul@riseup.net> | 2017-12-09 05:45:47 -0800 |
commit | 89b879a3e5ee27bfc90751dcd02aa2213262cc5f (patch) | |
tree | de610d5ef7146c073b7129a20762838d78aeca03 /test/unit/user_test.rb | |
parent | 90c3fc431133cf18d83afd8e394e45c0bd5f63ac (diff) | |
parent | 7120117687e2e6078d7e94ddb9e8b93e8ad5f2e3 (diff) |
Merge branch 'upgrade/gemfile' into 'master'
Upgrade/gemfile
See merge request leap/webapp!55
Diffstat (limited to 'test/unit/user_test.rb')
-rw-r--r-- | test/unit/user_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |