improve metrika-yandex-tag redirect

AdguardTeam · Mar 10, 2022 · 38b2ff0 · 38b2ff0
1 parent c0904a5
commit 38b2ff0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/redirects/metrika-yandex-tag.js b/src/redirects/metrika-yandex-tag.js
@@ -105,19 +105,21 @@ export function metrikaYandexTag(source) {
     function init(id) {
         // yaCounter object should provide api
         window[`yaCounter${id}`] = api;
+        document.dispatchEvent(new Event(`yacounter${id}inited`));
     }
 
     if (typeof window.ym === 'undefined') {
         window.ym = ym;
     } else if (window.ym && window.ym.a) {
         // Get id for yaCounter object
-        window.ym.a.forEach((params) => {
+        const counters = window.ym.a;
+
+        window.ym = ym;
+        counters.forEach((params) => {
             const id = params[0];
             init(id);
         });
-        window.ym = ym;
     }
-
     hit(source);
 }
 

diff --git a/tests/redirects/metrika-yandex-tag.test.js b/tests/redirects/metrika-yandex-tag.test.js
@@ -84,11 +84,15 @@ test('ym: API methods test', (assert) => {
 });
 
 test('yaCounter: API methods test', (assert) => {
-    assert.expect(6);
+    assert.expect(7);
 
     const id = 111;
     window.ym = () => {};
     window.ym.a = [[id]];
+    const eventHandler = () => {
+        assert.ok(true, 'Counter event dispatched');
+    };
+    document.addEventListener(`yacounter${id}inited`, eventHandler);
 
     runRedirect(name);
 
@@ -125,5 +129,7 @@ test('yaCounter: API methods test', (assert) => {
     yaCounter.reachGoal(1, 'target', 'params', reachGoalCb, 123);
 
     assert.strictEqual(window.hit, 'FIRED', 'hit function was executed');
+
+    document.removeEventListener(`yacounter${id}inited`, eventHandler);
     clearGlobalProps(`yaCounter${id}`);
 });