diff options
author | ThibG <thib@sitedethib.com> | 2018-08-31 20:56:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 20:56:22 +0200 |
commit | fd2c7aa8ec2ee00c62d76887ee3b597c8462049d (patch) | |
tree | 7f988360fd5b6aefa1ddd4255926bb20025fd27f /spec/views/stream_entries | |
parent | c6942a528332e99b605efa95ffa1c710324d368c (diff) | |
parent | 6f75a9001f6ba8e47c80767d8406cfeb11a79690 (diff) |
Merge pull request #694 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/views/stream_entries')
-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 |