Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into anya/autofill-neve…
Browse files Browse the repository at this point in the history
…r-prompt-save

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
  • Loading branch information
amddg44 committed Nov 9, 2023
2 parents 02260a9 + aa7c242 commit 5f0d5ca
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions IntegrationTests/ContentBlockingRulesTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ class ContentBlockingRulesTests: XCTestCase {
andTemporaryUnprotectedDomains: [])

// Test tracker is set up to be blocked
if let rule = rules.findExactFilter(filter: "^(https?)?(wss?)?://([a-z0-9-]+\\.)*googleadservices\\.com(:?[0-9]+)?/.*") {
if let rule = rules.findExactFilter(filter: "^(https?)?(wss?)?://([a-z0-9-]+\\.)*bad\\.third-party\\.site(:?[0-9]+)?/.*") {
XCTAssert(rule.action == .block())
} else {
XCTFail("Missing google ad services rule")
XCTFail("Missing tracking rule")
}

// Test exceptiions are set to ignore previous rules
Expand Down

0 comments on commit 5f0d5ca

Please sign in to comment.