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/admin/accounts_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/admin/accounts_controller_spec.rb')
-rw-r--r-- | spec/controllers/admin/accounts_controller_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb index 3edbde03c..0f71d697c 100644 --- a/spec/controllers/admin/accounts_controller_spec.rb +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -61,7 +61,7 @@ RSpec.describe Admin::AccountsController, type: :controller do describe 'GET #show' do let(:current_user) { Fabricate(:user, admin: true) } - let(:account) { Fabricate(:account, username: 'bob') } + let(:account) { Fabricate(:account) } it 'returns http success' do get :show, params: { id: account.id } @@ -73,7 +73,7 @@ RSpec.describe Admin::AccountsController, type: :controller do subject { post :memorialize, params: { id: account.id } } let(:current_user) { Fabricate(:user, admin: current_user_admin) } - let(:account) { Fabricate(:account, user: user) } + let(:account) { user.account } let(:user) { Fabricate(:user, admin: target_user_admin) } context 'when user is admin' do @@ -125,7 +125,7 @@ RSpec.describe Admin::AccountsController, type: :controller do subject { post :enable, params: { id: account.id } } let(:current_user) { Fabricate(:user, admin: admin) } - let(:account) { Fabricate(:account, user: user) } + let(:account) { user.account } let(:user) { Fabricate(:user, disabled: true) } context 'when user is admin' do |