about summary refs log tree commit diff
path: root/spec/models
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-03-19 23:48:47 +0100
committerGitHub <noreply@github.com>2021-03-19 23:48:47 +0100
commit051efed5edd544b4f88c63a1038274ae2db30038 (patch)
tree6921fb5734d0faaeb7b62f2267a54951859a879f /spec/models
parentd023eefbcc1e6c2221a53484e58e61ac12eaa1d4 (diff)
Bypass MX validation for explicitly allowed domains (#15930)
* Bypass MX validation for explicitly allowed domains

This spares some lookups and prevent issues in some edge cases with
local domains.

* Add tests

* Fix test
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/user_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cded4c99b..1dae43536 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -206,7 +206,7 @@ RSpec.describe User, type: :model do
 
   describe 'whitelist' do
     around(:each) do |example|
-      old_whitelist = Rails.configuration.x.email_whitelist
+      old_whitelist = Rails.configuration.x.email_domains_whitelist
 
       Rails.configuration.x.email_domains_whitelist = 'mastodon.space'