diff options
author | ThibG <thib@sitedethib.com> | 2018-10-05 19:01:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-05 19:01:44 +0200 |
commit | 515ce8f4697fe7edfdf14c45575a71164b920db9 (patch) | |
tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /spec/controllers/admin/accounts_controller_spec.rb | |
parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
parent | 00fcdebed758f031b486ec239fd425fc54a180b3 (diff) |
Merge pull request #762 from ThibG/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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb index 197e019fe..ae9e058c8 100644 --- a/spec/controllers/admin/accounts_controller_spec.rb +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -25,7 +25,7 @@ RSpec.describe Admin::AccountsController, type: :controller do expect(h[:remote]).to eq '1' expect(h[:by_domain]).to eq 'domain' expect(h[:silenced]).to eq '1' - expect(h[:recent]).to eq '1' + expect(h[:alphabetic]).to eq '1' expect(h[:suspended]).to eq '1' expect(h[:username]).to eq 'username' expect(h[:display_name]).to eq 'display name' @@ -40,7 +40,7 @@ RSpec.describe Admin::AccountsController, type: :controller do remote: '1', by_domain: 'domain', silenced: '1', - recent: '1', + alphabetic: '1', suspended: '1', username: 'username', display_name: 'display name', @@ -75,7 +75,6 @@ RSpec.describe Admin::AccountsController, type: :controller do end end - describe 'POST #subscribe' do subject { post :subscribe, params: { id: account.id } } |