From c97b611b6bce3b0e2c6b53f4f680787a930e2a69 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 3 May 2023 23:49:53 -0400 Subject: [PATCH] Fix RSpec/InferredSpecType cop (#24736) --- .rubocop_todo.yml | 175 ------------------ spec/controllers/about_controller_spec.rb | 2 +- spec/controllers/accounts_controller_spec.rb | 2 +- .../collections_controller_spec.rb | 2 +- ...lowers_synchronizations_controller_spec.rb | 2 +- .../activitypub/inboxes_controller_spec.rb | 2 +- .../activitypub/outboxes_controller_spec.rb | 2 +- .../activitypub/replies_controller_spec.rb | 2 +- ...ccount_moderation_notes_controller_spec.rb | 2 +- .../admin/accounts_controller_spec.rb | 2 +- .../admin/action_logs_controller_spec.rb | 2 +- .../controllers/admin/base_controller_spec.rb | 2 +- .../admin/change_emails_controller_spec.rb | 2 +- .../admin/confirmations_controller_spec.rb | 2 +- .../admin/dashboard_controller_spec.rb | 2 +- .../admin/disputes/appeals_controller_spec.rb | 2 +- .../admin/domain_allows_controller_spec.rb | 2 +- .../admin/domain_blocks_controller_spec.rb | 2 +- .../email_domain_blocks_controller_spec.rb | 2 +- .../export_domain_allows_controller_spec.rb | 2 +- .../export_domain_blocks_controller_spec.rb | 2 +- .../admin/instances_controller_spec.rb | 2 +- .../settings/branding_controller_spec.rb | 2 +- .../controllers/admin/tags_controller_spec.rb | 2 +- .../controllers/api/oembed_controller_spec.rb | 2 +- .../api/v1/accounts/pins_controller_spec.rb | 2 +- .../api/v1/accounts/search_controller_spec.rb | 2 +- .../api/v1/accounts_controller_spec.rb | 2 +- .../admin/account_actions_controller_spec.rb | 2 +- .../api/v1/admin/accounts_controller_spec.rb | 2 +- .../v1/admin/domain_allows_controller_spec.rb | 2 +- .../v1/admin/domain_blocks_controller_spec.rb | 2 +- .../api/v1/admin/reports_controller_spec.rb | 2 +- .../reactions_controller_spec.rb | 2 +- .../api/v1/announcements_controller_spec.rb | 2 +- .../api/v1/apps_controller_spec.rb | 2 +- .../api/v1/blocks_controller_spec.rb | 2 +- .../api/v1/bookmarks_controller_spec.rb | 2 +- .../api/v1/conversations_controller_spec.rb | 2 +- .../api/v1/custom_emojis_controller_spec.rb | 2 +- .../api/v1/domain_blocks_controller_spec.rb | 2 +- .../emails/confirmations_controller_spec.rb | 2 +- .../api/v1/endorsements_controller_spec.rb | 2 +- .../api/v1/favourites_controller_spec.rb | 2 +- .../api/v1/filters_controller_spec.rb | 2 +- .../api/v1/follow_requests_controller_spec.rb | 2 +- .../api/v1/followed_tags_controller_spec.rb | 2 +- .../v1/instances/activity_controller_spec.rb | 2 +- .../api/v1/instances/peers_controller_spec.rb | 2 +- .../api/v1/instances_controller_spec.rb | 2 +- .../api/v1/lists_controller_spec.rb | 2 +- .../api/v1/markers_controller_spec.rb | 2 +- .../api/v1/media_controller_spec.rb | 2 +- .../api/v1/mutes_controller_spec.rb | 2 +- .../api/v1/notifications_controller_spec.rb | 2 +- .../api/v1/polls/votes_controller_spec.rb | 2 +- .../api/v1/polls_controller_spec.rb | 2 +- .../api/v1/reports_controller_spec.rb | 2 +- .../favourited_by_accounts_controller_spec.rb | 2 +- .../reblogged_by_accounts_controller_spec.rb | 2 +- .../api/v1/statuses_controller_spec.rb | 2 +- .../api/v1/suggestions_controller_spec.rb | 2 +- .../api/v1/tags_controller_spec.rb | 2 +- .../api/v1/trends/tags_controller_spec.rb | 2 +- .../api/v2/admin/accounts_controller_spec.rb | 2 +- .../v2/filters/keywords_controller_spec.rb | 2 +- .../v2/filters/statuses_controller_spec.rb | 2 +- .../api/v2/filters_controller_spec.rb | 2 +- .../api/v2/search_controller_spec.rb | 2 +- .../application_controller_spec.rb | 2 +- .../auth/challenges_controller_spec.rb | 2 +- .../auth/confirmations_controller_spec.rb | 2 +- .../auth/passwords_controller_spec.rb | 2 +- .../auth/registrations_controller_spec.rb | 2 +- .../auth/sessions_controller_spec.rb | 2 +- .../account_controller_concern_spec.rb | 2 +- .../concerns/cache_concern_spec.rb | 2 +- .../concerns/challengable_concern_spec.rb | 2 +- .../export_controller_concern_spec.rb | 2 +- spec/controllers/concerns/localized_spec.rb | 2 +- .../concerns/signature_verification_spec.rb | 2 +- .../concerns/user_tracking_concern_spec.rb | 2 +- .../disputes/appeals_controller_spec.rb | 2 +- .../disputes/strikes_controller_spec.rb | 2 +- spec/controllers/home_controller_spec.rb | 2 +- .../instance_actors_controller_spec.rb | 2 +- spec/controllers/intents_controller_spec.rb | 2 +- .../oauth/authorizations_controller_spec.rb | 2 +- .../oauth/tokens_controller_spec.rb | 2 +- .../settings/imports_controller_spec.rb | 2 +- .../settings/profiles_controller_spec.rb | 2 +- .../statuses_cleanup_controller_spec.rb | 2 +- spec/controllers/tags_controller_spec.rb | 2 +- .../well_known/host_meta_controller_spec.rb | 2 +- .../well_known/nodeinfo_controller_spec.rb | 2 +- .../well_known/webfinger_controller_spec.rb | 2 +- spec/helpers/accounts_helper_spec.rb | 2 +- .../account_moderation_notes_helper_spec.rb | 2 +- spec/helpers/admin/action_logs_helper_spec.rb | 2 +- spec/helpers/flashes_helper_spec.rb | 2 +- spec/helpers/formatting_helper_spec.rb | 2 +- spec/helpers/home_helper_spec.rb | 2 +- spec/helpers/routing_helper_spec.rb | 2 +- spec/mailers/admin_mailer_spec.rb | 2 +- spec/mailers/notification_mailer_spec.rb | 2 +- spec/mailers/user_mailer_spec.rb | 2 +- spec/models/account/field_spec.rb | 2 +- spec/models/account_alias_spec.rb | 2 +- spec/models/account_conversation_spec.rb | 2 +- spec/models/account_deletion_request_spec.rb | 2 +- spec/models/account_domain_block_spec.rb | 2 +- spec/models/account_migration_spec.rb | 2 +- spec/models/account_moderation_note_spec.rb | 2 +- spec/models/account_spec.rb | 2 +- .../account_statuses_cleanup_policy_spec.rb | 2 +- spec/models/admin/account_action_spec.rb | 2 +- spec/models/admin/action_log_spec.rb | 2 +- spec/models/announcement_mute_spec.rb | 2 +- spec/models/announcement_reaction_spec.rb | 2 +- spec/models/announcement_spec.rb | 2 +- spec/models/backup_spec.rb | 2 +- spec/models/block_spec.rb | 2 +- spec/models/canonical_email_block_spec.rb | 2 +- spec/models/conversation_mute_spec.rb | 2 +- spec/models/conversation_spec.rb | 2 +- spec/models/custom_emoji_spec.rb | 2 +- spec/models/custom_filter_keyword_spec.rb | 2 +- spec/models/custom_filter_spec.rb | 2 +- spec/models/device_spec.rb | 2 +- spec/models/domain_block_spec.rb | 2 +- spec/models/email_domain_block_spec.rb | 2 +- spec/models/encrypted_message_spec.rb | 2 +- spec/models/favourite_spec.rb | 2 +- spec/models/featured_tag_spec.rb | 2 +- .../follow_recommendation_suppression_spec.rb | 2 +- spec/models/follow_request_spec.rb | 2 +- spec/models/follow_spec.rb | 2 +- spec/models/home_feed_spec.rb | 2 +- spec/models/identity_spec.rb | 2 +- spec/models/import_spec.rb | 2 +- spec/models/invite_spec.rb | 2 +- spec/models/list_account_spec.rb | 2 +- spec/models/list_spec.rb | 2 +- spec/models/login_activity_spec.rb | 2 +- spec/models/media_attachment_spec.rb | 2 +- spec/models/mention_spec.rb | 2 +- spec/models/mute_spec.rb | 2 +- spec/models/notification_spec.rb | 2 +- spec/models/poll_vote_spec.rb | 2 +- spec/models/preview_card_spec.rb | 2 +- spec/models/preview_card_trend_spec.rb | 2 +- spec/models/public_feed_spec.rb | 2 +- spec/models/relay_spec.rb | 2 +- spec/models/scheduled_status_spec.rb | 2 +- spec/models/session_activation_spec.rb | 2 +- spec/models/setting_spec.rb | 2 +- spec/models/site_upload_spec.rb | 2 +- spec/models/status_pin_spec.rb | 2 +- spec/models/status_spec.rb | 2 +- spec/models/status_stat_spec.rb | 2 +- spec/models/status_trend_spec.rb | 2 +- spec/models/system_key_spec.rb | 2 +- spec/models/tag_follow_spec.rb | 2 +- spec/models/unavailable_domain_spec.rb | 2 +- spec/models/user_invite_request_spec.rb | 2 +- spec/models/user_role_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/models/web/push_subscription_spec.rb | 2 +- spec/models/web/setting_spec.rb | 2 +- spec/models/webauthn_credentials_spec.rb | 2 +- spec/models/webhook_spec.rb | 2 +- 171 files changed, 170 insertions(+), 345 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e340cb5e8a..1d493a24d8 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -648,181 +648,6 @@ RSpec/PredicateMatcher: - 'spec/models/user_spec.rb' - 'spec/services/post_status_service_spec.rb' -# This cop supports unsafe autocorrection (--autocorrect-all). -# Configuration parameters: Inferences. -RSpec/Rails/InferredSpecType: - Exclude: - - 'spec/controllers/about_controller_spec.rb' - - 'spec/controllers/accounts_controller_spec.rb' - - 'spec/controllers/activitypub/collections_controller_spec.rb' - - 'spec/controllers/activitypub/followers_synchronizations_controller_spec.rb' - - 'spec/controllers/activitypub/inboxes_controller_spec.rb' - - 'spec/controllers/activitypub/outboxes_controller_spec.rb' - - 'spec/controllers/activitypub/replies_controller_spec.rb' - - 'spec/controllers/admin/account_moderation_notes_controller_spec.rb' - - 'spec/controllers/admin/accounts_controller_spec.rb' - - 'spec/controllers/admin/action_logs_controller_spec.rb' - - 'spec/controllers/admin/base_controller_spec.rb' - - 'spec/controllers/admin/change_emails_controller_spec.rb' - - 'spec/controllers/admin/confirmations_controller_spec.rb' - - 'spec/controllers/admin/dashboard_controller_spec.rb' - - 'spec/controllers/admin/disputes/appeals_controller_spec.rb' - - 'spec/controllers/admin/domain_allows_controller_spec.rb' - - 'spec/controllers/admin/domain_blocks_controller_spec.rb' - - 'spec/controllers/admin/email_domain_blocks_controller_spec.rb' - - 'spec/controllers/admin/export_domain_allows_controller_spec.rb' - - 'spec/controllers/admin/export_domain_blocks_controller_spec.rb' - - 'spec/controllers/admin/instances_controller_spec.rb' - - 'spec/controllers/admin/settings/branding_controller_spec.rb' - - 'spec/controllers/admin/tags_controller_spec.rb' - - 'spec/controllers/api/oembed_controller_spec.rb' - - 'spec/controllers/api/v1/accounts/pins_controller_spec.rb' - - 'spec/controllers/api/v1/accounts/search_controller_spec.rb' - - 'spec/controllers/api/v1/accounts_controller_spec.rb' - - 'spec/controllers/api/v1/admin/account_actions_controller_spec.rb' - - 'spec/controllers/api/v1/admin/accounts_controller_spec.rb' - - 'spec/controllers/api/v1/admin/domain_allows_controller_spec.rb' - - 'spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb' - - 'spec/controllers/api/v1/admin/reports_controller_spec.rb' - - 'spec/controllers/api/v1/announcements/reactions_controller_spec.rb' - - 'spec/controllers/api/v1/announcements_controller_spec.rb' - - 'spec/controllers/api/v1/apps_controller_spec.rb' - - 'spec/controllers/api/v1/blocks_controller_spec.rb' - - 'spec/controllers/api/v1/bookmarks_controller_spec.rb' - - 'spec/controllers/api/v1/conversations_controller_spec.rb' - - 'spec/controllers/api/v1/custom_emojis_controller_spec.rb' - - 'spec/controllers/api/v1/domain_blocks_controller_spec.rb' - - 'spec/controllers/api/v1/emails/confirmations_controller_spec.rb' - - 'spec/controllers/api/v1/endorsements_controller_spec.rb' - - 'spec/controllers/api/v1/favourites_controller_spec.rb' - - 'spec/controllers/api/v1/filters_controller_spec.rb' - - 'spec/controllers/api/v1/follow_requests_controller_spec.rb' - - 'spec/controllers/api/v1/followed_tags_controller_spec.rb' - - 'spec/controllers/api/v1/instances/activity_controller_spec.rb' - - 'spec/controllers/api/v1/instances/peers_controller_spec.rb' - - 'spec/controllers/api/v1/instances_controller_spec.rb' - - 'spec/controllers/api/v1/lists_controller_spec.rb' - - 'spec/controllers/api/v1/markers_controller_spec.rb' - - 'spec/controllers/api/v1/media_controller_spec.rb' - - 'spec/controllers/api/v1/mutes_controller_spec.rb' - - 'spec/controllers/api/v1/notifications_controller_spec.rb' - - 'spec/controllers/api/v1/polls/votes_controller_spec.rb' - - 'spec/controllers/api/v1/polls_controller_spec.rb' - - 'spec/controllers/api/v1/reports_controller_spec.rb' - - 'spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb' - - 'spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb' - - 'spec/controllers/api/v1/statuses_controller_spec.rb' - - 'spec/controllers/api/v1/suggestions_controller_spec.rb' - - 'spec/controllers/api/v1/tags_controller_spec.rb' - - 'spec/controllers/api/v1/trends/tags_controller_spec.rb' - - 'spec/controllers/api/v2/admin/accounts_controller_spec.rb' - - 'spec/controllers/api/v2/filters/keywords_controller_spec.rb' - - 'spec/controllers/api/v2/filters/statuses_controller_spec.rb' - - 'spec/controllers/api/v2/filters_controller_spec.rb' - - 'spec/controllers/api/v2/search_controller_spec.rb' - - 'spec/controllers/application_controller_spec.rb' - - 'spec/controllers/auth/challenges_controller_spec.rb' - - 'spec/controllers/auth/confirmations_controller_spec.rb' - - 'spec/controllers/auth/passwords_controller_spec.rb' - - 'spec/controllers/auth/registrations_controller_spec.rb' - - 'spec/controllers/auth/sessions_controller_spec.rb' - - 'spec/controllers/concerns/account_controller_concern_spec.rb' - - 'spec/controllers/concerns/cache_concern_spec.rb' - - 'spec/controllers/concerns/challengable_concern_spec.rb' - - 'spec/controllers/concerns/export_controller_concern_spec.rb' - - 'spec/controllers/concerns/localized_spec.rb' - - 'spec/controllers/concerns/signature_verification_spec.rb' - - 'spec/controllers/concerns/user_tracking_concern_spec.rb' - - 'spec/controllers/disputes/appeals_controller_spec.rb' - - 'spec/controllers/disputes/strikes_controller_spec.rb' - - 'spec/controllers/home_controller_spec.rb' - - 'spec/controllers/instance_actors_controller_spec.rb' - - 'spec/controllers/intents_controller_spec.rb' - - 'spec/controllers/oauth/authorizations_controller_spec.rb' - - 'spec/controllers/oauth/tokens_controller_spec.rb' - - 'spec/controllers/settings/imports_controller_spec.rb' - - 'spec/controllers/settings/profiles_controller_spec.rb' - - 'spec/controllers/statuses_cleanup_controller_spec.rb' - - 'spec/controllers/tags_controller_spec.rb' - - 'spec/controllers/well_known/host_meta_controller_spec.rb' - - 'spec/controllers/well_known/nodeinfo_controller_spec.rb' - - 'spec/controllers/well_known/webfinger_controller_spec.rb' - - 'spec/helpers/accounts_helper_spec.rb' - - 'spec/helpers/admin/account_moderation_notes_helper_spec.rb' - - 'spec/helpers/admin/action_logs_helper_spec.rb' - - 'spec/helpers/flashes_helper_spec.rb' - - 'spec/helpers/formatting_helper_spec.rb' - - 'spec/helpers/home_helper_spec.rb' - - 'spec/helpers/routing_helper_spec.rb' - - 'spec/mailers/admin_mailer_spec.rb' - - 'spec/mailers/notification_mailer_spec.rb' - - 'spec/mailers/user_mailer_spec.rb' - - 'spec/models/account/field_spec.rb' - - 'spec/models/account_alias_spec.rb' - - 'spec/models/account_conversation_spec.rb' - - 'spec/models/account_deletion_request_spec.rb' - - 'spec/models/account_domain_block_spec.rb' - - 'spec/models/account_migration_spec.rb' - - 'spec/models/account_moderation_note_spec.rb' - - 'spec/models/account_spec.rb' - - 'spec/models/account_statuses_cleanup_policy_spec.rb' - - 'spec/models/admin/account_action_spec.rb' - - 'spec/models/admin/action_log_spec.rb' - - 'spec/models/announcement_mute_spec.rb' - - 'spec/models/announcement_reaction_spec.rb' - - 'spec/models/announcement_spec.rb' - - 'spec/models/backup_spec.rb' - - 'spec/models/block_spec.rb' - - 'spec/models/canonical_email_block_spec.rb' - - 'spec/models/conversation_mute_spec.rb' - - 'spec/models/conversation_spec.rb' - - 'spec/models/custom_emoji_spec.rb' - - 'spec/models/custom_filter_keyword_spec.rb' - - 'spec/models/custom_filter_spec.rb' - - 'spec/models/device_spec.rb' - - 'spec/models/domain_block_spec.rb' - - 'spec/models/email_domain_block_spec.rb' - - 'spec/models/encrypted_message_spec.rb' - - 'spec/models/favourite_spec.rb' - - 'spec/models/featured_tag_spec.rb' - - 'spec/models/follow_recommendation_suppression_spec.rb' - - 'spec/models/follow_request_spec.rb' - - 'spec/models/follow_spec.rb' - - 'spec/models/home_feed_spec.rb' - - 'spec/models/identity_spec.rb' - - 'spec/models/import_spec.rb' - - 'spec/models/invite_spec.rb' - - 'spec/models/list_account_spec.rb' - - 'spec/models/list_spec.rb' - - 'spec/models/login_activity_spec.rb' - - 'spec/models/media_attachment_spec.rb' - - 'spec/models/mention_spec.rb' - - 'spec/models/mute_spec.rb' - - 'spec/models/notification_spec.rb' - - 'spec/models/poll_vote_spec.rb' - - 'spec/models/preview_card_spec.rb' - - 'spec/models/preview_card_trend_spec.rb' - - 'spec/models/public_feed_spec.rb' - - 'spec/models/relay_spec.rb' - - 'spec/models/scheduled_status_spec.rb' - - 'spec/models/session_activation_spec.rb' - - 'spec/models/setting_spec.rb' - - 'spec/models/site_upload_spec.rb' - - 'spec/models/status_pin_spec.rb' - - 'spec/models/status_spec.rb' - - 'spec/models/status_stat_spec.rb' - - 'spec/models/status_trend_spec.rb' - - 'spec/models/system_key_spec.rb' - - 'spec/models/tag_follow_spec.rb' - - 'spec/models/unavailable_domain_spec.rb' - - 'spec/models/user_invite_request_spec.rb' - - 'spec/models/user_role_spec.rb' - - 'spec/models/user_spec.rb' - - 'spec/models/web/push_subscription_spec.rb' - - 'spec/models/web/setting_spec.rb' - - 'spec/models/webauthn_credentials_spec.rb' - - 'spec/models/webhook_spec.rb' - RSpec/RepeatedExample: Exclude: - 'spec/policies/status_policy_spec.rb' diff --git a/spec/controllers/about_controller_spec.rb b/spec/controllers/about_controller_spec.rb index ccd28a96ce..8db6d80b0b 100644 --- a/spec/controllers/about_controller_spec.rb +++ b/spec/controllers/about_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AboutController, type: :controller do +RSpec.describe AboutController do render_views describe 'GET #show' do diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb index 428dc2cba5..3667564802 100644 --- a/spec/controllers/accounts_controller_spec.rb +++ b/spec/controllers/accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AccountsController, type: :controller do +RSpec.describe AccountsController do render_views let(:account) { Fabricate(:account) } diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb index 02d0065734..8878474885 100644 --- a/spec/controllers/activitypub/collections_controller_spec.rb +++ b/spec/controllers/activitypub/collections_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe ActivityPub::CollectionsController, type: :controller do +RSpec.describe ActivityPub::CollectionsController do let!(:account) { Fabricate(:account) } let!(:private_pinned) { Fabricate(:status, account: account, text: 'secret private stuff', visibility: :private) } let(:remote_account) { nil } diff --git a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb index 5935049dcf..8fcce165b3 100644 --- a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb +++ b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe ActivityPub::FollowersSynchronizationsController, type: :controller do +RSpec.describe ActivityPub::FollowersSynchronizationsController do let!(:account) { Fabricate(:account) } let!(:follower_1) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/a') } let!(:follower_2) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/b') } diff --git a/spec/controllers/activitypub/inboxes_controller_spec.rb b/spec/controllers/activitypub/inboxes_controller_spec.rb index 82146f34d9..030a303266 100644 --- a/spec/controllers/activitypub/inboxes_controller_spec.rb +++ b/spec/controllers/activitypub/inboxes_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe ActivityPub::InboxesController, type: :controller do +RSpec.describe ActivityPub::InboxesController do let(:remote_account) { nil } before do diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb index 189b46a7d2..8823d9fe7e 100644 --- a/spec/controllers/activitypub/outboxes_controller_spec.rb +++ b/spec/controllers/activitypub/outboxes_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe ActivityPub::OutboxesController, type: :controller do +RSpec.describe ActivityPub::OutboxesController do let!(:account) { Fabricate(:account) } shared_examples 'cacheable response' do diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb index 582ef863f2..c7b65f004d 100644 --- a/spec/controllers/activitypub/replies_controller_spec.rb +++ b/spec/controllers/activitypub/replies_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe ActivityPub::RepliesController, type: :controller do +RSpec.describe ActivityPub::RepliesController do let(:status) { Fabricate(:status, visibility: parent_visibility) } let(:remote_account) { Fabricate(:account, domain: 'foobar.com') } let(:remote_reply_id) { 'https://foobar.com/statuses/1234' } diff --git a/spec/controllers/admin/account_moderation_notes_controller_spec.rb b/spec/controllers/admin/account_moderation_notes_controller_spec.rb index d2c52f5940..848281c290 100644 --- a/spec/controllers/admin/account_moderation_notes_controller_spec.rb +++ b/spec/controllers/admin/account_moderation_notes_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::AccountModerationNotesController, type: :controller do +RSpec.describe Admin::AccountModerationNotesController do render_views let(:user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb index b182715b0b..7d001c4cbc 100644 --- a/spec/controllers/admin/accounts_controller_spec.rb +++ b/spec/controllers/admin/accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::AccountsController, type: :controller do +RSpec.describe Admin::AccountsController do render_views before { sign_in current_user, scope: :user } diff --git a/spec/controllers/admin/action_logs_controller_spec.rb b/spec/controllers/admin/action_logs_controller_spec.rb index 7cd8cdf462..044ddf2c42 100644 --- a/spec/controllers/admin/action_logs_controller_spec.rb +++ b/spec/controllers/admin/action_logs_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Admin::ActionLogsController, type: :controller do +describe Admin::ActionLogsController do render_views # Action logs typically cause issues when their targets are not in the database diff --git a/spec/controllers/admin/base_controller_spec.rb b/spec/controllers/admin/base_controller_spec.rb index bfb9d2c7d4..1f1fa8441a 100644 --- a/spec/controllers/admin/base_controller_spec.rb +++ b/spec/controllers/admin/base_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Admin::BaseController, type: :controller do +describe Admin::BaseController do controller do def success authorize :dashboard, :index? diff --git a/spec/controllers/admin/change_emails_controller_spec.rb b/spec/controllers/admin/change_emails_controller_spec.rb index 8329984715..503862a7b9 100644 --- a/spec/controllers/admin/change_emails_controller_spec.rb +++ b/spec/controllers/admin/change_emails_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::ChangeEmailsController, type: :controller do +RSpec.describe Admin::ChangeEmailsController do render_views let(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } diff --git a/spec/controllers/admin/confirmations_controller_spec.rb b/spec/controllers/admin/confirmations_controller_spec.rb index d05711e272..ffab56d9aa 100644 --- a/spec/controllers/admin/confirmations_controller_spec.rb +++ b/spec/controllers/admin/confirmations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::ConfirmationsController, type: :controller do +RSpec.describe Admin::ConfirmationsController do render_views before do diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb index ab3738fcd7..25300fdd90 100644 --- a/spec/controllers/admin/dashboard_controller_spec.rb +++ b/spec/controllers/admin/dashboard_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Admin::DashboardController, type: :controller do +describe Admin::DashboardController do render_views describe 'GET #index' do diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb index 576a0c12b9..371c4f483d 100644 --- a/spec/controllers/admin/disputes/appeals_controller_spec.rb +++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::Disputes::AppealsController, type: :controller do +RSpec.describe Admin::Disputes::AppealsController do render_views before { sign_in current_user, scope: :user } diff --git a/spec/controllers/admin/domain_allows_controller_spec.rb b/spec/controllers/admin/domain_allows_controller_spec.rb index 2a0f47145a..6b0453476a 100644 --- a/spec/controllers/admin/domain_allows_controller_spec.rb +++ b/spec/controllers/admin/domain_allows_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::DomainAllowsController, type: :controller do +RSpec.describe Admin::DomainAllowsController do render_views before do diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb index 99fb146147..6aed172ac5 100644 --- a/spec/controllers/admin/domain_blocks_controller_spec.rb +++ b/spec/controllers/admin/domain_blocks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::DomainBlocksController, type: :controller do +RSpec.describe Admin::DomainBlocksController do render_views before do diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb index e9cef4a94c..4286600144 100644 --- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb +++ b/spec/controllers/admin/email_domain_blocks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::EmailDomainBlocksController, type: :controller do +RSpec.describe Admin::EmailDomainBlocksController do render_views before do diff --git a/spec/controllers/admin/export_domain_allows_controller_spec.rb b/spec/controllers/admin/export_domain_allows_controller_spec.rb index f12bd1344f..9d50c04aad 100644 --- a/spec/controllers/admin/export_domain_allows_controller_spec.rb +++ b/spec/controllers/admin/export_domain_allows_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::ExportDomainAllowsController, type: :controller do +RSpec.describe Admin::ExportDomainAllowsController do render_views before do diff --git a/spec/controllers/admin/export_domain_blocks_controller_spec.rb b/spec/controllers/admin/export_domain_blocks_controller_spec.rb index 6e7475ed12..1a63077736 100644 --- a/spec/controllers/admin/export_domain_blocks_controller_spec.rb +++ b/spec/controllers/admin/export_domain_blocks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::ExportDomainBlocksController, type: :controller do +RSpec.describe Admin::ExportDomainBlocksController do render_views before do diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb index 33174b9921..ce062085f4 100644 --- a/spec/controllers/admin/instances_controller_spec.rb +++ b/spec/controllers/admin/instances_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::InstancesController, type: :controller do +RSpec.describe Admin::InstancesController do render_views let(:current_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) } diff --git a/spec/controllers/admin/settings/branding_controller_spec.rb b/spec/controllers/admin/settings/branding_controller_spec.rb index ee1c441bc5..4b0f1e21e0 100644 --- a/spec/controllers/admin/settings/branding_controller_spec.rb +++ b/spec/controllers/admin/settings/branding_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::Settings::BrandingController, type: :controller do +RSpec.describe Admin::Settings::BrandingController do render_views describe 'When signed in as an admin' do diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb index 52fd09eb10..313298f14a 100644 --- a/spec/controllers/admin/tags_controller_spec.rb +++ b/spec/controllers/admin/tags_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::TagsController, type: :controller do +RSpec.describe Admin::TagsController do render_views before do diff --git a/spec/controllers/api/oembed_controller_spec.rb b/spec/controllers/api/oembed_controller_spec.rb index 02875ee9f3..70248c3982 100644 --- a/spec/controllers/api/oembed_controller_spec.rb +++ b/spec/controllers/api/oembed_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::OEmbedController, type: :controller do +RSpec.describe Api::OEmbedController do render_views let(:alice) { Fabricate(:account, username: 'alice') } diff --git a/spec/controllers/api/v1/accounts/pins_controller_spec.rb b/spec/controllers/api/v1/accounts/pins_controller_spec.rb index 19bba093e4..b4aa9b7116 100644 --- a/spec/controllers/api/v1/accounts/pins_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/pins_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Accounts::PinsController, type: :controller do +RSpec.describe Api::V1::Accounts::PinsController do let(:john) { Fabricate(:user) } let(:kevin) { Fabricate(:user) } let(:token) { Fabricate(:accessible_access_token, resource_owner_id: john.id, scopes: 'write:accounts') } diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb index d2b675a3c8..aa9455a4a3 100644 --- a/spec/controllers/api/v1/accounts/search_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Accounts::SearchController, type: :controller do +RSpec.describe Api::V1::Accounts::SearchController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb index 84cbd9cc7b..1cca69de73 100644 --- a/spec/controllers/api/v1/accounts_controller_spec.rb +++ b/spec/controllers/api/v1/accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::AccountsController, type: :controller do +RSpec.describe Api::V1::AccountsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb index cafbee212d..1c976455e1 100644 --- a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb +++ b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Admin::AccountActionsController, type: :controller do +RSpec.describe Api::V1::Admin::AccountActionsController do render_views let(:role) { UserRole.find_by(name: 'Moderator') } diff --git a/spec/controllers/api/v1/admin/accounts_controller_spec.rb b/spec/controllers/api/v1/admin/accounts_controller_spec.rb index 9ffcdb34fb..852a521021 100644 --- a/spec/controllers/api/v1/admin/accounts_controller_spec.rb +++ b/spec/controllers/api/v1/admin/accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Admin::AccountsController, type: :controller do +RSpec.describe Api::V1::Admin::AccountsController do render_views let(:role) { UserRole.find_by(name: 'Moderator') } diff --git a/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb b/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb index 15567907e4..9db8a35b46 100644 --- a/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb +++ b/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Admin::DomainAllowsController, type: :controller do +RSpec.describe Api::V1::Admin::DomainAllowsController do render_views let(:role) { UserRole.find_by(name: 'Admin') } diff --git a/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb index ca5f8b9747..5659843f7a 100644 --- a/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb +++ b/spec/controllers/api/v1/admin/domain_blocks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Admin::DomainBlocksController, type: :controller do +RSpec.describe Api::V1::Admin::DomainBlocksController do render_views let(:role) { UserRole.find_by(name: 'Admin') } diff --git a/spec/controllers/api/v1/admin/reports_controller_spec.rb b/spec/controllers/api/v1/admin/reports_controller_spec.rb index 3d61fe5c3a..4f0c484e59 100644 --- a/spec/controllers/api/v1/admin/reports_controller_spec.rb +++ b/spec/controllers/api/v1/admin/reports_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Admin::ReportsController, type: :controller do +RSpec.describe Api::V1::Admin::ReportsController do render_views let(:role) { UserRole.find_by(name: 'Moderator') } diff --git a/spec/controllers/api/v1/announcements/reactions_controller_spec.rb b/spec/controllers/api/v1/announcements/reactions_controller_spec.rb index 25c52aa1d3..10aaa553f5 100644 --- a/spec/controllers/api/v1/announcements/reactions_controller_spec.rb +++ b/spec/controllers/api/v1/announcements/reactions_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Announcements::ReactionsController, type: :controller do +RSpec.describe Api::V1::Announcements::ReactionsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/announcements_controller_spec.rb b/spec/controllers/api/v1/announcements_controller_spec.rb index eaab2abd80..15d94b4512 100644 --- a/spec/controllers/api/v1/announcements_controller_spec.rb +++ b/spec/controllers/api/v1/announcements_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::AnnouncementsController, type: :controller do +RSpec.describe Api::V1::AnnouncementsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/apps_controller_spec.rb b/spec/controllers/api/v1/apps_controller_spec.rb index bde132c52e..de2a07f20a 100644 --- a/spec/controllers/api/v1/apps_controller_spec.rb +++ b/spec/controllers/api/v1/apps_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::AppsController, type: :controller do +RSpec.describe Api::V1::AppsController do render_views describe 'POST #create' do diff --git a/spec/controllers/api/v1/blocks_controller_spec.rb b/spec/controllers/api/v1/blocks_controller_spec.rb index fe71531865..eaafc1b4fa 100644 --- a/spec/controllers/api/v1/blocks_controller_spec.rb +++ b/spec/controllers/api/v1/blocks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::BlocksController, type: :controller do +RSpec.describe Api::V1::BlocksController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/bookmarks_controller_spec.rb b/spec/controllers/api/v1/bookmarks_controller_spec.rb index bbf92c1539..69a37388ea 100644 --- a/spec/controllers/api/v1/bookmarks_controller_spec.rb +++ b/spec/controllers/api/v1/bookmarks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::BookmarksController, type: :controller do +RSpec.describe Api::V1::BookmarksController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb index 36c4cb56f9..f888517154 100644 --- a/spec/controllers/api/v1/conversations_controller_spec.rb +++ b/spec/controllers/api/v1/conversations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::ConversationsController, type: :controller do +RSpec.describe Api::V1::ConversationsController do render_views let!(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) } diff --git a/spec/controllers/api/v1/custom_emojis_controller_spec.rb b/spec/controllers/api/v1/custom_emojis_controller_spec.rb index fe8daa7c5a..08af57f405 100644 --- a/spec/controllers/api/v1/custom_emojis_controller_spec.rb +++ b/spec/controllers/api/v1/custom_emojis_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::CustomEmojisController, type: :controller do +RSpec.describe Api::V1::CustomEmojisController do render_views describe 'GET #index' do diff --git a/spec/controllers/api/v1/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/domain_blocks_controller_spec.rb index 467ddbccce..aa98ec4c32 100644 --- a/spec/controllers/api/v1/domain_blocks_controller_spec.rb +++ b/spec/controllers/api/v1/domain_blocks_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::DomainBlocksController, type: :controller do +RSpec.describe Api::V1::DomainBlocksController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/emails/confirmations_controller_spec.rb b/spec/controllers/api/v1/emails/confirmations_controller_spec.rb index 91defc0862..2a0703ed9c 100644 --- a/spec/controllers/api/v1/emails/confirmations_controller_spec.rb +++ b/spec/controllers/api/v1/emails/confirmations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Emails::ConfirmationsController, type: :controller do +RSpec.describe Api::V1::Emails::ConfirmationsController do let(:confirmed_at) { nil } let(:user) { Fabricate(:user, confirmed_at: confirmed_at) } let(:app) { Fabricate(:application) } diff --git a/spec/controllers/api/v1/endorsements_controller_spec.rb b/spec/controllers/api/v1/endorsements_controller_spec.rb index ad5ff400f5..738804bb7b 100644 --- a/spec/controllers/api/v1/endorsements_controller_spec.rb +++ b/spec/controllers/api/v1/endorsements_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::EndorsementsController, type: :controller do +RSpec.describe Api::V1::EndorsementsController do let(:user) { Fabricate(:user) } let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') } diff --git a/spec/controllers/api/v1/favourites_controller_spec.rb b/spec/controllers/api/v1/favourites_controller_spec.rb index dd07bbb6e1..c9ca046be0 100644 --- a/spec/controllers/api/v1/favourites_controller_spec.rb +++ b/spec/controllers/api/v1/favourites_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::FavouritesController, type: :controller do +RSpec.describe Api::V1::FavouritesController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/filters_controller_spec.rb b/spec/controllers/api/v1/filters_controller_spec.rb index d583365cc1..8ccd2f4d66 100644 --- a/spec/controllers/api/v1/filters_controller_spec.rb +++ b/spec/controllers/api/v1/filters_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::FiltersController, type: :controller do +RSpec.describe Api::V1::FiltersController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/follow_requests_controller_spec.rb b/spec/controllers/api/v1/follow_requests_controller_spec.rb index 0220e02770..0a2c27d9ed 100644 --- a/spec/controllers/api/v1/follow_requests_controller_spec.rb +++ b/spec/controllers/api/v1/follow_requests_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::FollowRequestsController, type: :controller do +RSpec.describe Api::V1::FollowRequestsController do render_views let(:user) { Fabricate(:user, account_attributes: { locked: true }) } diff --git a/spec/controllers/api/v1/followed_tags_controller_spec.rb b/spec/controllers/api/v1/followed_tags_controller_spec.rb index e990065a9d..c1a366d4e3 100644 --- a/spec/controllers/api/v1/followed_tags_controller_spec.rb +++ b/spec/controllers/api/v1/followed_tags_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::FollowedTagsController, type: :controller do +RSpec.describe Api::V1::FollowedTagsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/instances/activity_controller_spec.rb b/spec/controllers/api/v1/instances/activity_controller_spec.rb index 0dcbd3a63b..b446a521f8 100644 --- a/spec/controllers/api/v1/instances/activity_controller_spec.rb +++ b/spec/controllers/api/v1/instances/activity_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Instances::ActivityController, type: :controller do +RSpec.describe Api::V1::Instances::ActivityController do describe 'GET #show' do it 'returns 200' do get :show diff --git a/spec/controllers/api/v1/instances/peers_controller_spec.rb b/spec/controllers/api/v1/instances/peers_controller_spec.rb index 532443d1f4..92b1019154 100644 --- a/spec/controllers/api/v1/instances/peers_controller_spec.rb +++ b/spec/controllers/api/v1/instances/peers_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Instances::PeersController, type: :controller do +RSpec.describe Api::V1::Instances::PeersController do describe 'GET #index' do it 'returns 200' do get :index diff --git a/spec/controllers/api/v1/instances_controller_spec.rb b/spec/controllers/api/v1/instances_controller_spec.rb index 842669d965..fcc2c9288c 100644 --- a/spec/controllers/api/v1/instances_controller_spec.rb +++ b/spec/controllers/api/v1/instances_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::InstancesController, type: :controller do +RSpec.describe Api::V1::InstancesController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/lists_controller_spec.rb b/spec/controllers/api/v1/lists_controller_spec.rb index f54d27e42b..15b9840ce1 100644 --- a/spec/controllers/api/v1/lists_controller_spec.rb +++ b/spec/controllers/api/v1/lists_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::ListsController, type: :controller do +RSpec.describe Api::V1::ListsController do render_views let!(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/markers_controller_spec.rb b/spec/controllers/api/v1/markers_controller_spec.rb index fb5f59a7cf..64e9dcafb6 100644 --- a/spec/controllers/api/v1/markers_controller_spec.rb +++ b/spec/controllers/api/v1/markers_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::MarkersController, type: :controller do +RSpec.describe Api::V1::MarkersController do render_views let!(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/media_controller_spec.rb b/spec/controllers/api/v1/media_controller_spec.rb index 23e8664aab..20d58e8c03 100644 --- a/spec/controllers/api/v1/media_controller_spec.rb +++ b/spec/controllers/api/v1/media_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::MediaController, type: :controller do +RSpec.describe Api::V1::MediaController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/mutes_controller_spec.rb b/spec/controllers/api/v1/mutes_controller_spec.rb index feaa486c00..2645ed4e9d 100644 --- a/spec/controllers/api/v1/mutes_controller_spec.rb +++ b/spec/controllers/api/v1/mutes_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::MutesController, type: :controller do +RSpec.describe Api::V1::MutesController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/notifications_controller_spec.rb b/spec/controllers/api/v1/notifications_controller_spec.rb index f6cbd105e3..28b8e656ab 100644 --- a/spec/controllers/api/v1/notifications_controller_spec.rb +++ b/spec/controllers/api/v1/notifications_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::NotificationsController, type: :controller do +RSpec.describe Api::V1::NotificationsController do render_views let(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) } diff --git a/spec/controllers/api/v1/polls/votes_controller_spec.rb b/spec/controllers/api/v1/polls/votes_controller_spec.rb index 9d9b14e81c..7abd2a1b17 100644 --- a/spec/controllers/api/v1/polls/votes_controller_spec.rb +++ b/spec/controllers/api/v1/polls/votes_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Polls::VotesController, type: :controller do +RSpec.describe Api::V1::Polls::VotesController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/polls_controller_spec.rb b/spec/controllers/api/v1/polls_controller_spec.rb index 0602e44eef..3aae5496db 100644 --- a/spec/controllers/api/v1/polls_controller_spec.rb +++ b/spec/controllers/api/v1/polls_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::PollsController, type: :controller do +RSpec.describe Api::V1::PollsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb index 06afaf0a75..0eb9ce1709 100644 --- a/spec/controllers/api/v1/reports_controller_spec.rb +++ b/spec/controllers/api/v1/reports_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::ReportsController, type: :controller do +RSpec.describe Api::V1::ReportsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb index cac7b42b50..01816743e5 100644 --- a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb +++ b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :controller do +RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb index c5fedcefa3..756010af87 100644 --- a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb +++ b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Statuses::RebloggedByAccountsController, type: :controller do +RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb index f011bfd473..ab6f80a61b 100644 --- a/spec/controllers/api/v1/statuses_controller_spec.rb +++ b/spec/controllers/api/v1/statuses_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::StatusesController, type: :controller do +RSpec.describe Api::V1::StatusesController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/suggestions_controller_spec.rb b/spec/controllers/api/v1/suggestions_controller_spec.rb index c99380c58b..c61ce0ec05 100644 --- a/spec/controllers/api/v1/suggestions_controller_spec.rb +++ b/spec/controllers/api/v1/suggestions_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::SuggestionsController, type: :controller do +RSpec.describe Api::V1::SuggestionsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/tags_controller_spec.rb b/spec/controllers/api/v1/tags_controller_spec.rb index ed17a4fbfb..e914f5992d 100644 --- a/spec/controllers/api/v1/tags_controller_spec.rb +++ b/spec/controllers/api/v1/tags_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::TagsController, type: :controller do +RSpec.describe Api::V1::TagsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v1/trends/tags_controller_spec.rb b/spec/controllers/api/v1/trends/tags_controller_spec.rb index d29551c56c..84370d8412 100644 --- a/spec/controllers/api/v1/trends/tags_controller_spec.rb +++ b/spec/controllers/api/v1/trends/tags_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V1::Trends::TagsController, type: :controller do +RSpec.describe Api::V1::Trends::TagsController do render_views describe 'GET #index' do diff --git a/spec/controllers/api/v2/admin/accounts_controller_spec.rb b/spec/controllers/api/v2/admin/accounts_controller_spec.rb index 5766fd549e..762c84af94 100644 --- a/spec/controllers/api/v2/admin/accounts_controller_spec.rb +++ b/spec/controllers/api/v2/admin/accounts_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V2::Admin::AccountsController, type: :controller do +RSpec.describe Api::V2::Admin::AccountsController do render_views let(:role) { UserRole.find_by(name: 'Moderator') } diff --git a/spec/controllers/api/v2/filters/keywords_controller_spec.rb b/spec/controllers/api/v2/filters/keywords_controller_spec.rb index 8c61059c64..057a9c3d00 100644 --- a/spec/controllers/api/v2/filters/keywords_controller_spec.rb +++ b/spec/controllers/api/v2/filters/keywords_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V2::Filters::KeywordsController, type: :controller do +RSpec.describe Api::V2::Filters::KeywordsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v2/filters/statuses_controller_spec.rb b/spec/controllers/api/v2/filters/statuses_controller_spec.rb index 330cf45a60..588532ffd2 100644 --- a/spec/controllers/api/v2/filters/statuses_controller_spec.rb +++ b/spec/controllers/api/v2/filters/statuses_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V2::Filters::StatusesController, type: :controller do +RSpec.describe Api::V2::Filters::StatusesController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v2/filters_controller_spec.rb b/spec/controllers/api/v2/filters_controller_spec.rb index 4334a46fe9..722037eeb2 100644 --- a/spec/controllers/api/v2/filters_controller_spec.rb +++ b/spec/controllers/api/v2/filters_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V2::FiltersController, type: :controller do +RSpec.describe Api::V2::FiltersController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/api/v2/search_controller_spec.rb b/spec/controllers/api/v2/search_controller_spec.rb index d417ea58ca..bfabe8cc17 100644 --- a/spec/controllers/api/v2/search_controller_spec.rb +++ b/spec/controllers/api/v2/search_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Api::V2::SearchController, type: :controller do +RSpec.describe Api::V2::SearchController do render_views context 'with token' do diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index a8344d0541..e9d4796035 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController, type: :controller do +describe ApplicationController do controller do def success head 200 diff --git a/spec/controllers/auth/challenges_controller_spec.rb b/spec/controllers/auth/challenges_controller_spec.rb index 2a6ca301ef..32bbedde63 100644 --- a/spec/controllers/auth/challenges_controller_spec.rb +++ b/spec/controllers/auth/challenges_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Auth::ChallengesController, type: :controller do +describe Auth::ChallengesController do render_views let(:password) { 'foobar12345' } diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb index 8469119d23..799d3857e4 100644 --- a/spec/controllers/auth/confirmations_controller_spec.rb +++ b/spec/controllers/auth/confirmations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Auth::ConfirmationsController, type: :controller do +describe Auth::ConfirmationsController do render_views describe 'GET #new' do diff --git a/spec/controllers/auth/passwords_controller_spec.rb b/spec/controllers/auth/passwords_controller_spec.rb index 1c6874f08c..38fbed27a7 100644 --- a/spec/controllers/auth/passwords_controller_spec.rb +++ b/spec/controllers/auth/passwords_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Auth::PasswordsController, type: :controller do +describe Auth::PasswordsController do include Devise::Test::ControllerHelpers describe 'GET #new' do diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb index 3a77aed94c..ad8465e2ac 100644 --- a/spec/controllers/auth/registrations_controller_spec.rb +++ b/spec/controllers/auth/registrations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Auth::RegistrationsController, type: :controller do +RSpec.describe Auth::RegistrationsController do render_views shared_examples 'checks for enabled registrations' do |path| diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb index bbf4c0c889..5b7d5d5cd4 100644 --- a/spec/controllers/auth/sessions_controller_spec.rb +++ b/spec/controllers/auth/sessions_controller_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' require 'webauthn/fake_client' -RSpec.describe Auth::SessionsController, type: :controller do +RSpec.describe Auth::SessionsController do render_views before do diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb index 99975f4c44..57fc6f9653 100644 --- a/spec/controllers/concerns/account_controller_concern_spec.rb +++ b/spec/controllers/concerns/account_controller_concern_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController, type: :controller do +describe ApplicationController do controller do include AccountControllerConcern diff --git a/spec/controllers/concerns/cache_concern_spec.rb b/spec/controllers/concerns/cache_concern_spec.rb index 528d1a66ed..bf328d679d 100644 --- a/spec/controllers/concerns/cache_concern_spec.rb +++ b/spec/controllers/concerns/cache_concern_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe CacheConcern, type: :controller do +RSpec.describe CacheConcern do controller(ApplicationController) do include CacheConcern diff --git a/spec/controllers/concerns/challengable_concern_spec.rb b/spec/controllers/concerns/challengable_concern_spec.rb index e6868fb291..3324bdd24f 100644 --- a/spec/controllers/concerns/challengable_concern_spec.rb +++ b/spec/controllers/concerns/challengable_concern_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe ChallengableConcern, type: :controller do +RSpec.describe ChallengableConcern do controller(ApplicationController) do include ChallengableConcern diff --git a/spec/controllers/concerns/export_controller_concern_spec.rb b/spec/controllers/concerns/export_controller_concern_spec.rb index 003fd17f6f..b380246e7e 100644 --- a/spec/controllers/concerns/export_controller_concern_spec.rb +++ b/spec/controllers/concerns/export_controller_concern_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController, type: :controller do +describe ApplicationController do controller do include ExportControllerConcern diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb index 1a54290f97..caac94ea95 100644 --- a/spec/controllers/concerns/localized_spec.rb +++ b/spec/controllers/concerns/localized_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController, type: :controller do +describe ApplicationController do controller do include Localized diff --git a/spec/controllers/concerns/signature_verification_spec.rb b/spec/controllers/concerns/signature_verification_spec.rb index e5b5ed6173..45d04aa61d 100644 --- a/spec/controllers/concerns/signature_verification_spec.rb +++ b/spec/controllers/concerns/signature_verification_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController, type: :controller do +describe ApplicationController do let(:wrapped_actor_class) do Class.new do attr_reader :wrapped_account diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb index b2548d5c00..8e272468b6 100644 --- a/spec/controllers/concerns/user_tracking_concern_spec.rb +++ b/spec/controllers/concerns/user_tracking_concern_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ApplicationController, type: :controller do +describe ApplicationController do controller do include UserTrackingConcern diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb index affe63c59b..d0e1cd3908 100644 --- a/spec/controllers/disputes/appeals_controller_spec.rb +++ b/spec/controllers/disputes/appeals_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Disputes::AppealsController, type: :controller do +RSpec.describe Disputes::AppealsController do render_views before { sign_in current_user, scope: :user } diff --git a/spec/controllers/disputes/strikes_controller_spec.rb b/spec/controllers/disputes/strikes_controller_spec.rb index 1d678875c6..f6d28fc09a 100644 --- a/spec/controllers/disputes/strikes_controller_spec.rb +++ b/spec/controllers/disputes/strikes_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Disputes::StrikesController, type: :controller do +RSpec.describe Disputes::StrikesController do render_views before { sign_in current_user, scope: :user } diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index 0d3722920c..3ddc5691a9 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe HomeController, type: :controller do +RSpec.describe HomeController do render_views describe 'GET #index' do diff --git a/spec/controllers/instance_actors_controller_spec.rb b/spec/controllers/instance_actors_controller_spec.rb index 3298bd9e6b..8406094311 100644 --- a/spec/controllers/instance_actors_controller_spec.rb +++ b/spec/controllers/instance_actors_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe InstanceActorsController, type: :controller do +RSpec.describe InstanceActorsController do describe 'GET #show' do context 'with JSON' do let(:format) { 'json' } diff --git a/spec/controllers/intents_controller_spec.rb b/spec/controllers/intents_controller_spec.rb index 02b46ddc79..668d833ea7 100644 --- a/spec/controllers/intents_controller_spec.rb +++ b/spec/controllers/intents_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe IntentsController, type: :controller do +RSpec.describe IntentsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb index 6f087625c5..9b3ae251e6 100644 --- a/spec/controllers/oauth/authorizations_controller_spec.rb +++ b/spec/controllers/oauth/authorizations_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Oauth::AuthorizationsController, type: :controller do +RSpec.describe Oauth::AuthorizationsController do render_views let(:app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/', scopes: 'read') } diff --git a/spec/controllers/oauth/tokens_controller_spec.rb b/spec/controllers/oauth/tokens_controller_spec.rb index 3804e035bb..973393bcf2 100644 --- a/spec/controllers/oauth/tokens_controller_spec.rb +++ b/spec/controllers/oauth/tokens_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Oauth::TokensController, type: :controller do +RSpec.describe Oauth::TokensController do describe 'POST #revoke' do let!(:user) { Fabricate(:user) } let!(:application) { Fabricate(:application, confidential: false) } diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb index 500b442396..76e1e4ecb0 100644 --- a/spec/controllers/settings/imports_controller_spec.rb +++ b/spec/controllers/settings/imports_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Settings::ImportsController, type: :controller do +RSpec.describe Settings::ImportsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb index 52ae1f5191..806fad19a8 100644 --- a/spec/controllers/settings/profiles_controller_spec.rb +++ b/spec/controllers/settings/profiles_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Settings::ProfilesController, type: :controller do +RSpec.describe Settings::ProfilesController do render_views let!(:user) { Fabricate(:user) } diff --git a/spec/controllers/statuses_cleanup_controller_spec.rb b/spec/controllers/statuses_cleanup_controller_spec.rb index 693260f92b..e082b69c51 100644 --- a/spec/controllers/statuses_cleanup_controller_spec.rb +++ b/spec/controllers/statuses_cleanup_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe StatusesCleanupController, type: :controller do +RSpec.describe StatusesCleanupController do render_views before do diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb index 7a07801be7..d41e707d43 100644 --- a/spec/controllers/tags_controller_spec.rb +++ b/spec/controllers/tags_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe TagsController, type: :controller do +RSpec.describe TagsController do render_views describe 'GET #show' do diff --git a/spec/controllers/well_known/host_meta_controller_spec.rb b/spec/controllers/well_known/host_meta_controller_spec.rb index d537043708..4bd161cd9d 100644 --- a/spec/controllers/well_known/host_meta_controller_spec.rb +++ b/spec/controllers/well_known/host_meta_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe WellKnown::HostMetaController, type: :controller do +describe WellKnown::HostMetaController do render_views describe 'GET #show' do diff --git a/spec/controllers/well_known/nodeinfo_controller_spec.rb b/spec/controllers/well_known/nodeinfo_controller_spec.rb index f5cde150da..6ec34afd04 100644 --- a/spec/controllers/well_known/nodeinfo_controller_spec.rb +++ b/spec/controllers/well_known/nodeinfo_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe WellKnown::NodeInfoController, type: :controller do +describe WellKnown::NodeInfoController do render_views describe 'GET #index' do diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb index 401f7421fe..8dc0f329b6 100644 --- a/spec/controllers/well_known/webfinger_controller_spec.rb +++ b/spec/controllers/well_known/webfinger_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe WellKnown::WebfingerController, type: :controller do +describe WellKnown::WebfingerController do render_views describe 'GET #show' do diff --git a/spec/helpers/accounts_helper_spec.rb b/spec/helpers/accounts_helper_spec.rb index 184b47dec6..2c949cde69 100644 --- a/spec/helpers/accounts_helper_spec.rb +++ b/spec/helpers/accounts_helper_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AccountsHelper, type: :helper do +RSpec.describe AccountsHelper do def set_not_embedded_view params[:controller] = "not_#{StatusesHelper::EMBEDDED_CONTROLLER}" params[:action] = "not_#{StatusesHelper::EMBEDDED_ACTION}" diff --git a/spec/helpers/admin/account_moderation_notes_helper_spec.rb b/spec/helpers/admin/account_moderation_notes_helper_spec.rb index bacc8dcf37..6386f07ac9 100644 --- a/spec/helpers/admin/account_moderation_notes_helper_spec.rb +++ b/spec/helpers/admin/account_moderation_notes_helper_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::AccountModerationNotesHelper, type: :helper do +RSpec.describe Admin::AccountModerationNotesHelper do include AccountsHelper describe '#admin_account_link_to' do diff --git a/spec/helpers/admin/action_logs_helper_spec.rb b/spec/helpers/admin/action_logs_helper_spec.rb index 9d7ed4ab76..4e9d08f09d 100644 --- a/spec/helpers/admin/action_logs_helper_spec.rb +++ b/spec/helpers/admin/action_logs_helper_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Admin::ActionLogsHelper, type: :helper do +RSpec.describe Admin::ActionLogsHelper do end diff --git a/spec/helpers/flashes_helper_spec.rb b/spec/helpers/flashes_helper_spec.rb index ea143eed72..035e8a1de0 100644 --- a/spec/helpers/flashes_helper_spec.rb +++ b/spec/helpers/flashes_helper_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe FlashesHelper, type: :helper do +describe FlashesHelper do describe 'user_facing_flashes' do it 'returns user facing flashes' do flash[:alert] = 'an alert' diff --git a/spec/helpers/formatting_helper_spec.rb b/spec/helpers/formatting_helper_spec.rb index af604a87b5..d6e7631f66 100644 --- a/spec/helpers/formatting_helper_spec.rb +++ b/spec/helpers/formatting_helper_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe FormattingHelper, type: :helper do +describe FormattingHelper do include Devise::Test::ControllerHelpers describe '#rss_status_content_format' do diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb index 3d2c5fe248..15067471ed 100644 --- a/spec/helpers/home_helper_spec.rb +++ b/spec/helpers/home_helper_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe HomeHelper, type: :helper do +RSpec.describe HomeHelper do describe 'default_props' do it 'returns default properties according to the context' do expect(helper.default_props).to eq locale: I18n.locale diff --git a/spec/helpers/routing_helper_spec.rb b/spec/helpers/routing_helper_spec.rb index 44d2fdb4a9..852d02cebc 100644 --- a/spec/helpers/routing_helper_spec.rb +++ b/spec/helpers/routing_helper_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe RoutingHelper, type: :helper do +RSpec.describe RoutingHelper do describe '.full_asset_url' do around do |example| use_s3 = Rails.configuration.x.use_s3 diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb index 132c6c7586..8e2eec40fd 100644 --- a/spec/mailers/admin_mailer_spec.rb +++ b/spec/mailers/admin_mailer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AdminMailer, type: :mailer do +RSpec.describe AdminMailer do describe '.new_report' do let(:sender) { Fabricate(:account, username: 'John') } let(:recipient) { Fabricate(:account, username: 'Mike') } diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb index ab98bac388..3113d05c37 100644 --- a/spec/mailers/notification_mailer_spec.rb +++ b/spec/mailers/notification_mailer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe NotificationMailer, type: :mailer do +RSpec.describe NotificationMailer do let(:receiver) { Fabricate(:user) } let(:sender) { Fabricate(:account, username: 'bob') } let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') } diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 30824e7b4d..6144b2bbb8 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe UserMailer, type: :mailer do +describe UserMailer do let(:receiver) { Fabricate(:user) } shared_examples 'localized subject' do |*args, **kwrest| diff --git a/spec/models/account/field_spec.rb b/spec/models/account/field_spec.rb index 52183e5aa8..5715a53791 100644 --- a/spec/models/account/field_spec.rb +++ b/spec/models/account/field_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Account::Field, type: :model do +RSpec.describe Account::Field do describe '#verified?' do subject { described_class.new(account, 'name' => 'Foo', 'value' => 'Bar', 'verified_at' => verified_at) } diff --git a/spec/models/account_alias_spec.rb b/spec/models/account_alias_spec.rb index 08c3eaff43..f0cd274ea9 100644 --- a/spec/models/account_alias_spec.rb +++ b/spec/models/account_alias_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe AccountAlias, type: :model do +RSpec.describe AccountAlias do end diff --git a/spec/models/account_conversation_spec.rb b/spec/models/account_conversation_spec.rb index c4e8918ad2..a16aa500cf 100644 --- a/spec/models/account_conversation_spec.rb +++ b/spec/models/account_conversation_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AccountConversation, type: :model do +RSpec.describe AccountConversation do let!(:alice) { Fabricate(:account, username: 'alice') } let!(:bob) { Fabricate(:account, username: 'bob') } let!(:mark) { Fabricate(:account, username: 'mark') } diff --git a/spec/models/account_deletion_request_spec.rb b/spec/models/account_deletion_request_spec.rb index db332f14cb..8bbfb695d3 100644 --- a/spec/models/account_deletion_request_spec.rb +++ b/spec/models/account_deletion_request_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe AccountDeletionRequest, type: :model do +RSpec.describe AccountDeletionRequest do end diff --git a/spec/models/account_domain_block_spec.rb b/spec/models/account_domain_block_spec.rb index bc46f44ba7..f3246d04c5 100644 --- a/spec/models/account_domain_block_spec.rb +++ b/spec/models/account_domain_block_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AccountDomainBlock, type: :model do +RSpec.describe AccountDomainBlock do it 'removes blocking cache after creation' do account = Fabricate(:account) Rails.cache.write("exclude_domains_for:#{account.id}", 'a.domain.already.blocked') diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb index a91ba5dc56..0d97ea7e77 100644 --- a/spec/models/account_migration_spec.rb +++ b/spec/models/account_migration_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AccountMigration, type: :model do +RSpec.describe AccountMigration do describe 'validations' do let(:source_account) { Fabricate(:account) } let(:target_acct) { target_account.acct } diff --git a/spec/models/account_moderation_note_spec.rb b/spec/models/account_moderation_note_spec.rb index b7f5701e6a..9d683ca528 100644 --- a/spec/models/account_moderation_note_spec.rb +++ b/spec/models/account_moderation_note_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe AccountModerationNote, type: :model do +RSpec.describe AccountModerationNote do end diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 7ea3a94f5b..bbe35f5793 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Account, type: :model do +RSpec.describe Account do context do subject { Fabricate(:account) } diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb index dcdd97bda0..391b99ff47 100644 --- a/spec/models/account_statuses_cleanup_policy_spec.rb +++ b/spec/models/account_statuses_cleanup_policy_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe AccountStatusesCleanupPolicy, type: :model do +RSpec.describe AccountStatusesCleanupPolicy do let(:account) { Fabricate(:account, username: 'alice', domain: nil) } describe 'validation' do diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb index 1fc56efc7c..442815c889 100644 --- a/spec/models/admin/account_action_spec.rb +++ b/spec/models/admin/account_action_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::AccountAction, type: :model do +RSpec.describe Admin::AccountAction do let(:account_action) { described_class.new } describe '#save!' do diff --git a/spec/models/admin/action_log_spec.rb b/spec/models/admin/action_log_spec.rb index 3495cc5141..1e3649b833 100644 --- a/spec/models/admin/action_log_spec.rb +++ b/spec/models/admin/action_log_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Admin::ActionLog, type: :model do +RSpec.describe Admin::ActionLog do describe '#action' do it 'returns action' do action_log = described_class.new(action: 'hoge') diff --git a/spec/models/announcement_mute_spec.rb b/spec/models/announcement_mute_spec.rb index f4a7a5dc97..1937da3aa7 100644 --- a/spec/models/announcement_mute_spec.rb +++ b/spec/models/announcement_mute_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe AnnouncementMute, type: :model do +RSpec.describe AnnouncementMute do end diff --git a/spec/models/announcement_reaction_spec.rb b/spec/models/announcement_reaction_spec.rb index 38095b0154..43cc0e1489 100644 --- a/spec/models/announcement_reaction_spec.rb +++ b/spec/models/announcement_reaction_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe AnnouncementReaction, type: :model do +RSpec.describe AnnouncementReaction do end diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb index 024fa28880..32d398213c 100644 --- a/spec/models/announcement_spec.rb +++ b/spec/models/announcement_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Announcement, type: :model do +RSpec.describe Announcement do end diff --git a/spec/models/backup_spec.rb b/spec/models/backup_spec.rb index 239e7aef7b..1303117528 100644 --- a/spec/models/backup_spec.rb +++ b/spec/models/backup_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Backup, type: :model do +RSpec.describe Backup do end diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb index 6e31786d04..de3410fd58 100644 --- a/spec/models/block_spec.rb +++ b/spec/models/block_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Block, type: :model do +RSpec.describe Block do describe 'validations' do it 'is invalid without an account' do block = Fabricate.build(:block, account: nil) diff --git a/spec/models/canonical_email_block_spec.rb b/spec/models/canonical_email_block_spec.rb index 2b3fd6d6a7..0acff82377 100644 --- a/spec/models/canonical_email_block_spec.rb +++ b/spec/models/canonical_email_block_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe CanonicalEmailBlock, type: :model do +RSpec.describe CanonicalEmailBlock do describe '#email=' do let(:target_hash) { '973dfe463ec85785f5f95af5ba3906eedb2d931c24e69824a89ea65dba4e813b' } diff --git a/spec/models/conversation_mute_spec.rb b/spec/models/conversation_mute_spec.rb index 6439b0ecdf..3d5504a65c 100644 --- a/spec/models/conversation_mute_spec.rb +++ b/spec/models/conversation_mute_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe ConversationMute, type: :model do +RSpec.describe ConversationMute do end diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb index 9d58ad0ac6..c1d6659aa7 100644 --- a/spec/models/conversation_spec.rb +++ b/spec/models/conversation_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Conversation, type: :model do +RSpec.describe Conversation do describe '#local?' do it 'returns true when URI is nil' do expect(Fabricate(:conversation).local?).to be true diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb index a6e6cd7a58..8a6487c321 100644 --- a/spec/models/custom_emoji_spec.rb +++ b/spec/models/custom_emoji_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe CustomEmoji, type: :model do +RSpec.describe CustomEmoji do describe '#search' do subject { described_class.search(search_term) } diff --git a/spec/models/custom_filter_keyword_spec.rb b/spec/models/custom_filter_keyword_spec.rb index bbc4b9c2ee..09a36fa3ed 100644 --- a/spec/models/custom_filter_keyword_spec.rb +++ b/spec/models/custom_filter_keyword_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe CustomFilterKeyword, type: :model do +RSpec.describe CustomFilterKeyword do end diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb index d2bc090ab0..f5e9b7ea96 100644 --- a/spec/models/custom_filter_spec.rb +++ b/spec/models/custom_filter_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe CustomFilter, type: :model do +RSpec.describe CustomFilter do end diff --git a/spec/models/device_spec.rb b/spec/models/device_spec.rb index cb214b9cbc..4e7b8f2e20 100644 --- a/spec/models/device_spec.rb +++ b/spec/models/device_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Device, type: :model do +RSpec.describe Device do end diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb index 9839ee9d4e..f10f470279 100644 --- a/spec/models/domain_block_spec.rb +++ b/spec/models/domain_block_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe DomainBlock, type: :model do +RSpec.describe DomainBlock do describe 'validations' do it 'is invalid without a domain' do domain_block = Fabricate.build(:domain_block, domain: nil) diff --git a/spec/models/email_domain_block_spec.rb b/spec/models/email_domain_block_spec.rb index 1ae12b1ff8..a7232eb6b4 100644 --- a/spec/models/email_domain_block_spec.rb +++ b/spec/models/email_domain_block_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe EmailDomainBlock, type: :model do +RSpec.describe EmailDomainBlock do describe 'block?' do let(:input) { nil } diff --git a/spec/models/encrypted_message_spec.rb b/spec/models/encrypted_message_spec.rb index bf7a406ffd..c38142be1e 100644 --- a/spec/models/encrypted_message_spec.rb +++ b/spec/models/encrypted_message_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe EncryptedMessage, type: :model do +RSpec.describe EncryptedMessage do end diff --git a/spec/models/favourite_spec.rb b/spec/models/favourite_spec.rb index f7e2812a6c..9e69570a01 100644 --- a/spec/models/favourite_spec.rb +++ b/spec/models/favourite_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Favourite, type: :model do +RSpec.describe Favourite do let(:account) { Fabricate(:account) } context 'when status is a reblog' do diff --git a/spec/models/featured_tag_spec.rb b/spec/models/featured_tag_spec.rb index 4bf087c828..58865f94a5 100644 --- a/spec/models/featured_tag_spec.rb +++ b/spec/models/featured_tag_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe FeaturedTag, type: :model do +RSpec.describe FeaturedTag do end diff --git a/spec/models/follow_recommendation_suppression_spec.rb b/spec/models/follow_recommendation_suppression_spec.rb index 4c1d8281b2..d437d170d3 100644 --- a/spec/models/follow_recommendation_suppression_spec.rb +++ b/spec/models/follow_recommendation_suppression_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe FollowRecommendationSuppression, type: :model do +RSpec.describe FollowRecommendationSuppression do end diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb index 96d818913a..e413747852 100644 --- a/spec/models/follow_request_spec.rb +++ b/spec/models/follow_request_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe FollowRequest, type: :model do +RSpec.describe FollowRequest do describe '#authorize!' do let!(:follow_request) { Fabricate(:follow_request, account: account, target_account: target_account) } let(:account) { Fabricate(:account) } diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb index a9a9af88ad..79c0048f9f 100644 --- a/spec/models/follow_spec.rb +++ b/spec/models/follow_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Follow, type: :model do +RSpec.describe Follow do let(:alice) { Fabricate(:account, username: 'alice') } let(:bob) { Fabricate(:account, username: 'bob') } diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb index d7034f3f0b..bd649d8269 100644 --- a/spec/models/home_feed_spec.rb +++ b/spec/models/home_feed_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe HomeFeed, type: :model do +RSpec.describe HomeFeed do subject { described_class.new(account) } let(:account) { Fabricate(:account) } diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb index 6eab5a2e18..59155781c7 100644 --- a/spec/models/identity_spec.rb +++ b/spec/models/identity_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Identity, type: :model do +RSpec.describe Identity do describe '.find_for_oauth' do let(:auth) { Fabricate(:identity, user: Fabricate(:user)) } diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb index 106af4e0f7..1dae40a739 100644 --- a/spec/models/import_spec.rb +++ b/spec/models/import_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Import, type: :model do +RSpec.describe Import do let(:account) { Fabricate(:account) } let(:type) { 'following' } let(:data) { attachment_fixture('imports.txt') } diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb index dac4b6431b..4ad589f2c7 100644 --- a/spec/models/invite_spec.rb +++ b/spec/models/invite_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Invite, type: :model do +RSpec.describe Invite do describe '#valid_for_use?' do it 'returns true when there are no limitations' do invite = Fabricate(:invite, max_uses: nil, expires_at: nil) diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb index 8312defaca..c9853d4a04 100644 --- a/spec/models/list_account_spec.rb +++ b/spec/models/list_account_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe ListAccount, type: :model do +RSpec.describe ListAccount do end diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb index 8167f8a7ec..621ad3968d 100644 --- a/spec/models/list_spec.rb +++ b/spec/models/list_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe List, type: :model do +RSpec.describe List do end diff --git a/spec/models/login_activity_spec.rb b/spec/models/login_activity_spec.rb index 1c3111a20d..2214d3ef39 100644 --- a/spec/models/login_activity_spec.rb +++ b/spec/models/login_activity_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe LoginActivity, type: :model do +RSpec.describe LoginActivity do end diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb index c590de9be7..becc748244 100644 --- a/spec/models/media_attachment_spec.rb +++ b/spec/models/media_attachment_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe MediaAttachment, type: :model do +RSpec.describe MediaAttachment do describe 'local?' do subject { media_attachment.local? } diff --git a/spec/models/mention_spec.rb b/spec/models/mention_spec.rb index 044bb80cf6..b241049a54 100644 --- a/spec/models/mention_spec.rb +++ b/spec/models/mention_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Mention, type: :model do +RSpec.describe Mention do describe 'validations' do it 'is invalid without an account' do mention = Fabricate.build(:mention, account: nil) diff --git a/spec/models/mute_spec.rb b/spec/models/mute_spec.rb index 48b5a37ab9..050083d0f8 100644 --- a/spec/models/mute_spec.rb +++ b/spec/models/mute_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Mute, type: :model do +RSpec.describe Mute do end diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 0c6af3eeed..795491546c 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Notification, type: :model do +RSpec.describe Notification do describe '#target_status' do let(:notification) { Fabricate(:notification, activity: activity) } let(:status) { Fabricate(:status) } diff --git a/spec/models/poll_vote_spec.rb b/spec/models/poll_vote_spec.rb index 6886a82aa8..b017ea5279 100644 --- a/spec/models/poll_vote_spec.rb +++ b/spec/models/poll_vote_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe PollVote, type: :model do +RSpec.describe PollVote do describe '#object_type' do let(:poll_vote) { Fabricate.build(:poll_vote) } diff --git a/spec/models/preview_card_spec.rb b/spec/models/preview_card_spec.rb index 1858644c91..7d687d16ff 100644 --- a/spec/models/preview_card_spec.rb +++ b/spec/models/preview_card_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe PreviewCard, type: :model do +RSpec.describe PreviewCard do end diff --git a/spec/models/preview_card_trend_spec.rb b/spec/models/preview_card_trend_spec.rb index 97ad05e754..a31bf71cc0 100644 --- a/spec/models/preview_card_trend_spec.rb +++ b/spec/models/preview_card_trend_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe PreviewCardTrend, type: :model do +RSpec.describe PreviewCardTrend do end diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb index 5653aee184..53e01cafd3 100644 --- a/spec/models/public_feed_spec.rb +++ b/spec/models/public_feed_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe PublicFeed, type: :model do +RSpec.describe PublicFeed do let(:account) { Fabricate(:account) } describe '#get' do diff --git a/spec/models/relay_spec.rb b/spec/models/relay_spec.rb index 86c1762c15..7ed49e7334 100644 --- a/spec/models/relay_spec.rb +++ b/spec/models/relay_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Relay, type: :model do +RSpec.describe Relay do end diff --git a/spec/models/scheduled_status_spec.rb b/spec/models/scheduled_status_spec.rb index 294fa9f36c..286c17e696 100644 --- a/spec/models/scheduled_status_spec.rb +++ b/spec/models/scheduled_status_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe ScheduledStatus, type: :model do +RSpec.describe ScheduledStatus do end diff --git a/spec/models/session_activation_spec.rb b/spec/models/session_activation_spec.rb index 96411c3594..51c6aa5cb0 100644 --- a/spec/models/session_activation_spec.rb +++ b/spec/models/session_activation_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe SessionActivation, type: :model do +RSpec.describe SessionActivation do describe '#detection' do let(:session_activation) { Fabricate(:session_activation, user_agent: 'Chrome/62.0.3202.89') } diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb index 9b4d98da55..accce10f86 100644 --- a/spec/models/setting_spec.rb +++ b/spec/models/setting_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Setting, type: :model do +RSpec.describe Setting do describe '#to_param' do let(:setting) { Fabricate(:setting, var: var) } let(:var) { 'var' } diff --git a/spec/models/site_upload_spec.rb b/spec/models/site_upload_spec.rb index f7ea069213..d4a9293115 100644 --- a/spec/models/site_upload_spec.rb +++ b/spec/models/site_upload_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe SiteUpload, type: :model do +RSpec.describe SiteUpload do describe '#cache_key' do let(:site_upload) { SiteUpload.new(var: 'var') } diff --git a/spec/models/status_pin_spec.rb b/spec/models/status_pin_spec.rb index c4ebf96da9..52ce0847c4 100644 --- a/spec/models/status_pin_spec.rb +++ b/spec/models/status_pin_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe StatusPin, type: :model do +RSpec.describe StatusPin do describe 'validations' do it 'allows pins of own statuses' do account = Fabricate(:account) diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index 243d85c847..84ff82c789 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Status, type: :model do +RSpec.describe Status do subject { Fabricate(:status, account: alice) } let(:alice) { Fabricate(:account, username: 'alice') } diff --git a/spec/models/status_stat_spec.rb b/spec/models/status_stat_spec.rb index 749ca097d6..9679c836a7 100644 --- a/spec/models/status_stat_spec.rb +++ b/spec/models/status_stat_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe StatusStat, type: :model do +RSpec.describe StatusStat do end diff --git a/spec/models/status_trend_spec.rb b/spec/models/status_trend_spec.rb index 9678b838a7..dbb3d4bb3f 100644 --- a/spec/models/status_trend_spec.rb +++ b/spec/models/status_trend_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe StatusTrend, type: :model do +RSpec.describe StatusTrend do end diff --git a/spec/models/system_key_spec.rb b/spec/models/system_key_spec.rb index a4e8b77844..5bd630aaa5 100644 --- a/spec/models/system_key_spec.rb +++ b/spec/models/system_key_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe SystemKey, type: :model do +RSpec.describe SystemKey do end diff --git a/spec/models/tag_follow_spec.rb b/spec/models/tag_follow_spec.rb index 88409bb28a..240147ecc8 100644 --- a/spec/models/tag_follow_spec.rb +++ b/spec/models/tag_follow_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe TagFollow, type: :model do +RSpec.describe TagFollow do end diff --git a/spec/models/unavailable_domain_spec.rb b/spec/models/unavailable_domain_spec.rb index 5469ff6939..b868779f2b 100644 --- a/spec/models/unavailable_domain_spec.rb +++ b/spec/models/unavailable_domain_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe UnavailableDomain, type: :model do +RSpec.describe UnavailableDomain do end diff --git a/spec/models/user_invite_request_spec.rb b/spec/models/user_invite_request_spec.rb index 95e1284399..ee0efbb431 100644 --- a/spec/models/user_invite_request_spec.rb +++ b/spec/models/user_invite_request_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe UserInviteRequest, type: :model do +RSpec.describe UserInviteRequest do end diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb index 97456c1060..16bb4358e6 100644 --- a/spec/models/user_role_spec.rb +++ b/spec/models/user_role_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe UserRole, type: :model do +RSpec.describe UserRole do subject { described_class.create(name: 'Foo', position: 1) } describe '#can?' do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index b7754e9265..ae46f0ae45 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' require 'devise_two_factor/spec_helpers' -RSpec.describe User, type: :model do +RSpec.describe User do let(:password) { 'abcd1234' } let(:account) { Fabricate(:account, username: 'alice') } diff --git a/spec/models/web/push_subscription_spec.rb b/spec/models/web/push_subscription_spec.rb index 0f9b331402..3c2cd3bac1 100644 --- a/spec/models/web/push_subscription_spec.rb +++ b/spec/models/web/push_subscription_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Web::PushSubscription, type: :model do +RSpec.describe Web::PushSubscription do subject { described_class.new(data: data) } let(:account) { Fabricate(:account) } diff --git a/spec/models/web/setting_spec.rb b/spec/models/web/setting_spec.rb index b7ff3c8684..3182c67217 100644 --- a/spec/models/web/setting_spec.rb +++ b/spec/models/web/setting_spec.rb @@ -2,5 +2,5 @@ require 'rails_helper' -RSpec.describe Web::Setting, type: :model do +RSpec.describe Web::Setting do end diff --git a/spec/models/webauthn_credentials_spec.rb b/spec/models/webauthn_credentials_spec.rb index 1a2a2f9099..4579ebb82e 100644 --- a/spec/models/webauthn_credentials_spec.rb +++ b/spec/models/webauthn_credentials_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe WebauthnCredential, type: :model do +RSpec.describe WebauthnCredential do describe 'validations' do it 'is invalid without an external id' do webauthn_credential = Fabricate.build(:webauthn_credential, external_id: nil) diff --git a/spec/models/webhook_spec.rb b/spec/models/webhook_spec.rb index fcf3dd14ff..715dd7574f 100644 --- a/spec/models/webhook_spec.rb +++ b/spec/models/webhook_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe Webhook, type: :model do +RSpec.describe Webhook do let(:webhook) { Fabricate(:webhook) } describe '#rotate_secret!' do