M .rubocop_todo.yml => .rubocop_todo.yml +0 -9
@@ 556,15 556,6 @@ RSpec/PendingWithoutReason:
Exclude:
- 'spec/models/account_spec.rb'
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
-# SupportedStyles: inflected, explicit
-RSpec/PredicateMatcher:
- Exclude:
- - 'spec/controllers/api/v1/accounts/notes_controller_spec.rb'
- - 'spec/models/user_spec.rb'
- - 'spec/services/post_status_service_spec.rb'
-
RSpec/StubbedMock:
Exclude:
- 'spec/controllers/api/base_controller_spec.rb'
M spec/controllers/api/v1/accounts/notes_controller_spec.rb => spec/controllers/api/v1/accounts/notes_controller_spec.rb +1 -1
@@ 43,7 43,7 @@ describe Api::V1::Accounts::NotesController do
it 'does not create account note' do
subject
- expect(AccountNote.where(account_id: user.account.id, target_account_id: account.id).exists?).to be_falsey
+ expect(AccountNote.where(account_id: user.account.id, target_account_id: account.id)).to_not exist
end
end
end
M spec/models/user_spec.rb => spec/models/user_spec.rb +7 -7
@@ 115,19 115,19 @@ RSpec.describe User do
it 'allows a non-blacklisted user to be created' do
user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
- expect(user.valid?).to be_truthy
+ expect(user).to be_valid
end
it 'does not allow a blacklisted user to be created' do
user = User.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
- expect(user.valid?).to be_falsey
+ expect(user).to_not be_valid
end
it 'does not allow a subdomain blacklisted user to be created' do
user = User.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
- expect(user.valid?).to be_falsey
+ expect(user).to_not be_valid
end
end
@@ 350,17 350,17 @@ RSpec.describe User do
it 'does not allow a user to be created unless they are whitelisted' do
user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
- expect(user.valid?).to be_falsey
+ expect(user).to_not be_valid
end
it 'allows a user to be created if they are whitelisted' do
user = User.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
- expect(user.valid?).to be_truthy
+ expect(user).to be_valid
end
it 'does not allow a user with a whitelisted top domain as subdomain in their email address to be created' do
user = User.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
- expect(user.valid?).to be_falsey
+ expect(user).to_not be_valid
end
context do
@@ 374,7 374,7 @@ RSpec.describe User do
Rails.configuration.x.email_domains_blacklist = 'blacklisted.mastodon.space'
user = User.new(email: 'foo@blacklisted.mastodon.space', account: account, password: password)
- expect(user.valid?).to be_falsey
+ expect(user).to_not be_valid
end
end
end
M spec/services/post_status_service_spec.rb => spec/services/post_status_service_spec.rb +1 -1
@@ 48,7 48,7 @@ RSpec.describe PostStatusService, type: :service do
expect(status.params['text']).to eq 'Hi future!'
expect(status.params['media_ids']).to eq [media.id]
expect(media.reload.status).to be_nil
- expect(Status.where(text: 'Hi future!').exists?).to be_falsey
+ expect(Status.where(text: 'Hi future!')).to_not exist
end
it 'does not change statuses count' do