Merge branch 'release/v1.8' into fix/AG-18132

AdguardTeam · Dec 19, 2022 · 0beb472 · 0beb472
2 parents 481ed62 + 7fd04c9
commit 0beb472
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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) => {