Support regular expressions in allowlist

DatabaseCleaner · Jun 30, 2020 · b1dbfe3 · b1dbfe3
1 parent 855abc9
commit b1dbfe3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/database_cleaner/safeguard.rb b/lib/database_cleaner/safeguard.rb
@@ -29,7 +29,7 @@ def run
       private
 
         def database_url_not_allowed?
-          !DatabaseCleaner.url_allowlist.include?(ENV['DATABASE_URL'])
+          !DatabaseCleaner.url_allowlist.any? {|allowed| allowed.match?(ENV['DATABASE_URL']) }
         end
 
         def skip?

diff --git a/spec/database_cleaner/safeguard_spec.rb b/spec/database_cleaner/safeguard_spec.rb
@@ -91,6 +91,14 @@ module DatabaseCleaner
             end
           end
 
+          describe 'A remote url matches a pattern on the allowlist' do
+            let(:database_url) { 'postgres://bar.baz?pool=16' }
+
+            it 'does not raise' do
+              expect { cleaner.start }.to_not raise_error
+            end
+          end
+
           describe 'A local url is on the allowlist' do
             let(:database_url) { 'postgres://postgres@localhost' }
 
@@ -108,7 +116,7 @@ module DatabaseCleaner
           end
         end
 
-        let(:url_allowlist) { ['postgres://postgres@localhost', 'postgres://foo.bar'] }
+        let(:url_allowlist) { ['postgres://postgres@localhost', 'postgres://foo.bar', %r{^postgres://bar.baz}] }
 
         describe 'url_allowlist' do
           before { DatabaseCleaner.url_allowlist = url_allowlist }