diff --git a/spec/controllers/api/v1/circles/statuses_controller_spec.rb b/spec/controllers/api/v1/circles/statuses_controller_spec.rb index 2a323aa0f8..5921f468bf 100644 --- a/spec/controllers/api/v1/circles/statuses_controller_spec.rb +++ b/spec/controllers/api/v1/circles/statuses_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Api::V1::Circles::StatusesController do +RSpec.describe Api::V1::Circles::StatusesController 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 ed4edbf760..62cf53a09f 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' -describe Api::V1::ListsController do +RSpec.describe Api::V1::ListsController do render_views let(:user) { Fabricate(:user) } diff --git a/spec/models/admin/ng_rule_spec.rb b/spec/models/admin/ng_rule_spec.rb index 8e04bc1696..fb85e6e9bb 100644 --- a/spec/models/admin/ng_rule_spec.rb +++ b/spec/models/admin/ng_rule_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe Admin::NgRule do +RSpec.describe Admin::NgRule do shared_examples 'matches rule' do |reason| it 'matches and history is added' do expect(subject).to be false diff --git a/spec/models/friend_domain_spec.rb b/spec/models/friend_domain_spec.rb index 98dcb9cd90..336f921ebd 100644 --- a/spec/models/friend_domain_spec.rb +++ b/spec/models/friend_domain_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe FriendDomain do +RSpec.describe FriendDomain do let(:friend) { Fabricate(:friend_domain, domain: 'foo.bar', inbox_url: 'https://foo.bar/inbox') } before do diff --git a/spec/requests/api/v1/timelines/antenna_spec.rb b/spec/requests/api/v1/timelines/antenna_spec.rb index 7b35cf2fa9..263fd450ec 100644 --- a/spec/requests/api/v1/timelines/antenna_spec.rb +++ b/spec/requests/api/v1/timelines/antenna_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe 'API V1 Timelines Antenna' do +RSpec.describe 'API V1 Timelines Antenna' do let(:user) { Fabricate(:user) } let(:scopes) { 'read:statuses' } let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } diff --git a/spec/requests/user_custom_css_spec.rb b/spec/requests/user_custom_css_spec.rb index a36afc0e6e..5ef01a7392 100644 --- a/spec/requests/user_custom_css_spec.rb +++ b/spec/requests/user_custom_css_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe 'User custom CSS' do +RSpec.describe 'User custom CSS' do let(:user) { Fabricate(:user) } let(:custom_css) { '* { display: none !important; }' } diff --git a/spec/search/services/statuses_search_service_spec.rb b/spec/search/services/statuses_search_service_spec.rb index abbe28f715..d1951658d5 100644 --- a/spec/search/services/statuses_search_service_spec.rb +++ b/spec/search/services/statuses_search_service_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe StatusesSearchService do +RSpec.describe StatusesSearchService do describe 'a local user posts with searchability' do subject do described_class.new.call('ohagi', account, limit: 10, searchability: searchability).map(&:id) diff --git a/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb b/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb index 5666f4ed49..6bcdd7978e 100644 --- a/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb +++ b/spec/serializers/activitypub/note_for_misskey_serializer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ActivityPub::NoteForMisskeySerializer do +RSpec.describe ActivityPub::NoteForMisskeySerializer do subject { JSON.parse(serialization.to_json) } let(:serialization) { ActiveModelSerializers::SerializableResource.new(parent, serializer: described_class, adapter: ActivityPub::Adapter) } diff --git a/spec/serializers/node_info/serializer_spec.rb b/spec/serializers/node_info/serializer_spec.rb index 2c7074368c..da7a6bcebb 100644 --- a/spec/serializers/node_info/serializer_spec.rb +++ b/spec/serializers/node_info/serializer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe NodeInfo::Serializer do +RSpec.describe NodeInfo::Serializer do let(:serialization) do JSON.parse( ActiveModelSerializers::SerializableResource.new( diff --git a/spec/serializers/rest/custom_emoji_serializer_spec.rb b/spec/serializers/rest/custom_emoji_serializer_spec.rb index d1806fd0c0..10f84278af 100644 --- a/spec/serializers/rest/custom_emoji_serializer_spec.rb +++ b/spec/serializers/rest/custom_emoji_serializer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe REST::CustomEmojiSerializer do +RSpec.describe REST::CustomEmojiSerializer do let(:serialization) { serialized_record_json(record, described_class) } let(:record) do Fabricate(:custom_emoji, shortcode: 'ohagi', aliases: aliases) diff --git a/spec/workers/activitypub/fetch_instance_info_worker_spec.rb b/spec/workers/activitypub/fetch_instance_info_worker_spec.rb index 9dc9594041..4ce1fdf519 100644 --- a/spec/workers/activitypub/fetch_instance_info_worker_spec.rb +++ b/spec/workers/activitypub/fetch_instance_info_worker_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ActivityPub::FetchInstanceInfoWorker do +RSpec.describe ActivityPub::FetchInstanceInfoWorker do subject { described_class.new } let(:wellknown_nodeinfo) do diff --git a/spec/workers/activitypub/fetch_remote_status_worker_spec.rb b/spec/workers/activitypub/fetch_remote_status_worker_spec.rb index 6336c21558..a5ab71a2c3 100644 --- a/spec/workers/activitypub/fetch_remote_status_worker_spec.rb +++ b/spec/workers/activitypub/fetch_remote_status_worker_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ActivityPub::FetchRemoteStatusWorker do +RSpec.describe ActivityPub::FetchRemoteStatusWorker do subject { described_class.new } let(:sender) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') } diff --git a/spec/workers/process_references_worker_spec.rb b/spec/workers/process_references_worker_spec.rb index 10a2bc68f9..3184f50977 100644 --- a/spec/workers/process_references_worker_spec.rb +++ b/spec/workers/process_references_worker_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe ProcessReferencesWorker do +RSpec.describe ProcessReferencesWorker do let(:worker) { described_class.new } describe 'perform' do