mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-27 02:54:19 +00:00
Lint pass (#8876)
This commit is contained in:
parent
928102284a
commit
1f98eae1cf
|
@ -1,6 +1,6 @@
|
||||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
|
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
|
||||||
|
|
||||||
require 'bundler/setup' # Set up gems listed in the Gemfile.
|
require 'bundler/setup' # Set up gems listed in the Gemfile.
|
||||||
require 'bootsnap' # Speed up boot time by caching expensive operations.
|
require 'bootsnap' # Speed up boot time by caching expensive operations.
|
||||||
|
|
||||||
Bootsnap.setup(
|
Bootsnap.setup(
|
||||||
|
|
|
@ -38,7 +38,7 @@ Devise.setup do |config|
|
||||||
saml_options = options
|
saml_options = options
|
||||||
saml_options[:assertion_consumer_service_url] = ENV['SAML_ACS_URL'] if ENV['SAML_ACS_URL']
|
saml_options[:assertion_consumer_service_url] = ENV['SAML_ACS_URL'] if ENV['SAML_ACS_URL']
|
||||||
saml_options[:issuer] = ENV['SAML_ISSUER'] if ENV['SAML_ISSUER']
|
saml_options[:issuer] = ENV['SAML_ISSUER'] if ENV['SAML_ISSUER']
|
||||||
saml_options[:idp_sso_target_url] = ENV['SAML_IDP_SSO_TARGET_URL'] if ENV['SAML_IDP_SSO_TARGET_URL']
|
saml_options[:idp_sso_target_url] = ENV['SAML_IDP_SSO_TARGET_URL'] if ENV['SAML_IDP_SSO_TARGET_URL']
|
||||||
saml_options[:idp_sso_target_url_runtime_params] = ENV['SAML_IDP_SSO_TARGET_PARAMS'] if ENV['SAML_IDP_SSO_TARGET_PARAMS'] # FIXME: Should be parsable Hash
|
saml_options[:idp_sso_target_url_runtime_params] = ENV['SAML_IDP_SSO_TARGET_PARAMS'] if ENV['SAML_IDP_SSO_TARGET_PARAMS'] # FIXME: Should be parsable Hash
|
||||||
saml_options[:idp_cert] = ENV['SAML_IDP_CERT'] if ENV['SAML_IDP_CERT']
|
saml_options[:idp_cert] = ENV['SAML_IDP_CERT'] if ENV['SAML_IDP_CERT']
|
||||||
saml_options[:idp_cert_fingerprint] = ENV['SAML_IDP_CERT_FINGERPRINT'] if ENV['SAML_IDP_CERT_FINGERPRINT']
|
saml_options[:idp_cert_fingerprint] = ENV['SAML_IDP_CERT_FINGERPRINT'] if ENV['SAML_IDP_CERT_FINGERPRINT']
|
||||||
|
@ -62,5 +62,4 @@ Devise.setup do |config|
|
||||||
saml_options[:uid_attribute] = ENV['SAML_UID_ATTRIBUTE'] if ENV['SAML_UID_ATTRIBUTE']
|
saml_options[:uid_attribute] = ENV['SAML_UID_ATTRIBUTE'] if ENV['SAML_UID_ATTRIBUTE']
|
||||||
config.omniauth :saml, saml_options
|
config.omniauth :saml, saml_options
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,7 +7,7 @@ web_host = ENV.fetch('WEB_DOMAIN') { host }
|
||||||
alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' }
|
alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' }
|
||||||
|
|
||||||
Rails.application.configure do
|
Rails.application.configure do
|
||||||
https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
|
https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
|
||||||
|
|
||||||
config.x.local_domain = host
|
config.x.local_domain = host
|
||||||
config.x.web_domain = web_host
|
config.x.web_domain = web_host
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
module Twitter
|
module Twitter
|
||||||
class Regex
|
class Regex
|
||||||
|
|
||||||
REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}\(\)\?]/iou
|
REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}\(\)\?]/iou
|
||||||
REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*';:=\,\.\$%\[\]~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
|
REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*';:=\,\.\$%\[\]~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
|
||||||
REGEXEN[:valid_url_balanced_parens] = /
|
REGEXEN[:valid_url_balanced_parens] = /
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
Rails.application.configure do
|
Rails.application.configure do
|
||||||
|
|
||||||
# You can generate the keys using the following command (first is the private key, second is the public one)
|
# You can generate the keys using the following command (first is the private key, second is the public one)
|
||||||
# You should only generate this once per instance. If you later decide to change it, all push subscription will
|
# You should only generate this once per instance. If you later decide to change it, all push subscription will
|
||||||
# be invalidated, requiring the users to access the website again to resubscribe.
|
# be invalidated, requiring the users to access the website again to resubscribe.
|
||||||
|
|
|
@ -34,12 +34,12 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
|
||||||
# https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
|
# https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
|
||||||
#
|
#
|
||||||
# t.text :token, null: false
|
# t.text :token, null: false
|
||||||
t.string :token, null: false
|
t.string :token, null: false
|
||||||
|
|
||||||
t.string :refresh_token
|
t.string :refresh_token
|
||||||
t.integer :expires_in
|
t.integer :expires_in
|
||||||
t.datetime :revoked_at
|
t.datetime :revoked_at
|
||||||
t.datetime :created_at, null: false
|
t.datetime :created_at, null: false
|
||||||
t.string :scopes
|
t.string :scopes
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ end
|
||||||
class RailsSettingsMigration < MIGRATION_BASE_CLASS
|
class RailsSettingsMigration < MIGRATION_BASE_CLASS
|
||||||
def self.up
|
def self.up
|
||||||
create_table :settings do |t|
|
create_table :settings do |t|
|
||||||
t.string :var, :null => false
|
t.string :var, :null => false
|
||||||
t.text :value
|
t.text :value
|
||||||
t.references :target, :null => false, :polymorphic => true
|
t.references :target, :null => false, :polymorphic => true
|
||||||
t.timestamps :null => true
|
t.timestamps :null => true
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
class ChangeTagSearchIndexToBtree < ActiveRecord::Migration[5.1]
|
class ChangeTagSearchIndexToBtree < ActiveRecord::Migration[5.1]
|
||||||
|
|
||||||
def up
|
def up
|
||||||
remove_index :tags, name: :hashtag_search_index
|
remove_index :tags, name: :hashtag_search_index
|
||||||
execute 'CREATE INDEX hashtag_search_index ON tags (name text_pattern_ops);'
|
execute 'CREATE INDEX hashtag_search_index ON tags (name text_pattern_ops);'
|
||||||
|
|
|
@ -8,7 +8,7 @@ class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
|
||||||
def up
|
def up
|
||||||
add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
|
add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
remove_column :mutes, :hide_notifications
|
remove_column :mutes, :hide_notifications
|
||||||
end
|
end
|
||||||
|
|
|
@ -28,7 +28,7 @@ class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
|
||||||
|
|
||||||
-- So, first, we iterate over the user's feed to find any reblogs.
|
-- So, first, we iterate over the user's feed to find any reblogs.
|
||||||
local items = redis.call('zrange', timeline_key, 0, -1, 'withscores')
|
local items = redis.call('zrange', timeline_key, 0, -1, 'withscores')
|
||||||
|
|
||||||
for i = 1, #items, 2 do
|
for i = 1, #items, 2 do
|
||||||
local reblogged_id = items[i]
|
local reblogged_id = items[i]
|
||||||
local reblogging_id = items[i + 1]
|
local reblogging_id = items[i + 1]
|
||||||
|
|
|
@ -11,7 +11,7 @@ class AddReblogsToFollows < ActiveRecord::Migration[5.1]
|
||||||
add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
|
add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def down
|
def down
|
||||||
remove_column :follows, :show_reblogs
|
remove_column :follows, :show_reblogs
|
||||||
remove_column :follow_requests, :show_reblogs
|
remove_column :follow_requests, :show_reblogs
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 2018_08_20_232245) do
|
ActiveRecord::Schema.define(version: 2018_08_20_232245) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@ require 'rails_helper'
|
||||||
RSpec.describe AccountsController, type: :controller do
|
RSpec.describe AccountsController, type: :controller do
|
||||||
render_views
|
render_views
|
||||||
|
|
||||||
let(:alice) { Fabricate(:account, username: 'alice') }
|
let(:alice) { Fabricate(:account, username: 'alice') }
|
||||||
let(:eve) { Fabricate(:user) }
|
let(:eve) { Fabricate(:user) }
|
||||||
|
|
||||||
describe 'GET #show' do
|
describe 'GET #show' do
|
||||||
let!(:status1) { Status.create!(account: alice, text: 'Hello world') }
|
let!(:status1) { Status.create!(account: alice, text: 'Hello world') }
|
||||||
|
|
|
@ -75,7 +75,6 @@ RSpec.describe Admin::AccountsController, type: :controller do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe 'POST #subscribe' do
|
describe 'POST #subscribe' do
|
||||||
subject { post :subscribe, params: { id: account.id } }
|
subject { post :subscribe, params: { id: account.id } }
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ RSpec.describe Admin::EmailDomainBlocksController, type: :controller do
|
||||||
|
|
||||||
describe 'POST #create' do
|
describe 'POST #create' do
|
||||||
it 'blocks the domain when succeeded to save' do
|
it 'blocks the domain when succeeded to save' do
|
||||||
post :create, params: { email_domain_block: { domain: 'example.com'} }
|
post :create, params: { email_domain_block: { domain: 'example.com' } }
|
||||||
|
|
||||||
expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.created_msg')
|
expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.created_msg')
|
||||||
expect(response).to redirect_to(admin_email_domain_blocks_path)
|
expect(response).to redirect_to(admin_email_domain_blocks_path)
|
||||||
|
@ -50,7 +50,7 @@ RSpec.describe Admin::EmailDomainBlocksController, type: :controller do
|
||||||
describe 'DELETE #destroy' do
|
describe 'DELETE #destroy' do
|
||||||
it 'unblocks the domain' do
|
it 'unblocks the domain' do
|
||||||
email_domain_block = Fabricate(:email_domain_block)
|
email_domain_block = Fabricate(:email_domain_block)
|
||||||
delete :destroy, params: { id: email_domain_block.id }
|
delete :destroy, params: { id: email_domain_block.id }
|
||||||
|
|
||||||
expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.destroyed_msg')
|
expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.destroyed_msg')
|
||||||
expect(response).to redirect_to(admin_email_domain_blocks_path)
|
expect(response).to redirect_to(admin_email_domain_blocks_path)
|
||||||
|
|
|
@ -24,7 +24,7 @@ describe Admin::InvitesController do
|
||||||
subject { post :create, params: { invite: { max_uses: '10', expires_in: 1800 } } }
|
subject { post :create, params: { invite: { max_uses: '10', expires_in: 1800 } } }
|
||||||
|
|
||||||
it 'succeeds to create a invite' do
|
it 'succeeds to create a invite' do
|
||||||
expect{ subject }.to change { Invite.count }.by(1)
|
expect { subject }.to change { Invite.count }.by(1)
|
||||||
expect(subject).to redirect_to admin_invites_path
|
expect(subject).to redirect_to admin_invites_path
|
||||||
expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
|
expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
|
||||||
end
|
end
|
||||||
|
|
|
@ -15,7 +15,6 @@ describe Admin::ReportNotesController do
|
||||||
let(:report) { Fabricate(:report, action_taken: action_taken, action_taken_by_account_id: account_id) }
|
let(:report) { Fabricate(:report, action_taken: action_taken, action_taken_by_account_id: account_id) }
|
||||||
|
|
||||||
context 'when parameter is valid' do
|
context 'when parameter is valid' do
|
||||||
|
|
||||||
context 'when report is unsolved' do
|
context 'when report is unsolved' do
|
||||||
let(:action_taken) { false }
|
let(:action_taken) { false }
|
||||||
let(:account_id) { nil }
|
let(:account_id) { nil }
|
||||||
|
@ -24,7 +23,7 @@ describe Admin::ReportNotesController do
|
||||||
let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_resolve: nil } }
|
let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_resolve: nil } }
|
||||||
|
|
||||||
it 'creates a report note and resolves report' do
|
it 'creates a report note and resolves report' do
|
||||||
expect{ subject }.to change{ ReportNote.count }.by(1)
|
expect { subject }.to change { ReportNote.count }.by(1)
|
||||||
expect(report.reload).to be_action_taken
|
expect(report.reload).to be_action_taken
|
||||||
expect(subject).to redirect_to admin_reports_path
|
expect(subject).to redirect_to admin_reports_path
|
||||||
end
|
end
|
||||||
|
@ -34,7 +33,7 @@ describe Admin::ReportNotesController do
|
||||||
let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
|
let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
|
||||||
|
|
||||||
it 'creates a report note and does not resolve report' do
|
it 'creates a report note and does not resolve report' do
|
||||||
expect{ subject }.to change{ ReportNote.count }.by(1)
|
expect { subject }.to change { ReportNote.count }.by(1)
|
||||||
expect(report.reload).not_to be_action_taken
|
expect(report.reload).not_to be_action_taken
|
||||||
expect(subject).to redirect_to admin_report_path(report)
|
expect(subject).to redirect_to admin_report_path(report)
|
||||||
end
|
end
|
||||||
|
@ -49,7 +48,7 @@ describe Admin::ReportNotesController do
|
||||||
let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_unresolve: nil } }
|
let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_unresolve: nil } }
|
||||||
|
|
||||||
it 'creates a report note and unresolves report' do
|
it 'creates a report note and unresolves report' do
|
||||||
expect{ subject }.to change{ ReportNote.count }.by(1)
|
expect { subject }.to change { ReportNote.count }.by(1)
|
||||||
expect(report.reload).not_to be_action_taken
|
expect(report.reload).not_to be_action_taken
|
||||||
expect(subject).to redirect_to admin_report_path(report)
|
expect(subject).to redirect_to admin_report_path(report)
|
||||||
end
|
end
|
||||||
|
@ -59,7 +58,7 @@ describe Admin::ReportNotesController do
|
||||||
let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
|
let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
|
||||||
|
|
||||||
it 'creates a report note and does not unresolve report' do
|
it 'creates a report note and does not unresolve report' do
|
||||||
expect{ subject }.to change{ ReportNote.count }.by(1)
|
expect { subject }.to change { ReportNote.count }.by(1)
|
||||||
expect(report.reload).to be_action_taken
|
expect(report.reload).to be_action_taken
|
||||||
expect(subject).to redirect_to admin_report_path(report)
|
expect(subject).to redirect_to admin_report_path(report)
|
||||||
end
|
end
|
||||||
|
@ -84,7 +83,7 @@ describe Admin::ReportNotesController do
|
||||||
let!(:report_note) { Fabricate(:report_note) }
|
let!(:report_note) { Fabricate(:report_note) }
|
||||||
|
|
||||||
it 'deletes note' do
|
it 'deletes note' do
|
||||||
expect{ subject }.to change{ ReportNote.count }.by(-1)
|
expect { subject }.to change { ReportNote.count }.by(-1)
|
||||||
expect(subject).to redirect_to admin_report_path(report_note.report)
|
expect(subject).to redirect_to admin_report_path(report_note.report)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,7 +13,7 @@ describe Admin::ReportedStatusesController do
|
||||||
|
|
||||||
describe 'POST #create' do
|
describe 'POST #create' do
|
||||||
subject do
|
subject do
|
||||||
-> { post :create, params: { :report_id => report, action => '', :form_status_batch => { status_ids: status_ids } } }
|
-> { post :create, params: { :report_id => report, action => '', :form_status_batch => { status_ids: status_ids } } }
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:action) { 'nsfw_on' }
|
let(:action) { 'nsfw_on' }
|
||||||
|
|
|
@ -154,7 +154,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
|
||||||
|
|
||||||
before do
|
before do
|
||||||
user.account.follow!(other_account)
|
user.account.follow!(other_account)
|
||||||
post :mute, params: {id: other_account.id }
|
post :mute, params: { id: other_account.id }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns http success' do
|
it 'returns http success' do
|
||||||
|
@ -182,7 +182,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
|
||||||
|
|
||||||
before do
|
before do
|
||||||
user.account.follow!(other_account)
|
user.account.follow!(other_account)
|
||||||
post :mute, params: {id: other_account.id, notifications: false }
|
post :mute, params: { id: other_account.id, notifications: false }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns http success' do
|
it 'returns http success' do
|
||||||
|
|
|
@ -25,7 +25,6 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :control
|
||||||
expect(response.headers['Link'].links.size).to eq(2)
|
expect(response.headers['Link'].links.size).to eq(2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'without an oauth token' do
|
context 'without an oauth token' do
|
||||||
|
|
|
@ -31,7 +31,7 @@ describe Api::V1::StreamingController do
|
||||||
|
|
||||||
describe 'GET #index' do
|
describe 'GET #index' do
|
||||||
it 'redirects to streaming host' 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)
|
expect(response).to have_http_status(301)
|
||||||
request_uri = URI.parse(request.url)
|
request_uri = URI.parse(request.url)
|
||||||
redirect_to_uri = URI.parse(response.location)
|
redirect_to_uri = URI.parse(response.location)
|
||||||
|
@ -42,5 +42,4 @@ describe Api::V1::StreamingController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,7 +5,7 @@ require 'rails_helper'
|
||||||
describe Api::V1::Timelines::HomeController do
|
describe Api::V1::Timelines::HomeController do
|
||||||
render_views
|
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
|
before do
|
||||||
allow(controller).to receive(:doorkeeper_token) { token }
|
allow(controller).to receive(:doorkeeper_token) { token }
|
||||||
|
|
|
@ -5,7 +5,7 @@ require 'rails_helper'
|
||||||
describe Api::V1::Timelines::PublicController do
|
describe Api::V1::Timelines::PublicController do
|
||||||
render_views
|
render_views
|
||||||
|
|
||||||
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
allow(controller).to receive(:doorkeeper_token) { token }
|
allow(controller).to receive(:doorkeeper_token) { token }
|
||||||
|
|
|
@ -14,7 +14,7 @@ describe Api::Web::EmbedsController do
|
||||||
|
|
||||||
context 'when successfully finds status' do
|
context 'when successfully finds status' do
|
||||||
let(:status) { Fabricate(:status) }
|
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
|
it 'returns a right response' do
|
||||||
expect(response).to have_http_status :ok
|
expect(response).to have_http_status :ok
|
||||||
|
|
|
@ -94,7 +94,7 @@ describe ApplicationController, type: :controller do
|
||||||
|
|
||||||
describe 'helper_method :current_theme' do
|
describe 'helper_method :current_theme' do
|
||||||
it 'returns "default" when theme wasn\'t changed in admin settings' do
|
it 'returns "default" when theme wasn\'t changed in admin settings' do
|
||||||
allow(Setting).to receive(:default_settings).and_return({'theme' => 'default'})
|
allow(Setting).to receive(:default_settings).and_return({ 'theme' => 'default' })
|
||||||
|
|
||||||
expect(controller.view_context.current_theme).to eq 'default'
|
expect(controller.view_context.current_theme).to eq 'default'
|
||||||
end
|
end
|
||||||
|
@ -197,7 +197,7 @@ describe ApplicationController, type: :controller do
|
||||||
describe 'raise_not_found' do
|
describe 'raise_not_found' do
|
||||||
it 'raises error' do
|
it 'raises error' do
|
||||||
controller.params[:unmatched_route] = 'unmatched'
|
controller.params[:unmatched_route] = 'unmatched'
|
||||||
expect{ controller.raise_not_found }.to raise_error(ActionController::RoutingError, 'No route matches unmatched')
|
expect { controller.raise_not_found }.to raise_error(ActionController::RoutingError, 'No route matches unmatched')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ describe Auth::ConfirmationsController, type: :controller do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PATCH #finish_signup' do
|
describe 'PATCH #finish_signup' do
|
||||||
subject { patch :finish_signup, params: { user: { email: email }} }
|
subject { patch :finish_signup, params: { user: { email: email } } }
|
||||||
|
|
||||||
let(:user) { Fabricate(:user) }
|
let(:user) { Fabricate(:user) }
|
||||||
before do
|
before do
|
||||||
|
|
|
@ -43,7 +43,7 @@ describe InvitesController do
|
||||||
let(:user) { Fabricate(:user, moderator: false, admin: true) }
|
let(:user) { Fabricate(:user, moderator: false, admin: true) }
|
||||||
|
|
||||||
it 'succeeds to create a invite' do
|
it 'succeeds to create a invite' do
|
||||||
expect{ subject }.to change { Invite.count }.by(1)
|
expect { subject }.to change { Invite.count }.by(1)
|
||||||
expect(subject).to redirect_to invites_path
|
expect(subject).to redirect_to invites_path
|
||||||
expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
|
expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,11 +14,11 @@ describe RemoteUnfollowsController do
|
||||||
before do
|
before do
|
||||||
sign_in current_user
|
sign_in current_user
|
||||||
current_account.follow!(remote_account)
|
current_account.follow!(remote_account)
|
||||||
stub_request(:post, 'http://example.com/inbox'){ { status: 200 } }
|
stub_request(:post, 'http://example.com/inbox') { { status: 200 } }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when successfully unfollow remote account' do
|
context 'when successfully unfollow remote account' do
|
||||||
let(:acct) {"acct:#{ remote_account.username }@#{ remote_account.domain }"}
|
let(:acct) { "acct:#{remote_account.username}@#{remote_account.domain}" }
|
||||||
|
|
||||||
it do
|
it do
|
||||||
is_expected.to render_template :success
|
is_expected.to render_template :success
|
||||||
|
@ -27,7 +27,7 @@ describe RemoteUnfollowsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when fails to unfollow remote account' do
|
context 'when fails to unfollow remote account' do
|
||||||
let(:acct) {"acct:#{ remote_account.username + '_test' }@#{ remote_account.domain }"}
|
let(:acct) { "acct:#{remote_account.username + '_test'}@#{remote_account.domain}" }
|
||||||
|
|
||||||
it do
|
it do
|
||||||
is_expected.to render_template :error
|
is_expected.to render_template :error
|
||||||
|
|
|
@ -21,7 +21,6 @@ describe Settings::ApplicationsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe 'GET #show' do
|
describe 'GET #show' do
|
||||||
it 'returns http success' do
|
it 'returns http success' do
|
||||||
get :show, params: { id: app.id }
|
get :show, params: { id: app.id }
|
||||||
|
|
|
@ -10,7 +10,6 @@ describe Settings::MigrationsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET #show' do
|
describe 'GET #show' do
|
||||||
|
|
||||||
context 'when user is not sign in' do
|
context 'when user is not sign in' do
|
||||||
subject { get :show }
|
subject { get :show }
|
||||||
|
|
||||||
|
@ -45,7 +44,6 @@ describe Settings::MigrationsController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PUT #update' do
|
describe 'PUT #update' do
|
||||||
|
|
||||||
context 'when user is not sign in' do
|
context 'when user is not sign in' do
|
||||||
subject { put :update }
|
subject { put :update }
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
|
||||||
|
|
||||||
describe 'when form_two_factor_confirmation parameter is not provided' do
|
describe 'when form_two_factor_confirmation parameter is not provided' do
|
||||||
it 'raises ActionController::ParameterMissing' do
|
it 'raises ActionController::ParameterMissing' do
|
||||||
expect { post :create, params: { } }.to raise_error(ActionController::ParameterMissing)
|
expect { post :create, params: {} }.to raise_error(ActionController::ParameterMissing)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -6,5 +6,5 @@ Fabricator(:account) do
|
||||||
username { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } }
|
username { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } }
|
||||||
last_webfingered_at { Time.now.utc }
|
last_webfingered_at { Time.now.utc }
|
||||||
public_key { public_key }
|
public_key { public_key }
|
||||||
private_key { private_key}
|
private_key { private_key }
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Fabricator(:list) do
|
Fabricator(:list) do
|
||||||
account
|
account
|
||||||
title "MyString"
|
title "MyString"
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Fabricator(:relay) do
|
Fabricator(:relay) do
|
||||||
inbox_url "https://example.com/inbox"
|
inbox_url "https://example.com/inbox"
|
||||||
state :idle
|
state :idle
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
Fabricator(:site_upload) do
|
Fabricator(:site_upload) do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -393,7 +393,7 @@ RSpec.describe FeedManager do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'sends push updates' do
|
it 'sends push updates' do
|
||||||
status = Fabricate(:status)
|
status = Fabricate(:status)
|
||||||
|
|
||||||
FeedManager.instance.push_to_home(receiver, status)
|
FeedManager.instance.push_to_home(receiver, status)
|
||||||
|
|
||||||
|
|
|
@ -170,12 +170,11 @@ RSpec.describe Formatter do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe '#format_spoiler' do
|
describe '#format_spoiler' do
|
||||||
subject { Formatter.instance.format_spoiler(status) }
|
subject { Formatter.instance.format_spoiler(status) }
|
||||||
|
|
||||||
context 'given a post containing plain text' do
|
context 'given a post containing plain text' do
|
||||||
let(:status) { Fabricate(:status, text: 'text', spoiler_text: 'Secret!', uri: nil) }
|
let(:status) { Fabricate(:status, text: 'text', spoiler_text: 'Secret!', uri: nil) }
|
||||||
|
|
||||||
it 'Returns the spoiler text' do
|
it 'Returns the spoiler text' do
|
||||||
is_expected.to eq 'Secret!'
|
is_expected.to eq 'Secret!'
|
||||||
|
@ -184,7 +183,7 @@ RSpec.describe Formatter do
|
||||||
|
|
||||||
context 'given a post with an emoji shortcode at the start' do
|
context 'given a post with an emoji shortcode at the start' do
|
||||||
let!(:emoji) { Fabricate(:custom_emoji) }
|
let!(:emoji) { Fabricate(:custom_emoji) }
|
||||||
let(:status) { Fabricate(:status, text: 'text', spoiler_text: ':coolcat: Secret!', uri: nil) }
|
let(:status) { Fabricate(:status, text: 'text', spoiler_text: ':coolcat: Secret!', uri: nil) }
|
||||||
let(:text) { ':coolcat: Beep boop' }
|
let(:text) { ':coolcat: Beep boop' }
|
||||||
|
|
||||||
it 'converts the shortcode to an image tag' do
|
it 'converts the shortcode to an image tag' do
|
||||||
|
@ -207,7 +206,7 @@ RSpec.describe Formatter do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'given a post containing plain text' do
|
context 'given a post containing plain text' do
|
||||||
let(:status) { Fabricate(:status, text: 'text', uri: nil) }
|
let(:status) { Fabricate(:status, text: 'text', uri: nil) }
|
||||||
|
|
||||||
it 'paragraphizes the text' do
|
it 'paragraphizes the text' do
|
||||||
is_expected.to eq '<p>text</p>'
|
is_expected.to eq '<p>text</p>'
|
||||||
|
@ -215,7 +214,7 @@ RSpec.describe Formatter do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'given a post containing line feeds' do
|
context 'given a post containing line feeds' do
|
||||||
let(:status) { Fabricate(:status, text: "line\nfeed", uri: nil) }
|
let(:status) { Fabricate(:status, text: "line\nfeed", uri: nil) }
|
||||||
|
|
||||||
it 'removes line feeds' do
|
it 'removes line feeds' do
|
||||||
is_expected.not_to include "\n"
|
is_expected.not_to include "\n"
|
||||||
|
@ -367,7 +366,7 @@ RSpec.describe Formatter do
|
||||||
subject { Formatter.instance.plaintext(status) }
|
subject { Formatter.instance.plaintext(status) }
|
||||||
|
|
||||||
context 'given a post with local status' do
|
context 'given a post with local status' do
|
||||||
let(:status) { Fabricate(:status, text: '<p>a text by a nerd who uses an HTML tag in text</p>', uri: nil) }
|
let(:status) { Fabricate(:status, text: '<p>a text by a nerd who uses an HTML tag in text</p>', uri: nil) }
|
||||||
|
|
||||||
it 'returns the raw text' do
|
it 'returns the raw text' do
|
||||||
is_expected.to eq '<p>a text by a nerd who uses an HTML tag in text</p>'
|
is_expected.to eq '<p>a text by a nerd who uses an HTML tag in text</p>'
|
||||||
|
@ -375,7 +374,7 @@ RSpec.describe Formatter do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'given a post with remote status' do
|
context 'given a post with remote status' do
|
||||||
let(:status) { Fabricate(:status, account: remote_account, text: '<script>alert("Hello")</script>') }
|
let(:status) { Fabricate(:status, account: remote_account, text: '<script>alert("Hello")</script>') }
|
||||||
|
|
||||||
it 'returns tag-stripped text' do
|
it 'returns tag-stripped text' do
|
||||||
is_expected.to eq ''
|
is_expected.to eq ''
|
||||||
|
|
|
@ -90,7 +90,7 @@ describe LanguageDetector do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'uses nil when account is present but has no locale' do
|
it 'uses nil when account is present but has no locale' do
|
||||||
result = described_class.instance.detect('', account_without_user_locale)
|
result = described_class.instance.detect('', account_without_user_locale)
|
||||||
|
|
||||||
expect(result).to eq nil
|
expect(result).to eq nil
|
||||||
end
|
end
|
||||||
|
|
|
@ -880,7 +880,7 @@ RSpec.describe OStatus::AtomSerializer do
|
||||||
|
|
||||||
ProcessInteractionService.new.call(envelope, block.target_account)
|
ProcessInteractionService.new.call(envelope, block.target_account)
|
||||||
|
|
||||||
expect{ block.reload }.to raise_error ActiveRecord::RecordNotFound
|
expect { block.reload }.to raise_error ActiveRecord::RecordNotFound
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,7 @@ describe Request do
|
||||||
allow(Addrinfo).to receive(:foreach).with('example.com', nil, nil, :SOCK_STREAM)
|
allow(Addrinfo).to receive(:foreach).with('example.com', nil, nil, :SOCK_STREAM)
|
||||||
.and_yield(Addrinfo.new(["AF_INET", 0, "example.com", "0.0.0.0"], :PF_INET, :SOCK_STREAM))
|
.and_yield(Addrinfo.new(["AF_INET", 0, "example.com", "0.0.0.0"], :PF_INET, :SOCK_STREAM))
|
||||||
.and_yield(Addrinfo.new(["AF_INET6", 0, "example.com", "2001:db8::face"], :PF_INET6, :SOCK_STREAM))
|
.and_yield(Addrinfo.new(["AF_INET6", 0, "example.com", "2001:db8::face"], :PF_INET6, :SOCK_STREAM))
|
||||||
expect{ subject.perform }.to raise_error Mastodon::ValidationError
|
expect { subject.perform }.to raise_error Mastodon::ValidationError
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe AccountModerationNote, type: :model do
|
RSpec.describe AccountModerationNote, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Admin::ActionLog, type: :model do
|
RSpec.describe Admin::ActionLog, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Backup, type: :model do
|
RSpec.describe Backup, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe ConversationMute, type: :model do
|
RSpec.describe ConversationMute, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@ RSpec.describe CustomEmoji, type: :model do
|
||||||
describe '#search' do
|
describe '#search' do
|
||||||
let(:custom_emoji) { Fabricate(:custom_emoji, shortcode: shortcode) }
|
let(:custom_emoji) { Fabricate(:custom_emoji, shortcode: shortcode) }
|
||||||
|
|
||||||
subject { described_class.search(search_term) }
|
subject { described_class.search(search_term) }
|
||||||
|
|
||||||
context 'shortcode is exact' do
|
context 'shortcode is exact' do
|
||||||
let(:shortcode) { 'blobpats' }
|
let(:shortcode) { 'blobpats' }
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe CustomFilter, type: :model do
|
RSpec.describe CustomFilter, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe ListAccount, type: :model do
|
RSpec.describe ListAccount, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe List, type: :model do
|
RSpec.describe List, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -131,7 +131,7 @@ RSpec.describe MediaAttachment, type: :model do
|
||||||
expect(media.file.meta["original"]["aspect"]).to eq 1.5
|
expect(media.file.meta["original"]["aspect"]).to eq 1.5
|
||||||
expect(media.file.meta["small"]["width"]).to eq 490
|
expect(media.file.meta["small"]["width"]).to eq 490
|
||||||
expect(media.file.meta["small"]["height"]).to eq 327
|
expect(media.file.meta["small"]["height"]).to eq 327
|
||||||
expect(media.file.meta["small"]["aspect"]).to eq 490.0/327
|
expect(media.file.meta["small"]["aspect"]).to eq 490.0 / 327
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Mute, type: :model do
|
RSpec.describe Mute, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe PreviewCard, type: :model do
|
RSpec.describe PreviewCard, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -34,7 +34,7 @@ RSpec.describe RemoteFollow do
|
||||||
subject { remote_follow.valid? }
|
subject { remote_follow.valid? }
|
||||||
|
|
||||||
context 'attrs with acct' do
|
context 'attrs with acct' do
|
||||||
let(:attrs) { { acct: 'gargron@quitter.no' }}
|
let(:attrs) { { acct: 'gargron@quitter.no' } }
|
||||||
|
|
||||||
it do
|
it do
|
||||||
is_expected.to be true
|
is_expected.to be true
|
||||||
|
@ -42,7 +42,7 @@ RSpec.describe RemoteFollow do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'attrs without acct' do
|
context 'attrs without acct' do
|
||||||
let(:attrs) { { } }
|
let(:attrs) { {} }
|
||||||
|
|
||||||
it do
|
it do
|
||||||
is_expected.to be false
|
is_expected.to be false
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Web::Setting, type: :model do
|
RSpec.describe Web::Setting, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -34,7 +34,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'processes payload with actor if valid signature exists' do
|
it 'processes payload with actor if valid signature exists' do
|
||||||
payload['signature'] = {'type' => 'RsaSignature2017'}
|
payload['signature'] = { 'type' => 'RsaSignature2017' }
|
||||||
|
|
||||||
expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(actor)
|
expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(actor)
|
||||||
expect(ActivityPub::Activity).to receive(:factory).with(instance_of(Hash), actor, instance_of(Hash))
|
expect(ActivityPub::Activity).to receive(:factory).with(instance_of(Hash), actor, instance_of(Hash))
|
||||||
|
@ -43,7 +43,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not process payload if invalid signature exists' do
|
it 'does not process payload if invalid signature exists' do
|
||||||
payload['signature'] = {'type' => 'RsaSignature2017'}
|
payload['signature'] = { 'type' => 'RsaSignature2017' }
|
||||||
|
|
||||||
expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(nil)
|
expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(nil)
|
||||||
expect(ActivityPub::Activity).not_to receive(:factory)
|
expect(ActivityPub::Activity).not_to receive(:factory)
|
||||||
|
|
|
@ -57,7 +57,7 @@ RSpec.describe FetchAtomService, type: :service do
|
||||||
context 'content type is application/atom+xml' do
|
context 'content type is application/atom+xml' do
|
||||||
let(:content_type) { 'application/atom+xml' }
|
let(:content_type) { 'application/atom+xml' }
|
||||||
|
|
||||||
it { is_expected.to eq [url, {:prefetched_body=>""}, :ostatus] }
|
it { is_expected.to eq [url, { :prefetched_body => "" }, :ostatus] }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'content_type is json' do
|
context 'content_type is json' do
|
||||||
|
|
|
@ -50,7 +50,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
|
||||||
assign(:account, alice)
|
assign(:account, alice)
|
||||||
assign(:type, reply.stream_entry.activity_type.downcase)
|
assign(:type, reply.stream_entry.activity_type.downcase)
|
||||||
assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob) )
|
assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob) )
|
||||||
assign(:descendant_threads, [{ statuses: reply.stream_entry.activity.descendants(1)}])
|
assign(:descendant_threads, [{ statuses: reply.stream_entry.activity.descendants(1) }])
|
||||||
|
|
||||||
render
|
render
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue