Fix minor typos in comments and spec names (#21831)
parent
9011b008c2
commit
c4f2b1e86a
|
@ -55,7 +55,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" \
|
ENV DEBIAN_FRONTEND="noninteractive" \
|
||||||
PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin"
|
PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin"
|
||||||
|
|
||||||
# Ignoreing these here since we don't want to pin any versions and the Debian image removes apt-get content after use
|
# Ignoring these here since we don't want to pin any versions and the Debian image removes apt-get content after use
|
||||||
# hadolint ignore=DL3008,DL3009
|
# hadolint ignore=DL3008,DL3009
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
echo "Etc/UTC" > /etc/localtime && \
|
echo "Etc/UTC" > /etc/localtime && \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import * as html from '../html';
|
import * as html from '../html';
|
||||||
|
|
||||||
describe('html', () => {
|
describe('html', () => {
|
||||||
describe('unsecapeHTML', () => {
|
describe('unescapeHTML', () => {
|
||||||
it('returns unescaped HTML', () => {
|
it('returns unescaped HTML', () => {
|
||||||
const output = html.unescapeHTML('<p>lorem</p><p>ipsum</p><br><br>');
|
const output = html.unescapeHTML('<p>lorem</p><p>ipsum</p><br><br>');
|
||||||
expect(output).toEqual('lorem\n\nipsum\n<br>');
|
expect(output).toEqual('lorem\n\nipsum\n<br>');
|
||||||
|
|
|
@ -24,7 +24,7 @@ class PostProcessMediaWorker
|
||||||
media_attachment.processing = :in_progress
|
media_attachment.processing = :in_progress
|
||||||
media_attachment.save
|
media_attachment.save
|
||||||
|
|
||||||
# Because paperclip-av-transcover overwrites this attribute
|
# Because paperclip-av-transcoder overwrites this attribute
|
||||||
# we will save it here and restore it after reprocess is done
|
# we will save it here and restore it after reprocess is done
|
||||||
previous_meta = media_attachment.file_meta
|
previous_meta = media_attachment.file_meta
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ module Mastodon
|
||||||
desc 'remove', 'Remove remote media files, headers or avatars'
|
desc 'remove', 'Remove remote media files, headers or avatars'
|
||||||
long_desc <<-DESC
|
long_desc <<-DESC
|
||||||
Removes locally cached copies of media attachments (and optionally profile
|
Removes locally cached copies of media attachments (and optionally profile
|
||||||
headers and avatars) from other servers. By default, only media attachements
|
headers and avatars) from other servers. By default, only media attachments
|
||||||
are removed.
|
are removed.
|
||||||
The --days option specifies how old media attachments have to be before
|
The --days option specifies how old media attachments have to be before
|
||||||
they are removed. In case of avatars and headers, it specifies how old
|
they are removed. In case of avatars and headers, it specifies how old
|
||||||
|
|
|
@ -25,7 +25,7 @@ namespace :tests do
|
||||||
end
|
end
|
||||||
|
|
||||||
if Account.where(domain: Rails.configuration.x.local_domain).exists?
|
if Account.where(domain: Rails.configuration.x.local_domain).exists?
|
||||||
puts 'Faux remote accounts not properly claned up'
|
puts 'Faux remote accounts not properly cleaned up'
|
||||||
exit(1)
|
exit(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ RSpec.describe Admin::ConfirmationsController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'POST #resernd' do
|
describe 'POST #resend' do
|
||||||
subject { post :resend, params: { account_id: user.account.id } }
|
subject { post :resend, params: { account_id: user.account.id } }
|
||||||
|
|
||||||
let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
|
let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
|
||||||
|
|
|
@ -129,7 +129,7 @@ describe ApplicationController do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with request with unparseable Date header' do
|
context 'with request with unparsable Date header' do
|
||||||
before do
|
before do
|
||||||
get :success
|
get :success
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ RSpec.describe AccountMigration do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with unresolveable account' do
|
context 'with unresolvable account' do
|
||||||
let(:target_acct) { 'target@remote' }
|
let(:target_acct) { 'target@remote' }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
|
|
@ -90,7 +90,7 @@ RSpec.describe UserSettings::Setting do
|
||||||
|
|
||||||
describe '#key' do
|
describe '#key' do
|
||||||
context 'when there is no namespace' do
|
context 'when there is no namespace' do
|
||||||
it 'returnsn a symbol' do
|
it 'returns a symbol' do
|
||||||
expect(subject.key).to eq :foo
|
expect(subject.key).to eq :foo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -181,7 +181,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
|
||||||
'@context': ['https://www.w3.org/ns/activitystreams'],
|
'@context': ['https://www.w3.org/ns/activitystreams'],
|
||||||
id: "https://foo.test/users/#{i}/featured",
|
id: "https://foo.test/users/#{i}/featured",
|
||||||
type: 'OrderedCollection',
|
type: 'OrderedCollection',
|
||||||
totelItems: 1,
|
totalItems: 1,
|
||||||
orderedItems: [status_json],
|
orderedItems: [status_json],
|
||||||
}.with_indifferent_access
|
}.with_indifferent_access
|
||||||
webfinger = {
|
webfinger = {
|
||||||
|
|
Loading…
Reference in New Issue