test: replace indexOf with includes and startsWith

PR-URL: nodejs#13852
Refs: nodejs#12586
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Vse Mozhet Byt <[email protected]>

Author: Nataly Shrits

test/addons/repl-domain-abort/test.js

@@ -54,7 +54,7 @@ dInput._read = function _read(size) {
 };
 
 dOutput._write = function _write(chunk, encoding, cb) {
-  if (chunk.toString().indexOf('cb_ran') === 0)
+  if (chunk.toString().startsWith('cb_ran'))
     cb_ran = true;
   cb();
 };

test/disabled/test-sendfd.js

@@ -93,7 +93,7 @@ pipeReadStream.on('data', function(data) {
     var rd = JSON.parse(d);
 
     assert.strictEqual(rd.pid, cpp);
-    assert.strictEqual(seenOrdinals.indexOf(rd.ord), -1);
+    assert.strictEqual(seenOrdinals.includes(rd.ord), false)
 
     seenOrdinals.unshift(rd.ord);
   });

test/doctool/test-doctool-html.js

@@ -117,15 +117,15 @@ testData.forEach((item) => {
           const actual = output.replace(spaces, '');
           // Assert that the input stripped of all whitespace contains the
           // expected list
-          assert.notStrictEqual(actual.indexOf(expected), -1);
+          assert(actual.includes(expected));
 
           // Testing the insertion of Google Analytics script when
           // an analytics id is provided. Should not be present by default
           if (includeAnalytics) {
-            assert.notStrictEqual(actual.indexOf('google-analytics.com'), -1,
-                                  'Google Analytics script was not present');
+            assert(actual.includes('google-analytics.com'),
+                   'Google Analytics script was not present');
           } else {
-            assert.strictEqual(actual.indexOf('google-analytics.com'), -1,
+            assert.strictEqual(actual.includes('google-analytics.com'), false,
                                'Google Analytics script was present');
           }
         }));

test/internet/test-dns-any.js

@@ -60,7 +60,7 @@ const checkers = {
     assert.ok(Array.isArray(r.entries));
     assert.ok(r.entries.length > 0);
     r.entries.forEach((txt) => {
-      assert.strictEqual(txt.indexOf('v=spf1'), 0);
+      assert(txt.startsWith('v=spf1'));
     });
     assert.strictEqual(r.type, 'TXT');
   },

test/internet/test-dns.js

@@ -366,7 +366,7 @@ TEST(function test_resolveTxt(done) {
     assert.ifError(err);
     assert.strictEqual(records.length, 1);
     assert.ok(util.isArray(records[0]));
-    assert.strictEqual(records[0][0].indexOf('v=spf1'), 0);
+    assert(records[0][0].startsWith('v=spf1'));
     done();
   });
 

test/parallel/test-buffer-write.js

@@ -30,7 +30,7 @@ encodings
     const len = Buffer.byteLength('foo', encoding);
     assert.strictEqual(buf.write('foo', 0, len, encoding), len);
 
-    if (encoding.indexOf('-') !== -1)
+    if (encoding.includes('-'))
       encoding = encoding.replace('-', '');
 
     assert.deepStrictEqual(buf, resultMap.get(encoding.toLowerCase()));

test/parallel/test-child-process-exec-cwd.js

@@ -36,5 +36,5 @@ if (common.isWindows) {
 
 exec(pwdcommand, {cwd: dir}, common.mustCall(function(err, stdout, stderr) {
   assert.ifError(err);
-  assert.strictEqual(stdout.indexOf(dir), 0);
+  assert(stdout.startsWith(dir));
 }));

test/parallel/test-console.js

@@ -137,7 +137,7 @@ assert.strictEqual("{ foo: 'bar', inspect: [Function: inspect] }\n",
 assert.strictEqual("{ foo: 'bar', inspect: [Function: inspect] }\n",
                    strings.shift());
 assert.ok(strings.shift().includes('foo: [Object]'));
-assert.strictEqual(-1, strings.shift().indexOf('baz'));
+assert.strictEqual(strings.shift().includes('baz'), false);
 assert.ok(/^label: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.ok(/^__proto__: \d+\.\d{3}ms$/.test(strings.shift().trim()));
 assert.ok(/^constructor: \d+\.\d{3}ms$/.test(strings.shift().trim()));

test/parallel/test-dgram-error-message-address.js

@@ -47,7 +47,7 @@ socket_ipv6.on('listening', common.mustNotCall());
 socket_ipv6.on('error', common.mustCall(function(e) {
   // EAFNOSUPPORT or EPROTONOSUPPORT means IPv6 is disabled on this system.
   const allowed = ['EADDRNOTAVAIL', 'EAFNOSUPPORT', 'EPROTONOSUPPORT'];
-  assert.notStrictEqual(allowed.indexOf(e.code), -1);
+  assert(allowed.includes(e.code));
   assert.strictEqual(e.port, undefined);
   assert.strictEqual(e.message, `bind ${e.code} 111::1`);
   assert.strictEqual(e.address, '111::1');

test/parallel/test-domain-top-level-error-handler-throw.js

@@ -37,11 +37,8 @@ if (process.argv[2] === 'child') {
     });
 
     child.on('close', function onChildClosed() {
-      assert.notStrictEqual(
-        stderrOutput.indexOf(domainErrHandlerExMessage),
-        -1
-      );
-      assert.strictEqual(stderrOutput.indexOf(internalExMessage), -1);
+      assert(stderrOutput.includes(domainErrHandlerExMessage));
+      assert.strictEqual(stderrOutput.includes(internalExMessage), false);
     });
 
     child.on('exit', function onChildExited(exitCode, signal) {