about summary refs log tree commit diff
path: root/spec/controllers
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-04-18 18:48:12 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-04-18 18:48:12 -0500
commit16d5217502a09132dc14a3a808036af5dbcb73dd (patch)
treedeb7b81919e5f8082b7d848b0b8df4787d37f001 /spec/controllers
parent813da6788e5129579db04e89aac3076902af2c7a (diff)
parentff87d1bc3ecdb81ff5c523f0964ecf223a503d30 (diff)
Merge remote-tracking branch 'origin/master' into gs-master
  Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/stream_entries_controller_spec.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/spec/controllers/stream_entries_controller_spec.rb b/spec/controllers/stream_entries_controller_spec.rb
index f81e2be7b..665c5b747 100644
--- a/spec/controllers/stream_entries_controller_spec.rb
+++ b/spec/controllers/stream_entries_controller_spec.rb
@@ -66,16 +66,12 @@ RSpec.describe StreamEntriesController, type: :controller do
   describe 'GET #show' do
     include_examples 'before_action', :show
 
-    it 'renders with HTML' do
-      ancestor = Fabricate(:status)
-      status = Fabricate(:status, in_reply_to_id: ancestor.id)
-      descendant = Fabricate(:status, in_reply_to_id: status.id)
+    it 'redirects to status page' do
+      status = Fabricate(:status)
 
       get :show, params: { account_username: status.account.username, id: status.stream_entry.id }
 
-      expect(assigns(:ancestors)).to eq [ancestor]
-      expect(assigns(:descendants)).to eq [descendant]
-      expect(response).to have_http_status(:success)
+      expect(response).to redirect_to(short_account_status_url(status.account, status))
     end
 
     it 'returns http success with Atom' do