diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-31 19:10:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-31 19:10:57 +0200 |
| commit | 6f75a9001f6ba8e47c80767d8406cfeb11a79690 (patch) | |
| tree | 7f988360fd5b6aefa1ddd4255926bb20025fd27f /spec/views | |
| parent | c6942a528332e99b605efa95ffa1c710324d368c (diff) | |
| parent | 55880c70981bac9278e7f8584f9d4ecd78f1ba6b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/stream_entries/show.html.haml_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb index 34207aa6b..d06bb7abb 100644 --- a/spec/views/stream_entries/show.html.haml_spec.rb +++ b/spec/views/stream_entries/show.html.haml_spec.rb @@ -12,6 +12,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d allow(view).to receive(:full_asset_url).and_return('//asset.host/image.svg') allow(view).to receive(:local_time) allow(view).to receive(:local_time_ago) + allow(view).to receive(:current_account).and_return(nil) assign(:instance_presenter, InstancePresenter.new) end |