diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d64dce2..36812ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,7 @@ jobs: strategy: matrix: ruby-version: + - '3.2' - '3.1' - '3.0' - '2.7' @@ -27,7 +28,7 @@ jobs: - 6379:6379 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby ${{ matrix.ruby-version }} uses: ruby/setup-ruby@v1 with: diff --git a/lib/database_cleaner/safeguard.rb b/lib/database_cleaner/safeguard.rb index 353d0a7..2664679 100644 --- a/lib/database_cleaner/safeguard.rb +++ b/lib/database_cleaner/safeguard.rb @@ -53,12 +53,11 @@ module DatabaseCleaner def remote?(url) return false unless url - parsed = URI.parse(url) return false if parsed.scheme == 'sqlite3:' host = parsed.host - return false unless host + return false if host.nil? || host.empty? return false if LOCAL.include?(host) return false if host.end_with? '.local' true diff --git a/spec/database_cleaner/cleaner_spec.rb b/spec/database_cleaner/cleaner_spec.rb index 8b62da1..1ae74df 100644 --- a/spec/database_cleaner/cleaner_spec.rb +++ b/spec/database_cleaner/cleaner_spec.rb @@ -98,7 +98,7 @@ module DatabaseCleaner end it "should pass all arguments to strategy initializer" do - expect(strategy_class).to receive(:new).with(:dollar, :amet, ipsum: "random").and_return(strategy) + expect(strategy_class).to receive(:new).with(:dollar, :amet, { ipsum: "random" }).and_return(strategy) expect(strategy).to receive(:clean) cleaner.clean_with :truncation, :dollar, :amet, ipsum: "random" end @@ -145,12 +145,12 @@ module DatabaseCleaner end it "should proxy params with symbolised strategies in an array" do - expect(strategy_class).to receive(:new).with(param: "one") + expect(strategy_class).to receive(:new).with({ param: "one" }) cleaner.strategy = [:truncation, param: "one"] end it "should proxy params with symbolised strategies in a separate hash" do - expect(strategy_class).to receive(:new).with(param: "one") + expect(strategy_class).to receive(:new).with({ param: "one" }) cleaner.strategy = :truncation, { param: "one" } end