Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor typos in comments and spec names #21831

Merged
merged 1 commit into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV DEBIAN_FRONTEND="noninteractive" \
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
RUN apt-get update && \
echo "Etc/UTC" > /etc/localtime && \
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/mastodon/utils/__tests__/html-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as html from '../html';

describe('html', () => {
describe('unsecapeHTML', () => {
describe('unescapeHTML', () => {
it('returns unescaped HTML', () => {
const output = html.unescapeHTML('<p>lorem</p><p>ipsum</p><br>&lt;br&gt;');
expect(output).toEqual('lorem\n\nipsum\n<br>');
Expand Down
2 changes: 1 addition & 1 deletion app/workers/post_process_media_worker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def perform(media_attachment_id)
media_attachment.processing = :in_progress
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
previous_meta = media_attachment.file_meta

Expand Down
2 changes: 1 addition & 1 deletion lib/mastodon/media_cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def self.exit_on_failure?
desc 'remove', 'Remove remote media files, headers or avatars'
long_desc <<-DESC
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.
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
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/tests.rake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace :tests do
end

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)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/admin/confirmations_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
end
end

describe 'POST #resernd' do
describe 'POST #resend' do
subject { post :resend, params: { account_id: user.account.id } }

let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/concerns/signature_verification_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def signature_required
end
end

context 'with request with unparseable Date header' do
context 'with request with unparsable Date header' do
before do
get :success

Expand Down
2 changes: 1 addition & 1 deletion spec/models/account_migration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
end
end

context 'with unresolveable account' do
context 'with unresolvable account' do
let(:target_acct) { 'target@remote' }

before do
Expand Down
2 changes: 1 addition & 1 deletion spec/models/account_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@
expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil
end

xit 'does not match URL querystring' do
xit 'does not match URL query string' do
expect(subject.match('https://example.com/?x=@alice')).to be_nil
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/models/user_settings/setting_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

describe '#key' do
context 'when there is no namespace' do
it 'returnsn a symbol' do
it 'returns a symbol' do
expect(subject.key).to eq :foo
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/services/activitypub/process_account_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
'@context': ['https://www.w3.org/ns/activitystreams'],
id: "https://foo.test/users/#{i}/featured",
type: 'OrderedCollection',
totelItems: 1,
totalItems: 1,
orderedItems: [status_json],
}.with_indifferent_access
webfinger = {
Expand Down