diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-10-10 17:26:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-10 17:26:08 +0200 |
| commit | 61631f475163c5640a78ff66f0ac6c053cda2f84 (patch) | |
| tree | 78920c924924b76872d420c27a8c62fb1b7f6bb7 /spec/models/account_spec.rb | |
| parent | bc0399d54dde2ad058a8382fc3edbe5506a92985 (diff) | |
| parent | a57ac0723f5918b12838da8373d51706cb461a4e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline
Diffstat (limited to 'spec/models/account_spec.rb')
| -rw-r--r-- | spec/models/account_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 3eec464bd..b2f6234cb 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -126,8 +126,8 @@ RSpec.describe Account, type: :model do end it 'sets default avatar, header, avatar_remote_url, and header_remote_url' do - expect(account.avatar_remote_url).to eq '' - expect(account.header_remote_url).to eq '' + expect(account.avatar_remote_url).to eq 'https://remote.test/invalid_avatar' + expect(account.header_remote_url).to eq expectation.header_remote_url expect(account.avatar_file_name).to eq nil expect(account.header_file_name).to eq nil end |