AG-13199 improve set-constant: noopCallbackFunc, noopThrow

Merge in ADGUARD-FILTERS/scriptlets from fix/AG-13199 to release/v1.8

Squashed commit of the following:

commit 8a95806
Author: Stanislav A <s.atroschenko@adguard.com>
Date:   Tue Dec 27 12:53:22 2022 +0300

    tweak trusted-set-cookie test

commit f7e2f08
Merge: d681b99 22e41f8
Author: Stanislav A <s.atroschenko@adguard.com>
Date:   Tue Dec 27 12:28:44 2022 +0300

    merge release

commit d681b99
Author: Stanislav A <s.atroschenko@adguard.com>
Date:   Tue Dec 27 12:10:17 2022 +0300

    improve changelog

commit d1206f0
Author: Stanislav A <s.atroschenko@adguard.com>
Date:   Mon Dec 26 20:43:06 2022 +0300

    fix changelog

commit 34a6b6c
Author: Stanislav A <s.atroschenko@adguard.com>
Date:   Mon Dec 26 19:20:57 2022 +0300

    update changelog

commit 659ec77
Author: Stanislav A <s.atroschenko@adguard.com>
Date:   Mon Dec 26 18:44:17 2022 +0300

    improve set-constant, add corresponding helpers and testcases

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased 1.8.x
 
+### Added
+- `noopThrow` and `noopCallbackFunc` prop values for `set-constant` scriptlet
+
 ### Changed
 
 - add decimal delay matching for `prevent-setInterval` and `prevent-setTimeout` [#247](https://github.com/AdguardTeam/Scriptlets/issues/247)

src/helpers/noop-utils.js

@@ -4,6 +4,12 @@
  */
 export const noopFunc = () => { };
 
+/**
+ * Function return noopFunc
+ * @returns {Function}
+ */
+export const noopCallbackFunc = () => noopFunc;
+
 /**
  * Function returns null
  * @return {null} null
@@ -47,6 +53,14 @@ export const noopArray = () => [];
  */
 export const noopObject = () => ({});
 
+/**
+ * Function throws an error
+ * @throws
+ */
+export const noopThrow = () => {
+    throw new Error();
+};
+
 /**
  * Function returns Promise.reject()
  */

src/scriptlets/set-constant.js

@@ -3,9 +3,11 @@ import {
     logMessage,
     noopArray,
     noopObject,
+    noopCallbackFunc,
     noopFunc,
     trueFunc,
     falseFunc,
+    noopThrow,
     noopPromiseReject,
     noopPromiseResolve,
     getPropertyInChain,
@@ -53,8 +55,10 @@ import {
  *         - `emptyObj` - empty object
  *         - `emptyArr` - empty array
  *         - `noopFunc` - function with empty body
+ *         - `noopCallbackFunc` - function returning noopFunc
  *         - `trueFunc` - function returning true
  *         - `falseFunc` - function returning false
+ *         - `noopThrow` - function throwing an error
  *         - `noopPromiseResolve` - function returning Promise object that is resolved with an empty response
  *         - `noopPromiseReject` - function returning Promise.reject()
  *         - `''` - empty string
@@ -112,10 +116,14 @@ export function setConstant(source, property, value, stack) {
         constantValue = emptyObj;
     } else if (value === 'noopFunc') {
         constantValue = noopFunc;
+    } else if (value === 'noopCallbackFunc') {
+        constantValue = noopCallbackFunc;
     } else if (value === 'trueFunc') {
         constantValue = trueFunc;
     } else if (value === 'falseFunc') {
         constantValue = falseFunc;
+    } else if (value === 'noopThrow') {
+        constantValue = noopThrow;
     } else if (value === 'noopPromiseResolve') {
         constantValue = noopPromiseResolve;
     } else if (value === 'noopPromiseReject') {
@@ -283,8 +291,10 @@ setConstant.injections = [
     noopArray,
     noopObject,
     noopFunc,
+    noopCallbackFunc,
     trueFunc,
     falseFunc,
+    noopThrow,
     noopPromiseReject,
     noopPromiseResolve,
     getPropertyInChain,

tests/helpers/noop.test.js

@@ -1,4 +1,9 @@
-import { noopPromiseResolve } from '../../src/helpers';
+import {
+    noopPromiseResolve,
+    noopCallbackFunc,
+    noopFunc,
+    noopThrow,
+} from '../../src/helpers';
 
 const { test, module } = QUnit;
 const name = 'scriptlets-redirects helpers';
@@ -22,3 +27,14 @@ test('Test noopPromiseResolve for valid response props', async (assert) => {
     assert.ok(Array.isArray(arrBody) && !arrBody.length);
     assert.strictEqual(responseWithType.type, TEST_TYPE);
 });
+
+test('noopCallbackFunc returns noopFunc', async (assert) => {
+    const func = noopCallbackFunc();
+    assert.ok(typeof func === 'function', 'returns function');
+    assert.strictEqual(func.toString(), noopFunc.toString(), 'returns empty function');
+    assert.strictEqual(func(), undefined, 'function returns undefined');
+});
+
+test('noopThrow throws an error', async (assert) => {
+    assert.throws(() => noopThrow(), 'noopThrow throws an error');
+});

tests/scriptlets/set-constant.test.js

@@ -104,6 +104,20 @@ if (!isSupported) {
         assert.strictEqual(window[noopFuncProp](), undefined);
         clearGlobalProps(noopFuncProp);
 
+        // setting constant to noopCallbackFunc;
+        const noopCallbackFuncProp = 'noopCallbackFunc';
+        runScriptletFromTag(noopCallbackFuncProp, 'noopCallbackFunc');
+        const noopFuncCb = window[noopCallbackFuncProp]();
+        assert.ok(typeof noopFuncCb === 'function', 'returns function');
+        assert.strictEqual(noopFuncCb(), undefined, 'function returns undefined');
+        clearGlobalProps(noopCallbackFuncProp);
+
+        // setting constant to noopCallbackFunc;
+        const noopThrowProp = 'noopThrow';
+        runScriptletFromTag(noopThrowProp, 'noopThrow');
+        assert.throws(() => window[noopThrowProp]()(), 'noopThrowProp throws an error');
+        clearGlobalProps(noopThrowProp);
+
         // setting constant to trueFunc;
         const trueFuncProp = 'trueFuncProp';
         runScriptletFromTag(trueFuncProp, 'trueFunc');

tests/scriptlets/trusted-set-cookie.test.js

@@ -59,7 +59,7 @@ test('Set cookie with current time value', (assert) => {
 
     // Some time will pass between calling scriptlet
     // and qunit running assertion
-    const tolerance = 20;
+    const tolerance = 100;
     const cookieValue = parseCookieString(document.cookie)[cName];
     const currentTime = new Date().getTime();
     const timeDiff = currentTime - cookieValue;