Lint. Add test to assert new rule

duckduckgo · Dec 5, 2023 · 30394ce · 30394ce
1 parent dfe029e
commit 30394ce
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/Sources/TrackerRadarKit/ContentBlockerRule.swift b/Sources/TrackerRadarKit/ContentBlockerRule.swift
@@ -66,7 +66,8 @@ public struct ContentBlockerRule: Codable, Hashable {
             case loadContext = "load-context"
         }
 
-        private init(urlFilter: String, unlessDomain: [String]?, ifDomain: [String]?, resourceType: [ResourceType]?, loadType: [LoadType]?, loadContext: [LoadContext]?) {
+        private init(urlFilter: String, unlessDomain: [String]?, ifDomain: [String]?, 
+                     resourceType: [ResourceType]?, loadType: [LoadType]?, loadContext: [LoadContext]?) {
             self.urlFilter = urlFilter
             self.unlessDomain = unlessDomain
             self.ifDomain = ifDomain
@@ -106,7 +107,8 @@ public struct ContentBlockerRule: Codable, Hashable {
                                    resourceType types: [ResourceType]?,
                                    loadTypes: [LoadType]? = [ .thirdParty ],
                                    loadContext: [LoadContext]? = nil) -> Trigger {
-            return Trigger(urlFilter: filter, unlessDomain: nil, ifDomain: domains, resourceType: types, loadType: loadTypes, loadContext: loadContext)
+            return Trigger(urlFilter: filter, unlessDomain: nil, ifDomain: domains,
+                           resourceType: types, loadType: loadTypes, loadContext: loadContext)
         }
     }
 

diff --git a/Tests/TrackerRadarKitTests/ContentBlockerRulesBuilderTests.swift b/Tests/TrackerRadarKitTests/ContentBlockerRulesBuilderTests.swift
@@ -47,6 +47,21 @@ class ContentBlockerRulesBuilderTests: XCTestCase {
         }
     }
 
+    func testDefaultIgnoreGeneratesPopupIgnoreRules() throws {
+        let rules = ContentBlockerRulesBuilder(trackerData: trackerData).buildRules(withExceptions: ["duckduckgo.com"],
+        andTemporaryUnprotectedDomains: [])
+
+        if let idx = rules.firstIndexOfExactFilter(filter: "^(https?)?(wss?)?://([a-z0-9-]+\\.)*xvideos-cdn\\.com\\/v-c19d94e7937\\/v3\\/js\\/skins\\/min\\/default\\.header\\.static\\.js") {
+            let nextRule = rules[idx + 1]
+            XCTAssertNotNil(nextRule, "Missing ignore-previous popup type rule")
+            XCTAssert(nextRule.action == .ignorePreviousRules())
+            XCTAssert(nextRule.trigger.loadContext?.first == .topFrame)
+            XCTAssert(nextRule.trigger.resourceType?.first == .popup)
+        } else {
+            XCTFail("Missing rule for testing")
+        }
+    }
+
     func testLoadingUnsupportedRules() throws {
         let data = JSONTestDataLoader.mockTrackerData
         guard let mockData = try? JSONDecoder().decode(TrackerData.self, from: data) else {

diff --git a/Tests/TrackerRadarKitTests/Test Utilities/ArrayExtensions.swift b/Tests/TrackerRadarKitTests/Test Utilities/ArrayExtensions.swift
@@ -35,4 +35,8 @@ extension Array where Element == ContentBlockerRule {
 
         return nil
     }
+
+    func firstIndexOfExactFilter(filter: String) -> Int? {
+        self.firstIndex { $0.trigger.urlFilter == filter }
+    }
 }