Merge upstream!! #64 <3 <3

This commit is contained in:
kibigo!
2017-07-12 02:03:17 -07:00
340 changed files with 4980 additions and 2321 deletions

View File

@@ -3,11 +3,64 @@ require 'rails_helper'
RSpec.describe Admin::AccountsController, type: :controller do
render_views
let(:user) { Fabricate(:user, admin: true) }
before do
sign_in Fabricate(:user, admin: true), scope: :user
sign_in user, scope: :user
end
describe 'GET #index' do
around do |example|
default_per_page = Account.default_per_page
Account.paginates_per 1
example.run
Account.paginates_per default_per_page
end
it 'filters with parameters' do
new = AccountFilter.method(:new)
expect(AccountFilter).to receive(:new) do |params|
h = params.to_h
expect(h[:local]).to eq '1'
expect(h[:remote]).to eq '1'
expect(h[:by_domain]).to eq 'domain'
expect(h[:silenced]).to eq '1'
expect(h[:recent]).to eq '1'
expect(h[:suspended]).to eq '1'
expect(h[:username]).to eq 'username'
expect(h[:display_name]).to eq 'display name'
expect(h[:email]).to eq 'local-part@domain'
expect(h[:ip]).to eq '0.0.0.42'
new.call({})
end
get :index, params: {
local: '1',
remote: '1',
by_domain: 'domain',
silenced: '1',
recent: '1',
suspended: '1',
username: 'username',
display_name: 'display name',
email: 'local-part@domain',
ip: '0.0.0.42'
}
end
it 'paginates accounts' do
Fabricate(:account)
get :index, params: { page: 2 }
accounts = assigns(:accounts)
expect(accounts.count).to eq 1
expect(accounts.klass).to be Account
end
it 'returns http success' do
get :index
expect(response).to have_http_status(:success)

View File

@@ -31,7 +31,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'cannot create a setting value for a non-admin key' do
expect(Setting.new_setting_key).to be_blank
patch :update, params: { new_setting_key: 'New key value' }
patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.new_setting_key).to be_nil
@@ -40,7 +40,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'creates a settings value that didnt exist before for eligible key' do
expect(Setting.site_extended_description).to be_blank
patch :update, params: { site_extended_description: 'New key value' }
patch :update, params: { form_admin_settings: { site_extended_description: 'New key value' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.site_extended_description).to eq 'New key value'
@@ -56,7 +56,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'updates a settings value' do
Setting.site_title = 'Original'
patch :update, params: { site_title: 'New title' }
patch :update, params: { form_admin_settings: { site_title: 'New title' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.site_title).to eq 'New title'
@@ -72,7 +72,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
it 'typecasts open_registrations to boolean' do
Setting.open_registrations = false
patch :update, params: { open_registrations: 'true' }
patch :update, params: { form_admin_settings: { open_registrations: '1' } }
expect(response).to redirect_to(edit_admin_settings_path)
expect(Setting.open_registrations).to eq true

View File

@@ -94,7 +94,7 @@ describe AuthorizeFollowsController do
end
it 'follows account when found' do
target_account = double(id: '123')
target_account = Fabricate(:account)
result_account = double(target_account: target_account)
service = double
allow(FollowService).to receive(:new).and_return(service)
@@ -103,7 +103,7 @@ describe AuthorizeFollowsController do
post :create, params: { acct: 'acct:user@hostname' }
expect(service).to have_received(:call).with(account, 'user@hostname')
expect(response).to redirect_to(web_url('accounts/123'))
expect(response).to render_template(:success)
end
end
end

View File

@@ -23,41 +23,14 @@ RSpec.describe HomeController, type: :controller do
expect(assigns(:body_classes)).to eq 'app-body'
end
it 'assigns @token' do
app = Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri)
allow(Doorkeeper.configuration).to receive(:access_token_expires_in).and_return(42)
it 'assigns @initial_state_json' do
subject
token = Doorkeeper::AccessToken.find_by(token: assigns(:token))
expect(token.application).to eq app
expect(token.resource_owner_id).to eq user.id
expect(token.scopes).to eq Doorkeeper::OAuth::Scopes.from_string('read write follow')
expect(token.expires_in_seconds).to eq 42
expect(token.use_refresh_token?).to eq false
end
it 'assigns @web_settings for {} if not available' do
subject
expect(assigns(:web_settings)).to eq({})
end
it 'assigns @web_settings for Web::Setting if available' do
setting = Fabricate('Web::Setting', data: '{"home":{}}', user: user)
subject
expect(assigns(:web_settings)).to eq setting.data
end
it 'assigns @admin' do
admin = Fabricate(:account)
Setting.site_contact_username = admin.username
subject
expect(assigns(:admin)).to eq admin
end
it 'assigns streaming_api_base_url' do
subject
expect(assigns(:streaming_api_base_url)).to eq 'ws://localhost:4000'
initial_state_json = json_str_to_hash(assigns(:initial_state_json))
expect(initial_state_json[:meta]).to_not be_nil
expect(initial_state_json[:compose]).to_not be_nil
expect(initial_state_json[:accounts]).to_not be_nil
expect(initial_state_json[:settings]).to_not be_nil
expect(initial_state_json[:media_attachments]).to_not be_nil
end
end
end

View File

@@ -0,0 +1,19 @@
require 'rails_helper'
describe ManifestsController do
render_views
describe 'GET #show' do
before do
get :show, format: :json
end
it 'assigns @instance_presenter' do
expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end
end
end