mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 16:28:08 +01:00
Run rubocop formatting except line length (#23632)
This commit is contained in:
parent
593bb8ce99
commit
669f6d2c0a
71 changed files with 269 additions and 566 deletions
|
@ -1,6 +1,6 @@
|
||||||
# This configuration was generated by
|
# This configuration was generated by
|
||||||
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit`
|
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit`
|
||||||
# on 2023-02-16 04:55:24 UTC using RuboCop version 1.45.1.
|
# on 2023-02-16 05:53:07 UTC using RuboCop version 1.45.1.
|
||||||
# The point is for the user to remove these configuration records
|
# The point is for the user to remove these configuration records
|
||||||
# one by one as the offenses are removed from the code base.
|
# one by one as the offenses are removed from the code base.
|
||||||
# Note that changes in the inspected code, or installation of new
|
# Note that changes in the inspected code, or installation of new
|
||||||
|
@ -14,53 +14,6 @@ Bundler/OrderedGems:
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'Gemfile'
|
- 'Gemfile'
|
||||||
|
|
||||||
# Offense count: 5
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, IndentationWidth.
|
|
||||||
# SupportedStyles: with_first_argument, with_fixed_indentation
|
|
||||||
Layout/ArgumentAlignment:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
|
|
||||||
- 'spec/services/activitypub/process_collection_service_spec.rb'
|
|
||||||
- 'spec/services/activitypub/process_status_update_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyleAlignWith.
|
|
||||||
# SupportedStylesAlignWith: either, start_of_block, start_of_line
|
|
||||||
Layout/BlockAlignment:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/api/v1/accounts/credentials_controller_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
Layout/ClosingParenthesisIndentation:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/auth/sessions_controller_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AllowForAlignment.
|
|
||||||
Layout/CommentIndentation:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20180514130000_improve_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb'
|
|
||||||
|
|
||||||
# Offense count: 22
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: leading, trailing
|
|
||||||
Layout/DotPosition:
|
|
||||||
Exclude:
|
|
||||||
- 'lib/paperclip/attachment_extensions.rb'
|
|
||||||
- 'spec/routing/api_routing_spec.rb'
|
|
||||||
- 'spec/routing/well_known_routes_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
Layout/ElseAlignment:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20161006213403_rails_settings_migration.rb'
|
|
||||||
|
|
||||||
# Offense count: 81
|
# Offense count: 81
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
# This cop supports safe autocorrection (--autocorrect).
|
||||||
Layout/EmptyLineAfterGuardClause:
|
Layout/EmptyLineAfterGuardClause:
|
||||||
|
@ -183,73 +136,6 @@ Layout/EmptyLineAfterMagicComment:
|
||||||
- 'spec/controllers/api/v1/accounts/statuses_controller_spec.rb'
|
- 'spec/controllers/api/v1/accounts/statuses_controller_spec.rb'
|
||||||
- 'spec/models/tag_spec.rb'
|
- 'spec/models/tag_spec.rb'
|
||||||
|
|
||||||
# Offense count: 3
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
Layout/EmptyLines:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/authorize_interactions_controller_spec.rb'
|
|
||||||
- 'spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb'
|
|
||||||
- 'spec/lib/activitypub/activity/create_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 9
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: empty_lines, no_empty_lines
|
|
||||||
Layout/EmptyLinesAroundBlockBody:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/fabricators/system_key_fabricator.rb'
|
|
||||||
- 'spec/models/account_alias_spec.rb'
|
|
||||||
- 'spec/models/device_spec.rb'
|
|
||||||
- 'spec/models/encrypted_message_spec.rb'
|
|
||||||
- 'spec/models/login_activity_spec.rb'
|
|
||||||
- 'spec/models/one_time_key_spec.rb'
|
|
||||||
- 'spec/models/system_key_spec.rb'
|
|
||||||
- 'spec/services/bootstrap_timeline_service_spec.rb'
|
|
||||||
- 'spec/services/fetch_oembed_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyleAlignWith, Severity.
|
|
||||||
# SupportedStylesAlignWith: keyword, variable, start_of_line
|
|
||||||
Layout/EndAlignment:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20161006213403_rails_settings_migration.rb'
|
|
||||||
|
|
||||||
# Offense count: 19
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
|
|
||||||
Layout/ExtraSpacing:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/config/initializers/rack_attack_spec.rb'
|
|
||||||
- 'spec/controllers/api/v2/filters/statuses_controller_spec.rb'
|
|
||||||
- 'spec/fabricators/custom_filter_keyword_fabricator.rb'
|
|
||||||
- 'spec/fabricators/poll_vote_fabricator.rb'
|
|
||||||
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
|
|
||||||
- 'spec/services/activitypub/process_status_update_service_spec.rb'
|
|
||||||
- 'spec/services/import_service_spec.rb'
|
|
||||||
- 'spec/services/resolve_account_service_spec.rb'
|
|
||||||
- 'spec/services/resolve_url_service_spec.rb'
|
|
||||||
- 'spec/validators/note_length_validator_spec.rb'
|
|
||||||
- 'spec/validators/unreserved_username_validator_spec.rb'
|
|
||||||
- 'spec/workers/activitypub/move_distribution_worker_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 4
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, IndentationWidth.
|
|
||||||
# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
|
|
||||||
Layout/FirstArgumentIndentation:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/services/remove_status_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 4
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, IndentationWidth.
|
|
||||||
# SupportedStyles: special_inside_parentheses, consistent, align_brackets
|
|
||||||
Layout/FirstArrayElementIndentation:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/admin/dashboard_controller_spec.rb'
|
|
||||||
- 'spec/workers/activitypub/move_distribution_worker_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 113
|
# Offense count: 113
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
# This cop supports safe autocorrection (--autocorrect).
|
||||||
# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
|
# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
|
||||||
|
@ -276,49 +162,6 @@ Layout/HashAlignment:
|
||||||
- 'spec/models/admin/account_action_spec.rb'
|
- 'spec/models/admin/account_action_spec.rb'
|
||||||
- 'spec/models/concerns/account_interactions_spec.rb'
|
- 'spec/models/concerns/account_interactions_spec.rb'
|
||||||
|
|
||||||
# Offense count: 3
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
Layout/HeredocIndentation:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/well_known/host_meta_controller_spec.rb'
|
|
||||||
- 'spec/lib/link_details_extractor_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 5
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: normal, indented_internal_methods
|
|
||||||
Layout/IndentationConsistency:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb'
|
|
||||||
- 'spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb'
|
|
||||||
- 'spec/models/trends/statuses_spec.rb'
|
|
||||||
- 'spec/services/import_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 4
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: Width, AllowedPatterns.
|
|
||||||
Layout/IndentationWidth:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20161006213403_rails_settings_migration.rb'
|
|
||||||
- 'spec/controllers/api/v1/accounts/credentials_controller_spec.rb'
|
|
||||||
- 'spec/services/account_statuses_cleanup_service_spec.rb'
|
|
||||||
- 'spec/services/import_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
|
|
||||||
Layout/LeadingCommentSpace:
|
|
||||||
Exclude:
|
|
||||||
- 'lib/paperclip/attachment_extensions.rb'
|
|
||||||
|
|
||||||
# Offense count: 2
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AutoCorrect, EnforcedStyle.
|
|
||||||
# SupportedStyles: space, no_space
|
|
||||||
Layout/LineContinuationSpacing:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/support/stories/profile_stories.rb'
|
|
||||||
|
|
||||||
# Offense count: 577
|
# Offense count: 577
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
# This cop supports safe autocorrection (--autocorrect).
|
||||||
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
|
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
|
||||||
|
@ -326,124 +169,6 @@ Layout/LineContinuationSpacing:
|
||||||
Layout/LineLength:
|
Layout/LineLength:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
# Offense count: 4
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: symmetrical, new_line, same_line
|
|
||||||
Layout/MultilineMethodCallBraceLayout:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
|
|
||||||
- 'spec/services/activitypub/process_status_update_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 3
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
|
|
||||||
# SupportedStylesForExponentOperator: space, no_space
|
|
||||||
Layout/SpaceAroundOperators:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/services/activitypub/fetch_remote_status_service_spec.rb'
|
|
||||||
- 'spec/validators/note_length_validator_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
|
|
||||||
# SupportedStyles: space, no_space
|
|
||||||
# SupportedStylesForEmptyBraces: space, no_space
|
|
||||||
Layout/SpaceBeforeBlockBraces:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/api/v1/reports_controller_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 3
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AllowForAlignment.
|
|
||||||
Layout/SpaceBeforeFirstArg:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/fabricators/custom_filter_keyword_fabricator.rb'
|
|
||||||
- 'spec/fabricators/poll_vote_fabricator.rb'
|
|
||||||
- 'spec/models/concerns/account_interactions_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 24
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
|
|
||||||
# SupportedStyles: space, no_space, compact
|
|
||||||
# SupportedStylesForEmptyBrackets: space, no_space
|
|
||||||
Layout/SpaceInsideArrayLiteralBrackets:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20161006213403_rails_settings_migration.rb'
|
|
||||||
- 'spec/controllers/settings/applications_controller_spec.rb'
|
|
||||||
- 'spec/lib/extractor_spec.rb'
|
|
||||||
- 'spec/models/export_spec.rb'
|
|
||||||
- 'spec/services/activitypub/process_account_service_spec.rb'
|
|
||||||
- 'spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 4
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
|
|
||||||
# SupportedStyles: space, no_space
|
|
||||||
# SupportedStylesForEmptyBraces: space, no_space
|
|
||||||
Layout/SpaceInsideBlockBraces:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/lib/fast_ip_map_spec.rb'
|
|
||||||
- 'spec/models/user_role_spec.rb'
|
|
||||||
- 'spec/serializers/rest/account_serializer_spec.rb'
|
|
||||||
- 'spec/workers/activitypub/distribution_worker_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 6
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
|
|
||||||
# SupportedStyles: space, no_space, compact
|
|
||||||
# SupportedStylesForEmptyBraces: space, no_space
|
|
||||||
Layout/SpaceInsideHashLiteralBraces:
|
|
||||||
Exclude:
|
|
||||||
- 'app/lib/activitypub/activity/create.rb'
|
|
||||||
- 'app/services/activitypub/fetch_replies_service.rb'
|
|
||||||
- 'spec/services/activitypub/process_collection_service_spec.rb'
|
|
||||||
- 'spec/services/update_status_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: space, compact, no_space
|
|
||||||
Layout/SpaceInsideParens:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/validators/unreserved_username_validator_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 4
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: space, no_space
|
|
||||||
Layout/SpaceInsideStringInterpolation:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/controllers/auth/sessions_controller_spec.rb'
|
|
||||||
- 'spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb'
|
|
||||||
- 'spec/services/activitypub/process_account_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 8
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyle.
|
|
||||||
# SupportedStyles: final_newline, final_blank_line
|
|
||||||
Layout/TrailingEmptyLines:
|
|
||||||
Exclude:
|
|
||||||
- 'db/migrate/20190306145741_add_lock_version_to_polls.rb'
|
|
||||||
- 'db/migrate/20190807135426_add_comments_to_domain_blocks.rb'
|
|
||||||
- 'db/migrate/20200312162302_add_status_ids_to_announcements.rb'
|
|
||||||
- 'db/migrate/20200510181721_remove_duplicated_indexes_pghero.rb'
|
|
||||||
- 'db/migrate/20200628133322_create_account_notes.rb'
|
|
||||||
- 'db/migrate/20210722120340_create_account_statuses_cleanup_policies.rb'
|
|
||||||
- 'spec/fabricators/ip_block_fabricator.rb'
|
|
||||||
- 'spec/fabricators/status_edit_fabricator.rb'
|
|
||||||
|
|
||||||
# Offense count: 7
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: AllowInHeredoc.
|
|
||||||
Layout/TrailingWhitespace:
|
|
||||||
Exclude:
|
|
||||||
- 'app/models/concerns/expireable.rb'
|
|
||||||
- 'db/post_migrate/20220729171123_fix_custom_filter_keywords_id_seq.rb'
|
|
||||||
- 'lib/tasks/mastodon.rake'
|
|
||||||
- 'spec/models/account/field_spec.rb'
|
|
||||||
- 'spec/services/remove_from_follwers_service_spec.rb'
|
|
||||||
|
|
||||||
# Offense count: 14
|
# Offense count: 14
|
||||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
||||||
Lint/AmbiguousBlockAssociation:
|
Lint/AmbiguousBlockAssociation:
|
||||||
|
|
|
@ -21,4 +21,3 @@ class AddLockVersionToPolls < ActiveRecord::Migration[5.2]
|
||||||
remove_column :polls, :lock_version
|
remove_column :polls, :lock_version
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,3 @@ class AddCommentsToDomainBlocks < ActiveRecord::Migration[5.2]
|
||||||
add_column :domain_blocks, :public_comment, :text
|
add_column :domain_blocks, :public_comment, :text
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,3 @@ class AddStatusIdsToAnnouncements < ActiveRecord::Migration[5.2]
|
||||||
add_column :announcements, :status_ids, :bigint, array: true
|
add_column :announcements, :status_ids, :bigint, array: true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -19,4 +19,3 @@ class RemoveDuplicatedIndexesPghero < ActiveRecord::Migration[5.2]
|
||||||
add_index :markers, :user_id, name: :index_markers_on_user_id unless index_exists?(:markers, :user_id, name: :index_markers_on_user_id)
|
add_index :markers, :user_id, name: :index_markers_on_user_id unless index_exists?(:markers, :user_id, name: :index_markers_on_user_id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,4 +10,3 @@ class CreateAccountNotes < ActiveRecord::Migration[5.2]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -17,4 +17,3 @@ class CreateAccountStatusesCleanupPolicies < ActiveRecord::Migration[6.1]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -16,16 +16,16 @@ module Paperclip
|
||||||
# if we're processing the original, close + unlink the source tempfile
|
# if we're processing the original, close + unlink the source tempfile
|
||||||
intermediate_files << original if name == :original
|
intermediate_files << original if name == :original
|
||||||
|
|
||||||
@queued_for_write[name] = style.processors.
|
@queued_for_write[name] = style.processors
|
||||||
inject(original) do |file, processor|
|
.inject(original) do |file, processor|
|
||||||
file = Paperclip.processor(processor).make(file, style.processor_options, self)
|
file = Paperclip.processor(processor).make(file, style.processor_options, self)
|
||||||
intermediate_files << file unless file == original
|
intermediate_files << file unless file == original
|
||||||
file
|
file
|
||||||
end
|
end
|
||||||
|
|
||||||
unadapted_file = @queued_for_write[name]
|
unadapted_file = @queued_for_write[name]
|
||||||
@queued_for_write[name] = Paperclip.io_adapters.
|
@queued_for_write[name] = Paperclip.io_adapters
|
||||||
for(@queued_for_write[name], @options[:adapter_options])
|
.for(@queued_for_write[name], @options[:adapter_options])
|
||||||
unadapted_file.close if unadapted_file.respond_to?(:close)
|
unadapted_file.close if unadapted_file.respond_to?(:close)
|
||||||
@queued_for_write[name]
|
@queued_for_write[name]
|
||||||
rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
|
rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
|
||||||
|
|
|
@ -99,7 +99,6 @@ describe AuthorizeInteractionsController do
|
||||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||||
allow(service).to receive(:call).with('user@hostname').and_return(target_account)
|
allow(service).to receive(:call).with('user@hostname').and_return(target_account)
|
||||||
|
|
||||||
|
|
||||||
post :create, params: { acct: 'acct:user@hostname' }
|
post :create, params: { acct: 'acct:user@hostname' }
|
||||||
|
|
||||||
expect(account.following?(target_account)).to be true
|
expect(account.following?(target_account)).to be true
|
||||||
|
|
|
@ -5,7 +5,6 @@ require 'rails_helper'
|
||||||
describe Settings::TwoFactorAuthentication::ConfirmationsController do
|
describe Settings::TwoFactorAuthentication::ConfirmationsController do
|
||||||
render_views
|
render_views
|
||||||
|
|
||||||
|
|
||||||
shared_examples 'renders :new' do
|
shared_examples 'renders :new' do
|
||||||
it 'renders the new view' do
|
it 'renders the new view' do
|
||||||
subject
|
subject
|
||||||
|
|
|
@ -9,7 +9,7 @@ describe WellKnown::HostMetaController, type: :controller do
|
||||||
|
|
||||||
expect(response).to have_http_status(200)
|
expect(response).to have_http_status(200)
|
||||||
expect(response.media_type).to eq 'application/xrd+xml'
|
expect(response.media_type).to eq 'application/xrd+xml'
|
||||||
expect(response.body).to eq <<XML
|
expect(response.body).to eq <<~XML
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
|
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
|
||||||
<Link rel="lrdd" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
|
<Link rel="lrdd" template="https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}"/>
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
Fabricator(:system_key) do
|
Fabricator(:system_key) do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -408,7 +408,6 @@ RSpec.describe ActivityPub::Activity::Create do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
context 'with media attachments with long description' do
|
context 'with media attachments with long description' do
|
||||||
let(:object_json) do
|
let(:object_json) do
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,7 +39,7 @@ RSpec.describe LinkDetailsExtractor do
|
||||||
let(:original_url) { 'https://example.com/page.html' }
|
let(:original_url) { 'https://example.com/page.html' }
|
||||||
|
|
||||||
context 'and is wrapped in CDATA tags' do
|
context 'and is wrapped in CDATA tags' do
|
||||||
let(:html) { <<-HTML }
|
let(:html) { <<~HTML }
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
@ -78,7 +78,7 @@ RSpec.describe LinkDetailsExtractor do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'but the first tag is invalid JSON' do
|
context 'but the first tag is invalid JSON' do
|
||||||
let(:html) { <<-HTML }
|
let(:html) { <<~HTML }
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<body>
|
<body>
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe AccountAlias, type: :model do
|
RSpec.describe AccountAlias, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -24,8 +24,7 @@ RSpec.describe AccountStatusesCleanupPolicy, type: :model do
|
||||||
keep_self_fav: true,
|
keep_self_fav: true,
|
||||||
keep_self_bookmark: true,
|
keep_self_bookmark: true,
|
||||||
min_favs: 1,
|
min_favs: 1,
|
||||||
min_reblogs: 1
|
min_reblogs: 1)
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
@ -104,8 +103,7 @@ RSpec.describe AccountStatusesCleanupPolicy, type: :model do
|
||||||
keep_self_fav: false,
|
keep_self_fav: false,
|
||||||
keep_self_bookmark: false,
|
keep_self_bookmark: false,
|
||||||
min_favs: nil,
|
min_favs: nil,
|
||||||
min_reblogs: nil
|
min_reblogs: nil)
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not unnecessarily invalidate last_inspected' do
|
it 'does not unnecessarily invalidate last_inspected' do
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Device, type: :model do
|
RSpec.describe Device, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe EncryptedMessage, type: :model do
|
RSpec.describe EncryptedMessage, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe LoginActivity, type: :model do
|
RSpec.describe LoginActivity, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe OneTimeKey, type: :model do
|
RSpec.describe OneTimeKey, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe SystemKey, type: :model do
|
RSpec.describe SystemKey, type: :model do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,99 +5,99 @@ require 'rails_helper'
|
||||||
describe 'API routes' do
|
describe 'API routes' do
|
||||||
describe 'Credentials routes' do
|
describe 'Credentials routes' do
|
||||||
it 'routes to verify credentials' do
|
it 'routes to verify credentials' do
|
||||||
expect(get('/api/v1/accounts/verify_credentials')).
|
expect(get('/api/v1/accounts/verify_credentials'))
|
||||||
to route_to('api/v1/accounts/credentials#show')
|
.to route_to('api/v1/accounts/credentials#show')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to update credentials' do
|
it 'routes to update credentials' do
|
||||||
expect(patch('/api/v1/accounts/update_credentials')).
|
expect(patch('/api/v1/accounts/update_credentials'))
|
||||||
to route_to('api/v1/accounts/credentials#update')
|
.to route_to('api/v1/accounts/credentials#update')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Account routes' do
|
describe 'Account routes' do
|
||||||
it 'routes to statuses' do
|
it 'routes to statuses' do
|
||||||
expect(get('/api/v1/accounts/user/statuses')).
|
expect(get('/api/v1/accounts/user/statuses'))
|
||||||
to route_to('api/v1/accounts/statuses#index', account_id: 'user')
|
.to route_to('api/v1/accounts/statuses#index', account_id: 'user')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to followers' do
|
it 'routes to followers' do
|
||||||
expect(get('/api/v1/accounts/user/followers')).
|
expect(get('/api/v1/accounts/user/followers'))
|
||||||
to route_to('api/v1/accounts/follower_accounts#index', account_id: 'user')
|
.to route_to('api/v1/accounts/follower_accounts#index', account_id: 'user')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to following' do
|
it 'routes to following' do
|
||||||
expect(get('/api/v1/accounts/user/following')).
|
expect(get('/api/v1/accounts/user/following'))
|
||||||
to route_to('api/v1/accounts/following_accounts#index', account_id: 'user')
|
.to route_to('api/v1/accounts/following_accounts#index', account_id: 'user')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to search' do
|
it 'routes to search' do
|
||||||
expect(get('/api/v1/accounts/search')).
|
expect(get('/api/v1/accounts/search'))
|
||||||
to route_to('api/v1/accounts/search#show')
|
.to route_to('api/v1/accounts/search#show')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to relationships' do
|
it 'routes to relationships' do
|
||||||
expect(get('/api/v1/accounts/relationships')).
|
expect(get('/api/v1/accounts/relationships'))
|
||||||
to route_to('api/v1/accounts/relationships#index')
|
.to route_to('api/v1/accounts/relationships#index')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Statuses routes' do
|
describe 'Statuses routes' do
|
||||||
it 'routes reblogged_by' do
|
it 'routes reblogged_by' do
|
||||||
expect(get('/api/v1/statuses/123/reblogged_by')).
|
expect(get('/api/v1/statuses/123/reblogged_by'))
|
||||||
to route_to('api/v1/statuses/reblogged_by_accounts#index', status_id: '123')
|
.to route_to('api/v1/statuses/reblogged_by_accounts#index', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes favourited_by' do
|
it 'routes favourited_by' do
|
||||||
expect(get('/api/v1/statuses/123/favourited_by')).
|
expect(get('/api/v1/statuses/123/favourited_by'))
|
||||||
to route_to('api/v1/statuses/favourited_by_accounts#index', status_id: '123')
|
.to route_to('api/v1/statuses/favourited_by_accounts#index', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes reblog' do
|
it 'routes reblog' do
|
||||||
expect(post('/api/v1/statuses/123/reblog')).
|
expect(post('/api/v1/statuses/123/reblog'))
|
||||||
to route_to('api/v1/statuses/reblogs#create', status_id: '123')
|
.to route_to('api/v1/statuses/reblogs#create', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes unreblog' do
|
it 'routes unreblog' do
|
||||||
expect(post('/api/v1/statuses/123/unreblog')).
|
expect(post('/api/v1/statuses/123/unreblog'))
|
||||||
to route_to('api/v1/statuses/reblogs#destroy', status_id: '123')
|
.to route_to('api/v1/statuses/reblogs#destroy', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes favourite' do
|
it 'routes favourite' do
|
||||||
expect(post('/api/v1/statuses/123/favourite')).
|
expect(post('/api/v1/statuses/123/favourite'))
|
||||||
to route_to('api/v1/statuses/favourites#create', status_id: '123')
|
.to route_to('api/v1/statuses/favourites#create', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes unfavourite' do
|
it 'routes unfavourite' do
|
||||||
expect(post('/api/v1/statuses/123/unfavourite')).
|
expect(post('/api/v1/statuses/123/unfavourite'))
|
||||||
to route_to('api/v1/statuses/favourites#destroy', status_id: '123')
|
.to route_to('api/v1/statuses/favourites#destroy', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes mute' do
|
it 'routes mute' do
|
||||||
expect(post('/api/v1/statuses/123/mute')).
|
expect(post('/api/v1/statuses/123/mute'))
|
||||||
to route_to('api/v1/statuses/mutes#create', status_id: '123')
|
.to route_to('api/v1/statuses/mutes#create', status_id: '123')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes unmute' do
|
it 'routes unmute' do
|
||||||
expect(post('/api/v1/statuses/123/unmute')).
|
expect(post('/api/v1/statuses/123/unmute'))
|
||||||
to route_to('api/v1/statuses/mutes#destroy', status_id: '123')
|
.to route_to('api/v1/statuses/mutes#destroy', status_id: '123')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Timeline routes' do
|
describe 'Timeline routes' do
|
||||||
it 'routes to home timeline' do
|
it 'routes to home timeline' do
|
||||||
expect(get('/api/v1/timelines/home')).
|
expect(get('/api/v1/timelines/home'))
|
||||||
to route_to('api/v1/timelines/home#show')
|
.to route_to('api/v1/timelines/home#show')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to public timeline' do
|
it 'routes to public timeline' do
|
||||||
expect(get('/api/v1/timelines/public')).
|
expect(get('/api/v1/timelines/public'))
|
||||||
to route_to('api/v1/timelines/public#show')
|
.to route_to('api/v1/timelines/public#show')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'routes to tag timeline' do
|
it 'routes to tag timeline' do
|
||||||
expect(get('/api/v1/timelines/tag/test')).
|
expect(get('/api/v1/timelines/tag/test'))
|
||||||
to route_to('api/v1/timelines/tag#show', id: 'test')
|
.to route_to('api/v1/timelines/tag#show', id: 'test')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,14 +2,14 @@ require 'rails_helper'
|
||||||
|
|
||||||
describe 'the host-meta route' do
|
describe 'the host-meta route' do
|
||||||
it 'routes to correct place with xml format' do
|
it 'routes to correct place with xml format' do
|
||||||
expect(get('/.well-known/host-meta')).
|
expect(get('/.well-known/host-meta'))
|
||||||
to route_to('well_known/host_meta#show', format: 'xml')
|
.to route_to('well_known/host_meta#show', format: 'xml')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'the webfinger route' do
|
describe 'the webfinger route' do
|
||||||
it 'routes to correct place with json format' do
|
it 'routes to correct place with json format' do
|
||||||
expect(get('/.well-known/webfinger')).
|
expect(get('/.well-known/webfinger'))
|
||||||
to route_to('well_known/webfinger#show')
|
.to route_to('well_known/webfinger#show')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -116,8 +116,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
|
||||||
multiple: false,
|
multiple: false,
|
||||||
hide_totals: false,
|
hide_totals: false,
|
||||||
expires_at: expiration
|
expires_at: expiration
|
||||||
}
|
})
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:payload) do
|
let(:payload) do
|
||||||
|
@ -168,8 +167,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService, type: :service do
|
||||||
multiple: false,
|
multiple: false,
|
||||||
hide_totals: false,
|
hide_totals: false,
|
||||||
expires_at: expiration
|
expires_at: expiration
|
||||||
}
|
})
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:payload) do
|
let(:payload) do
|
||||||
|
|
|
@ -32,6 +32,5 @@ RSpec.describe BootstrapTimelineService, type: :service do
|
||||||
expect(service).to_not have_received(:call)
|
expect(service).to_not have_received(:call)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -151,7 +151,6 @@ describe FetchOEmbedService, type: :service do
|
||||||
expect(subject.format).to eq :json
|
expect(subject.format).to eq :json
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when endpoint is cached' do
|
context 'when endpoint is cached' do
|
||||||
|
|
Loading…
Reference in a new issue