diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 09:38:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-28 09:38:44 +0100 |
commit | 2ba6267f1603cee682bfe3885b797ad5df7e958f (patch) | |
tree | 60586262894c6aadf5722a53ce560c9b05c3e974 /spec/controllers/application_controller_spec.rb | |
parent | 58930199379305e718d57b48488cc752b452e72a (diff) | |
parent | 94a39f6b68e236993fe5b89a697b17c8535f6ea0 (diff) |
Merge pull request #1668 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
-rw-r--r-- | spec/controllers/application_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 881ecb124..a6a6871f7 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -49,7 +49,7 @@ describe ApplicationController, type: :controller do it 'returns account if signed in' do account = Fabricate(:account) - sign_in(Fabricate(:user, account: account)) + sign_in(account.user) expect(controller.view_context.current_account).to eq account end end @@ -168,13 +168,13 @@ describe ApplicationController, type: :controller do end it 'does nothing if user who signed in is not suspended' do - sign_in(Fabricate(:user, account: Fabricate(:account, suspended: false))) + sign_in(Fabricate(:account, suspended: false).user) get 'success' expect(response).to have_http_status(200) end it 'redirects to account status page' do - sign_in(Fabricate(:user, account: Fabricate(:account, suspended: true))) + sign_in(Fabricate(:account, suspended: true).user) get 'success' expect(response).to redirect_to(edit_user_registration_path) end |