| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 "use strict"; | 18 "use strict"; |
| 19 | 19 |
| 20 { | 20 { |
| 21 const {extractHostFromFrame, isThirdParty} = require("../../lib/url"); | 21 const {isThirdParty} = require("../../adblockpluscore/lib/domain"); |
|
Sebastian Noack
2019/01/30 19:54:25
Shouldn't we rather remove the isThridParty() chec
Manish Jethani
2019/01/31 01:04:14
Done.
| |
| 22 const {extractHostFromFrame} = require("../../lib/url"); | |
| 22 const {platform} = require("info"); | 23 const {platform} = require("info"); |
| 23 | 24 |
| 24 QUnit.module("URL/host tools"); | 25 QUnit.module("URL/host tools"); |
| 25 | 26 |
| 26 test("Extracting hostname from frame", () => | 27 test("Extracting hostname from frame", () => |
| 27 { | 28 { |
| 28 function testFrameHostname(hierarchy, expectedHostname, message) | 29 function testFrameHostname(hierarchy, expectedHostname, message) |
| 29 { | 30 { |
| 30 let frame = null; | 31 let frame = null; |
| 31 | 32 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 testThirdParty( | 134 testThirdParty( |
| 134 "[::ffff:192.0.2.128]", "[::ffff:192.1.2.128]", true, | 135 "[::ffff:192.0.2.128]", "[::ffff:192.1.2.128]", true, |
| 135 "different IPv4-mapped IPv6 address is third-party" | 136 "different IPv4-mapped IPv6 address is third-party" |
| 136 ); | 137 ); |
| 137 testThirdParty("xn--f-1gaa.com", "f\u00f6\u00f6.com", false, | 138 testThirdParty("xn--f-1gaa.com", "f\u00f6\u00f6.com", false, |
| 138 "same IDN isn't third-party"); | 139 "same IDN isn't third-party"); |
| 139 testThirdParty("example.com..", "example.com....", false, | 140 testThirdParty("example.com..", "example.com....", false, |
| 140 "traling dots are ignored"); | 141 "traling dots are ignored"); |
| 141 }); | 142 }); |
| 142 } | 143 } |
| OLD | NEW |