From 7fd04c90b2eb89db80d3fb287b797b461ec53524 Mon Sep 17 00:00:00 2001 From: Stanislav Atroschenko Date: Fri, 16 Dec 2022 16:42:20 +0300 Subject: [PATCH] AG-17893 Add googletagmanager-gtm to compatibility-redirect #260 Merge in ADGUARD-FILTERS/scriptlets from fix/AG-17893 to release/v1.8 Squashed commit of the following: commit 38f310336e3c56548e2343941c45afd7263f74cc Author: Stanislav A Date: Fri Dec 16 15:59:23 2022 +0300 Add googletagmanager-gtm to compatibility-redirect --- src/helpers/compatibility-redirects.js | 5 +++++ tests/lib-tests/index.test.js | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/helpers/compatibility-redirects.js b/src/helpers/compatibility-redirects.js index abce2dc0..6fc84620 100644 --- a/src/helpers/compatibility-redirects.js +++ b/src/helpers/compatibility-redirects.js @@ -71,6 +71,11 @@ const redirects = [ adg: 'googletagmanager-gtm', ubo: 'google-analytics_ga.js', }, + { + // https://github.com/AdguardTeam/Scriptlets/issues/260 + adg: 'googletagmanager-gtm', + ubo: 'googletagmanager_gtm.js', + }, { adg: 'googletagservices-gpt', ubo: 'googletagservices_gpt.js', diff --git a/tests/lib-tests/index.test.js b/tests/lib-tests/index.test.js index 97aa3a78..979b5a25 100644 --- a/tests/lib-tests/index.test.js +++ b/tests/lib-tests/index.test.js @@ -428,6 +428,10 @@ test('Test REDIRECT-RULE converting - UBO -> ADG', (assert) => { uboRule = '||googlesyndication.com^$script,redirect-rule=googlesyndication_adsbygoogle.js,domain=darmowa-tv.ws'; expectedAdgRule = '||googlesyndication.com^$script,redirect-rule=googlesyndication-adsbygoogle,domain=darmowa-tv.ws'; assert.strictEqual(convertRedirectToAdg(uboRule), expectedAdgRule); + + uboRule = '||googletagmanager.com/gtag/js$script,redirect-rule=googletagmanager_gtm.js'; + expectedAdgRule = '||googletagmanager.com/gtag/js$script,redirect-rule=googletagmanager-gtm'; + assert.strictEqual(convertRedirectToAdg(uboRule), expectedAdgRule); }); test('Test REDIRECT converting - ABP -> ADG', (assert) => {