mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 17:35:40 +01:00
Add DomainHelpers
spec support module for DNS/MX stub (#32690)
This commit is contained in:
parent
de1d8dc63a
commit
df3b954720
4 changed files with 47 additions and 22 deletions
|
@ -233,17 +233,7 @@ RSpec.describe Auth::RegistrationsController do
|
||||||
Setting.registrations_mode = 'open'
|
Setting.registrations_mode = 'open'
|
||||||
Fabricate(:email_domain_block, allow_with_approval: true, domain: 'mail.example.com')
|
Fabricate(:email_domain_block, allow_with_approval: true, domain: 'mail.example.com')
|
||||||
allow(User).to receive(:skip_mx_check?).and_return(false)
|
allow(User).to receive(:skip_mx_check?).and_return(false)
|
||||||
|
configure_mx(domain: 'example.com', exchange: 'mail.example.com')
|
||||||
resolver = instance_double(Resolv::DNS, :timeouts= => nil)
|
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources)
|
|
||||||
.with('example.com', Resolv::DNS::Resource::IN::MX)
|
|
||||||
.and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
|
|
||||||
allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates unapproved user and redirects to setup' do
|
it 'creates unapproved user and redirects to setup' do
|
||||||
|
|
|
@ -113,6 +113,7 @@ RSpec.configure do |config|
|
||||||
config.include ActiveSupport::Testing::TimeHelpers
|
config.include ActiveSupport::Testing::TimeHelpers
|
||||||
config.include Chewy::Rspec::Helpers
|
config.include Chewy::Rspec::Helpers
|
||||||
config.include Redisable
|
config.include Redisable
|
||||||
|
config.include DomainHelpers
|
||||||
config.include ThreadingHelpers
|
config.include ThreadingHelpers
|
||||||
config.include SignedRequestHelpers, type: :request
|
config.include SignedRequestHelpers, type: :request
|
||||||
config.include CommandLineHelpers, type: :cli
|
config.include CommandLineHelpers, type: :cli
|
||||||
|
|
|
@ -53,17 +53,7 @@ RSpec.describe AppSignUpService do
|
||||||
Setting.registrations_mode = 'open'
|
Setting.registrations_mode = 'open'
|
||||||
Fabricate(:email_domain_block, allow_with_approval: true, domain: 'smtp.email.com')
|
Fabricate(:email_domain_block, allow_with_approval: true, domain: 'smtp.email.com')
|
||||||
allow(User).to receive(:skip_mx_check?).and_return(false)
|
allow(User).to receive(:skip_mx_check?).and_return(false)
|
||||||
|
configure_mx(domain: 'email.com', exchange: 'smtp.email.com')
|
||||||
resolver = instance_double(Resolv::DNS, :timeouts= => nil)
|
|
||||||
|
|
||||||
allow(resolver).to receive(:getresources)
|
|
||||||
.with('email.com', Resolv::DNS::Resource::IN::MX)
|
|
||||||
.and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'smtp.email.com')])
|
|
||||||
allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::A).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
|
|
||||||
allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
|
|
||||||
allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
|
|
||||||
allow(Resolv::DNS).to receive(:open).and_yield(resolver)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates an unapproved user', :aggregate_failures do
|
it 'creates an unapproved user', :aggregate_failures do
|
||||||
|
|
44
spec/support/domain_helpers.rb
Normal file
44
spec/support/domain_helpers.rb
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
module DomainHelpers
|
||||||
|
def configure_mx(domain:, exchange:, ip_v4_addr: '2.3.4.5', ip_v6_addr: 'fd00::2')
|
||||||
|
resolver = instance_double(Resolv::DNS, :timeouts= => nil)
|
||||||
|
|
||||||
|
allow(resolver).to receive(:getresources)
|
||||||
|
.with(domain, Resolv::DNS::Resource::IN::MX)
|
||||||
|
.and_return([double_mx(exchange)])
|
||||||
|
allow(resolver)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(domain, Resolv::DNS::Resource::IN::A)
|
||||||
|
.and_return([])
|
||||||
|
allow(resolver)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(domain, Resolv::DNS::Resource::IN::AAAA)
|
||||||
|
.and_return([])
|
||||||
|
allow(resolver)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(exchange, Resolv::DNS::Resource::IN::A)
|
||||||
|
.and_return([double_resource_v4(ip_v4_addr)])
|
||||||
|
allow(resolver)
|
||||||
|
.to receive(:getresources)
|
||||||
|
.with(exchange, Resolv::DNS::Resource::IN::AAAA)
|
||||||
|
.and_return([double_resource_v6(ip_v6_addr)])
|
||||||
|
allow(Resolv::DNS)
|
||||||
|
.to receive(:open)
|
||||||
|
.and_yield(resolver)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def double_mx(exchange)
|
||||||
|
instance_double(Resolv::DNS::Resource::MX, exchange: exchange)
|
||||||
|
end
|
||||||
|
|
||||||
|
def double_resource_v4(addr)
|
||||||
|
instance_double(Resolv::DNS::Resource::IN::A, address: addr)
|
||||||
|
end
|
||||||
|
|
||||||
|
def double_resource_v6(addr)
|
||||||
|
instance_double(Resolv::DNS::Resource::IN::AAAA, address: addr)
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue