improve helper

AdguardTeam · Dec 19, 2022 · dd79e29 · dd79e29
1 parent 8d52c1b
commit dd79e29
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/src/helpers/prevent-utils.js b/src/helpers/prevent-utils.js
@@ -4,7 +4,6 @@ import {
     isValidMatchNumber,
     isValidMatchStr,
 } from './string-utils';
-import { nativeIsNaN } from './number-utils';
 
 /**
  * Checks whether the passed arg is proper callback
@@ -27,7 +26,7 @@ export const isValidCallback = (callback) => {
  * @returns {any} number as parsed delay or any input type if `delay` is not parsable
  */
 export const parseRawDelay = (delay) => {
-    return nativeIsNaN(parseInt(delay, 10)) ? delay : Math.floor(parseInt(delay, 10));
+    return Math.floor(Number(delay)) || delay;
 };
 
 /**

diff --git a/tests/helpers/prevent-utils.js b/tests/helpers/prevent-utils.js
@@ -0,0 +1,23 @@
+import { parseRawDelay } from '../../src/helpers';
+
+const { test, module } = QUnit;
+const name = 'scriptlets-redirects helpers';
+
+module(name);
+test('Test parseRawDelay', (assert) => {
+    assert.strictEqual(parseRawDelay(0), 0, 'parsing number ok');
+    assert.strictEqual(parseRawDelay(10), 10, 'parsing number ok');
+    assert.strictEqual(parseRawDelay(10.123), 10, 'parsing number ok');
+
+    assert.strictEqual(parseRawDelay('0'), 0, 'parsing number in string ok');
+    assert.strictEqual(parseRawDelay('10'), 10, 'parsing number in string ok');
+    assert.strictEqual(parseRawDelay('10.123'), 10, 'parsing number in string ok');
+
+    assert.strictEqual(parseRawDelay('string'), 'string', 'parsing string ok');
+
+    assert.strictEqual(parseRawDelay(null), null, 'parsing other types ok');
+    assert.strictEqual(parseRawDelay(undefined), undefined, 'parsing other types ok');
+    assert.strictEqual(parseRawDelay(false), false, 'parsing other types ok');
+    // as NaN !== NaN
+    assert.strictEqual(parseRawDelay(NaN).toString(), 'NaN', 'parsing other types ok');
+});
diff --git a/tests/helpers/string-utils.test.js b/tests/helpers/string-utils.test.js
@@ -1,4 +1,4 @@
-import { toRegExp, parseRawDelay } from '../../src/helpers';
+import { toRegExp } from '../../src/helpers';
 
 const { test, module } = QUnit;
 const name = 'scriptlets-redirects helpers';
@@ -46,21 +46,3 @@ test('Test toRegExp for invalid inputs', (assert) => {
         toRegExp(inputStr);
     });
 });
-
-test('Test parseRawDelay', (assert) => {
-    assert.strictEqual(parseRawDelay(0), 0, 'parsing number ok');
-    assert.strictEqual(parseRawDelay(10), 10, 'parsing number ok');
-    assert.strictEqual(parseRawDelay(10.123), 10, 'parsing number ok');
-
-    assert.strictEqual(parseRawDelay('0'), 0, 'parsing number in string ok');
-    assert.strictEqual(parseRawDelay('10'), 10, 'parsing number in string ok');
-    assert.strictEqual(parseRawDelay('10.123'), 10, 'parsing number in string ok');
-
-    assert.strictEqual(parseRawDelay('string'), 'string', 'parsing string ok');
-
-    assert.strictEqual(parseRawDelay(null), null, 'parsing other types ok');
-    assert.strictEqual(parseRawDelay(undefined), undefined, 'parsing other types ok');
-    assert.strictEqual(parseRawDelay(false), false, 'parsing other types ok');
-    // as NaN !== NaN
-    assert.strictEqual(parseRawDelay(NaN).toString(), 'NaN', 'parsing other types ok');
-});