From 7e99041ee0260e77c649b6be915e1979eecdc5b1 Mon Sep 17 00:00:00 2001 From: Sergio Cambra Date: Wed, 19 Apr 2023 12:40:55 +0200 Subject: [PATCH] use errors.details for assertions, fixing tests on rails 7.1 --- test/models/invitable_test.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/models/invitable_test.rb b/test/models/invitable_test.rb index c117d6db..5a3673af 100644 --- a/test/models/invitable_test.rb +++ b/test/models/invitable_test.rb @@ -371,10 +371,10 @@ def setup existing_user.save(validate: false) user = User.invite!(email: 'valid@email.com') assert_equal user, existing_user - assert_equal ['has already been taken'], user.errors[:email] + assert_equal [{error: :taken}], user.errors.details[:email] same_user = User.invite!(email: 'valid@email.com') assert_equal same_user, existing_user - assert_equal ['has already been taken'], same_user.errors[:email] + assert_equal [{error: :taken}], same_user.errors.details[:email] end test 'should return a record with errors if user with pending invitation was found by e-mail' do @@ -388,7 +388,7 @@ def setup user = User.invite!(email: 'valid@email.com') assert_equal user, existing_user - assert_equal ['has already been taken'], user.errors[:email] + assert_equal [{error: :taken}], user.errors.details[:email] ensure User.resend_invitation = resend_invitation end @@ -402,7 +402,7 @@ def setup existing_user.save(validate: false) user = User.invite!(email: 'valid@email.com', username: 'a' * 50) assert_equal user, existing_user - assert_equal ['has already been taken'], user.errors[:email] + assert_equal [{error: :taken}], user.errors.details[:email] refute_empty user.errors[:username] ensure User.validate_on_invite = validate_on_invite @@ -412,13 +412,13 @@ def setup test 'should return a new record with errors if e-mail is blank' do invited_user = User.invite!(email: '') assert invited_user.new_record? - assert_equal ["can't be blank"], invited_user.errors[:email] + assert_equal [{error: :blank}], invited_user.errors.details[:email] end test 'should return a new record with errors if e-mail is invalid' do invited_user = User.invite!(email: 'invalid_email') assert invited_user.new_record? - assert_equal ['is invalid'], invited_user.errors[:email] + assert_equal [{error: :invalid}], invited_user.errors.details[:email] end test 'should set all attributes with errors if e-mail is invalid' do @@ -438,13 +438,13 @@ def setup test 'should return a new record with errors if no invitation_token is found' do invited_user = User.accept_invitation!(invitation_token: 'invalid_token') assert invited_user.new_record? - assert_equal ['is invalid'], invited_user.errors[:invitation_token] + assert_equal [{error: :invalid}], invited_user.errors.details[:invitation_token] end test 'should return a new record with errors if invitation_token is blank' do invited_user = User.accept_invitation!(invitation_token: '') assert invited_user.new_record? - assert_equal ["can't be blank"], invited_user.errors[:invitation_token] + assert_equal [{error: :blank}], invited_user.errors.details[:invitation_token] end test 'should return record with errors if invitation_token has expired' do @@ -454,7 +454,7 @@ def setup invited_user.save(validate: false) user = User.accept_invitation!(invitation_token: Thread.current[:token]) assert_equal user, invited_user - assert_equal ['is invalid'], user.errors[:invitation_token] + assert_equal [{error: :invalid}], user.errors.details[:invitation_token] end test 'should allow record modification using block' do