Merge branch 'master' into fix/AG-8223

Author: tvinzz

Tests/ContentBlockerConverterTests/ContentBlockerConverterTests.swift

@@ -1605,7 +1605,7 @@ final class ContentBlockerConverterTests: XCTestCase {
         XCTAssertEqual(decoded[0].action.type, "scriptlet");
         XCTAssertEqual(decoded[0].action.scriptlet, "abort-on-property-read");
     }
-    
+
     func testOptimizeRules() {
         var result = converter.convertArray(rules: [
             "example.org##.banner1",
@@ -1614,66 +1614,66 @@ final class ContentBlockerConverterTests: XCTestCase {
             "example.org##.banner4",
             "example.org##.banner5",
         ], safariVersion: SafariVersion.safari14, optimize: true, advancedBlocking: false);
-        
+
         // 5 cosmetic rules with same domain optimized in 1 rule
         XCTAssertEqual(result.convertedCount, 1);
-        
+
         result = converter.convertArray(rules: [
             "example.org##.banner",
             "example.org##.banner",
             "example.org##.banner",
             "example.org##.banner",
             "example.org##.banner",
         ], safariVersion: SafariVersion.safari14, optimize: true, advancedBlocking: false);
-        
+
         // 5 similar cosmetic rules domain optimized in 1 rule (removed duplicates)
         XCTAssertEqual(result.convertedCount, 1);
-        
+
         result = converter.convertArray(rules: [
             "example1.org##.banner",
             "example2.org##.banner",
             "example3.org##.banner",
             "example4.org##.banner",
             "example5.org##.banner",
         ], safariVersion: SafariVersion.safari14, optimize: true, advancedBlocking: false);
-        
+
         // cosmetic rules with different domain but same selector didn't optimized
         XCTAssertEqual(result.convertedCount, 5);
-        
+
         result = converter.convertArray(rules: [
             "||example1.org",
             "||example2.org",
             "||example3.org",
             "||example4.org",
             "||example5.org",
         ], safariVersion: SafariVersion.safari14, optimize: true, advancedBlocking: false);
-        
+
         // blocking rules didn't optimized
         XCTAssertEqual(result.convertedCount, 5);
-        
+
         result = converter.convertArray(rules: [
             "||example.org",
             "||example.org",
             "||example.org",
             "||example.org",
             "||example.org",
         ], safariVersion: SafariVersion.safari14, optimize: true, advancedBlocking: false);
-        
+
         // similar blocking rules didn't optimized
         XCTAssertEqual(result.convertedCount, 5);
-        
+
         result = converter.convertArray(rules: [
             "@@||*$document,domain=~example.org",
             "@@||*$document,domain=~example.org",
             "@@||*$document,domain=~example.org",
             "@@||*$document,domain=~example.org",
             "@@||*$document,domain=~example.org",
         ], safariVersion: SafariVersion.safari14, optimize: true, advancedBlocking: false);
-        
+
         // similar inverted allowlist rules didn't optimized
         XCTAssertEqual(result.convertedCount, 5);
     }
-    
+
     func testLoadContext() {
         var  rules = ["||test.com^$subdocument,domain=example.com"];
         var result = converter.convertArray(rules: rules, safariVersion: .safari15);
@@ -1682,7 +1682,7 @@ final class ContentBlockerConverterTests: XCTestCase {
         var decoded = try! parseJsonString(json: result.converted);
         XCTAssertEqual(decoded.count, 1);
         XCTAssertEqual(decoded[0].trigger.loadContext, ["child-frame"]);
-        
+
         result = converter.convertArray(rules: rules, safariVersion: .safari14);
         XCTAssertEqual(result.convertedCount, 1);
 
@@ -1698,14 +1698,14 @@ final class ContentBlockerConverterTests: XCTestCase {
         decoded = try! parseJsonString(json: result.converted);
         XCTAssertEqual(decoded.count, 1);
         XCTAssertEqual(decoded[0].trigger.loadContext, ["top-frame"]);
-        
+
         result = converter.convertArray(rules: rules, safariVersion: .safari14);
         XCTAssertEqual(result.convertedCount, 1);
 
         decoded = try! parseJsonString(json: result.converted);
         XCTAssertEqual(decoded.count, 1);
         XCTAssertNil(decoded[0].trigger.loadContext);
-        
+
         rules = ["@@||test.com^$subdocument,domain=example.com"];
         result = converter.convertArray(rules: rules, safariVersion: .safari15);
         XCTAssertEqual(result.convertedCount, 1);
@@ -1715,6 +1715,56 @@ final class ContentBlockerConverterTests: XCTestCase {
         XCTAssertEqual(decoded[0].trigger.loadContext, ["child-frame"]);
     }
 
+    func testResourceTypeForVariousSafariVersions() {
+        // Safari 15
+        var result = converter.convertArray(rules: ["||miner.pr0gramm.com^$websocket"], safariVersion: .safari15);
+        XCTAssertEqual(result.convertedCount, 1);
+
+        var decoded = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decoded.count, 1);
+        XCTAssertEqual(decoded[0].trigger.resourceType, ["websocket"]);
+
+        // Safari 14
+        result = converter.convertArray(rules: ["||miner.pr0gramm.com^$websocket"], safariVersion: .safari14);
+        XCTAssertEqual(result.convertedCount, 1);
+
+        decoded = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decoded.count, 1);
+        XCTAssertEqual(decoded[0].trigger.resourceType, ["raw"]);
+
+        // test default safari version
+        result = converter.convertArray(rules: ["||miner.pr0gramm.com^$websocket"]);
+        XCTAssertEqual(result.convertedCount, 1);
+
+        decoded = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decoded.count, 1);
+        XCTAssertEqual(decoded[0].trigger.resourceType, ["raw"]);
+
+        // Safari 15
+        result = converter.convertArray(rules: ["||miner.pr0gramm.com^$xmlhttprequest"], safariVersion: .safari15);
+        XCTAssertEqual(result.convertedCount, 1);
+
+        decoded = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decoded.count, 1);
+        XCTAssertEqual(decoded[0].trigger.resourceType, ["fetch"]);
+
+        // Safari 14
+        result = converter.convertArray(rules: ["||miner.pr0gramm.com^$xmlhttprequest"], safariVersion: .safari14);
+        XCTAssertEqual(result.convertedCount, 1);
+
+        decoded = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decoded.count, 1);
+        XCTAssertEqual(decoded[0].trigger.resourceType, ["raw"]);
+
+        // test default safari version
+        result = converter.convertArray(rules: ["||miner.pr0gramm.com^$xmlhttprequest"]);
+        XCTAssertEqual(result.convertedCount, 1);
+
+        decoded = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decoded.count, 1);
+        XCTAssertEqual(decoded[0].trigger.resourceType, ["raw"]);
+    }
+
     static var allTests = [
         ("testEmpty", testEmpty),
         ("testConvertComment", testConvertComment),
@@ -1763,5 +1813,6 @@ final class ContentBlockerConverterTests: XCTestCase {
         ("testAdvancedBlockingExceptions", testAdvancedBlockingExceptions),
         ("testOptimizeRules", testOptimizeRules),
         ("testLoadContext", testLoadContext),
+        ("testResourceTypeForVariousSafariVersions", testResourceTypeForVariousSafariVersions),
     ]
 }