diff options
author | ThibG <thib@sitedethib.com> | 2018-11-27 16:26:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-27 16:26:18 +0100 |
commit | 33be091f506242b136b0d4a65cf06a0babc4d757 (patch) | |
tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /spec/controllers | |
parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
parent | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (diff) |
Merge pull request #828 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/accounts_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb index ae9e058c8..dbcad3c2d 100644 --- a/spec/controllers/admin/accounts_controller_spec.rb +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -24,8 +24,8 @@ RSpec.describe Admin::AccountsController, type: :controller do expect(h[:local]).to eq '1' expect(h[:remote]).to eq '1' expect(h[:by_domain]).to eq 'domain' + expect(h[:active]).to eq '1' expect(h[:silenced]).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' @@ -39,8 +39,8 @@ RSpec.describe Admin::AccountsController, type: :controller do local: '1', remote: '1', by_domain: 'domain', + active: '1', silenced: '1', - alphabetic: '1', suspended: '1', username: 'username', display_name: 'display name', |