Fix most rubocop issues (#2165)
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues
This commit is contained in:
@@ -75,10 +75,10 @@ describe Api::V1::Accounts::CredentialsController do
|
||||
end
|
||||
end
|
||||
|
||||
describe 'with invalid data' do
|
||||
describe 'with a too long profile bio' do
|
||||
before do
|
||||
note = 'This is too long. '
|
||||
note = note + 'a' * (Account::MAX_NOTE_LENGTH - note.length + 1)
|
||||
note += 'a' * (Account::MAX_NOTE_LENGTH - note.length + 1)
|
||||
patch :update, params: { note: note }
|
||||
end
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Api::V1::Timelines::DirectController, type: :controller do
|
||||
RSpec.describe Api::V1::Timelines::DirectController do
|
||||
let(:user) { Fabricate(:user) }
|
||||
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
|
||||
|
||||
|
||||
@@ -75,8 +75,8 @@ describe ApplicationController, type: :controller do
|
||||
|
||||
describe 'helper_method :current_flavour' do
|
||||
it 'returns "glitch" when theme wasn\'t changed in admin settings' do
|
||||
allow(Setting).to receive(:default_settings).and_return({'skin' => 'default'})
|
||||
allow(Setting).to receive(:default_settings).and_return({'flavour' => 'glitch'})
|
||||
allow(Setting).to receive(:default_settings).and_return({ 'skin' => 'default' })
|
||||
allow(Setting).to receive(:default_settings).and_return({ 'flavour' => 'glitch' })
|
||||
|
||||
expect(controller.view_context.current_flavour).to eq 'glitch'
|
||||
end
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Settings::FlavoursController, type: :controller do
|
||||
RSpec.describe Settings::FlavoursController do
|
||||
let(:user) { Fabricate(:user) }
|
||||
|
||||
before do
|
||||
|
||||
Reference in New Issue
Block a user