diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
| commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
| tree | e6022023d42dde628bb44880659104a87f985039 /spec/controllers | |
| parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
| parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) | |
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/settings/exports/muted_accounts_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb index f42d7881e..642f0a9b8 100644 --- a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb +++ b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb @@ -11,7 +11,7 @@ describe Settings::Exports::MutedAccountsController do sign_in user, scope: :user get :index, format: :csv - expect(response.body).to eq "username@domain\n" + expect(response.body).to eq "Account address,Hide notifications\nusername@domain,true\n" end end end |