Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
This commit is contained in:
Thibaut Girka 2018-10-05 15:23:57 +02:00
commit 00fcdebed7
93 changed files with 406 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/controllers/api/v1/accounts_controller_spec.rb
View file

@ -154,7 +154,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
before do
user.account.follow!(other_account)
post :mute, params: {id: other_account.id }
post :mute, params: { id: other_account.id }
end
it 'returns http success' do
@ -182,7 +182,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
before do
user.account.follow!(other_account)
post :mute, params: {id: other_account.id, notifications: false }
post :mute, params: { id: other_account.id, notifications: false }
end
it 'returns http success' do

1
spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
View file

@ -25,7 +25,6 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :control
expect(response.headers['Link'].links.size).to eq(2)
end
end
end
context 'without an oauth token' do

3
spec/controllers/api/v1/streaming_controller_spec.rb
View file

@ -31,7 +31,7 @@ describe Api::V1::StreamingController do
describe 'GET #index' do
it 'redirects to streaming host' do
get :index, params: {access_token: 'deadbeef', stream: 'public'}
get :index, params: { access_token: 'deadbeef', stream: 'public' }
expect(response).to have_http_status(301)
request_uri = URI.parse(request.url)
redirect_to_uri = URI.parse(response.location)
@ -42,5 +42,4 @@ describe Api::V1::StreamingController do
end
end
end
end

2
spec/controllers/api/v1/timelines/home_controller_spec.rb
View file

@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Timelines::HomeController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice'), current_sign_in_at: 1.day.ago) }
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice'), current_sign_in_at: 1.day.ago) }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/v1/timelines/public_controller_spec.rb
View file

@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Timelines::PublicController do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
before do
allow(controller).to receive(:doorkeeper_token) { token }

2
spec/controllers/api/web/embeds_controller_spec.rb
View file

@ -14,7 +14,7 @@ describe Api::Web::EmbedsController do
context 'when successfully finds status' do
let(:status) { Fabricate(:status) }
let(:url) { "http://#{ Rails.configuration.x.web_domain }/@#{status.account.username}/#{status.id}" }
let(:url) { "http://#{Rails.configuration.x.web_domain}/@#{status.account.username}/#{status.id}" }
it 'returns a right response' do
expect(response).to have_http_status :ok