mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 05:11:53 +01:00
Fix RSpec/SubjectStub
cop (#25550)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
parent
7824df0eca
commit
74806deb2c
3 changed files with 9 additions and 11 deletions
|
@ -409,11 +409,6 @@ RSpec/StubbedMock:
|
||||||
- 'spec/lib/webfinger_resource_spec.rb'
|
- 'spec/lib/webfinger_resource_spec.rb'
|
||||||
- 'spec/services/activitypub/process_collection_service_spec.rb'
|
- 'spec/services/activitypub/process_collection_service_spec.rb'
|
||||||
|
|
||||||
RSpec/SubjectStub:
|
|
||||||
Exclude:
|
|
||||||
- 'spec/services/unallow_domain_service_spec.rb'
|
|
||||||
- 'spec/validators/blacklisted_email_validator_spec.rb'
|
|
||||||
|
|
||||||
# This cop supports unsafe autocorrection (--autocorrect-all).
|
# This cop supports unsafe autocorrection (--autocorrect-all).
|
||||||
Rails/ApplicationController:
|
Rails/ApplicationController:
|
||||||
Exclude:
|
Exclude:
|
||||||
|
|
|
@ -14,7 +14,7 @@ RSpec.describe UnallowDomainService, type: :service do
|
||||||
|
|
||||||
context 'with limited federation mode' do
|
context 'with limited federation mode' do
|
||||||
before do
|
before do
|
||||||
allow(subject).to receive(:whitelist_mode?).and_return(true)
|
allow(Rails.configuration.x).to receive(:whitelist_mode).and_return(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#call' do
|
describe '#call' do
|
||||||
|
@ -40,7 +40,7 @@ RSpec.describe UnallowDomainService, type: :service do
|
||||||
|
|
||||||
context 'without limited federation mode' do
|
context 'without limited federation mode' do
|
||||||
before do
|
before do
|
||||||
allow(subject).to receive(:whitelist_mode?).and_return(false)
|
allow(Rails.configuration.x).to receive(:whitelist_mode).and_return(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#call' do
|
describe '#call' do
|
||||||
|
|
|
@ -11,14 +11,15 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
|
||||||
|
|
||||||
before do
|
before do
|
||||||
allow(user).to receive(:valid_invitation?).and_return(false)
|
allow(user).to receive(:valid_invitation?).and_return(false)
|
||||||
allow_any_instance_of(described_class).to receive(:blocked_email_provider?) { blocked_email }
|
allow(EmailDomainBlock).to receive(:block?) { blocked_email }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when e-mail provider is blocked' do
|
context 'when e-mail provider is blocked' do
|
||||||
let(:blocked_email) { true }
|
let(:blocked_email) { true }
|
||||||
|
|
||||||
it 'adds error' do
|
it 'adds error' do
|
||||||
expect(subject).to have_received(:add).with(:email, :blocked)
|
described_class.new.validate(user)
|
||||||
|
expect(errors).to have_received(:add).with(:email, :blocked).once
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -26,7 +27,8 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
|
||||||
let(:blocked_email) { false }
|
let(:blocked_email) { false }
|
||||||
|
|
||||||
it 'does not add errors' do
|
it 'does not add errors' do
|
||||||
expect(subject).to_not have_received(:add).with(:email, :blocked)
|
described_class.new.validate(user)
|
||||||
|
expect(errors).to_not have_received(:add)
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when canonical e-mail is blocked' do
|
context 'when canonical e-mail is blocked' do
|
||||||
|
@ -37,7 +39,8 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'adds error' do
|
it 'adds error' do
|
||||||
expect(subject).to have_received(:add).with(:email, :taken)
|
described_class.new.validate(user)
|
||||||
|
expect(errors).to have_received(:add).with(:email, :taken).once
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue