tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
This commit is contained in:
David Yip
2018-04-18 18:48:12 -05:00
parent 813da6788e ff87d1bc3e
commit 16d5217502
124 changed files with 2089 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spec/controllers/stream_entries_controller_spec.rb
View File

@ -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