Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/support/dns.rb b/spec/support/dns.rb
new file mode 100644
index 00000000000..3e5c8e698e1
--- /dev/null
+++ b/spec/support/dns.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require Rails.root.join("spec/support/helpers/dns_helpers")
+
+RSpec.configure do |config|
+  config.include DnsHelpers
+
+  config.before do
+    block_dns!
+  end
+
+  config.before(:each, :permit_dns) do
+    permit_dns!
+  end
+
+  config.before(:each, :stub_invalid_dns_only) do
+    permit_dns!
+    stub_invalid_dns!
+  end
+end