about summary refs log tree commit diff
path: root/spec/views
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-10-05 19:01:44 +0200
committerGitHub <noreply@github.com>2018-10-05 19:01:44 +0200
commit515ce8f4697fe7edfdf14c45575a71164b920db9 (patch)
tree1211e136ba3e886ee8daaa5200babffc42375dd1 /spec/views
parenta9e8f98a9d32c57956d41009bd09a1f33310676e (diff)
parent00fcdebed758f031b486ec239fd425fc54a180b3 (diff)
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/stream_entries/show.html.haml_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
index d06bb7abb..93f0adb99 100644
--- a/spec/views/stream_entries/show.html.haml_spec.rb
+++ b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -49,8 +49,8 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
     assign(:stream_entry, reply.stream_entry)
     assign(:account, alice)
     assign(:type, reply.stream_entry.activity_type.downcase)
-    assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob) )
-    assign(:descendant_threads, [{ statuses: reply.stream_entry.activity.descendants(1)}])
+    assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob))
+    assign(:descendant_threads, [{ statuses: reply.stream_entry.activity.descendants(1) }])
 
     render