test: replace indexOf with includes

Start the transition to Array.prototype.includes() and
String.prototype.includes().  This commit refactors most of the
comparisons of Array.prototype.indexOf() and String.prototype.indexOf()
return values with -1 to the former methods in tests.

PR-URL: https://github.com/nodejs/node/pull/12604
Refs: https://github.com/nodejs/node/issues/12586
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

1 files changed, 36 insertions, 36 deletions

diff --git a/test/parallel/test-fs-error-messages.js b/test/parallel/test-fs-error-messages.js
index a10e97348f..0991a798fe 100644
--- a/test/parallel/test-fs-error-messages.js
+++ b/test/parallel/test-fs-error-messages.js
@@ -34,66 +34,66 @@ const existingDir2 = path.join(common.fixturesDir, 'keys');
 
 fs.stat(fn, function(err) {
   assert.strictEqual(fn, err.path);
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.lstat(fn, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.readlink(fn, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.link(fn, 'foo', function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.link(existingFile, existingFile2, function(err) {
-  assert.ok(0 <= err.message.indexOf(existingFile));
-  assert.ok(0 <= err.message.indexOf(existingFile2));
+  assert.ok(err.message.includes(existingFile));
+  assert.ok(err.message.includes(existingFile2));
 });
 
 fs.symlink(existingFile, existingFile2, function(err) {
-  assert.ok(0 <= err.message.indexOf(existingFile));
-  assert.ok(0 <= err.message.indexOf(existingFile2));
+  assert.ok(err.message.includes(existingFile));
+  assert.ok(err.message.includes(existingFile2));
 });
 
 fs.unlink(fn, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.rename(fn, 'foo', function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.rename(existingDir, existingDir2, function(err) {
-  assert.ok(0 <= err.message.indexOf(existingDir));
-  assert.ok(0 <= err.message.indexOf(existingDir2));
+  assert.ok(err.message.includes(existingDir));
+  assert.ok(err.message.includes(existingDir2));
 });
 
 fs.rmdir(fn, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.mkdir(existingFile, 0o666, function(err) {
-  assert.ok(0 <= err.message.indexOf(existingFile));
+  assert.ok(err.message.includes(existingFile));
 });
 
 fs.rmdir(existingFile, function(err) {
-  assert.ok(0 <= err.message.indexOf(existingFile));
+  assert.ok(err.message.includes(existingFile));
 });
 
 fs.chmod(fn, 0o666, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.open(fn, 'r', 0o666, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 fs.readFile(fn, function(err) {
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 });
 
 // Sync
@@ -106,7 +106,7 @@ try {
   fs.statSync(fn);
 } catch (err) {
   errors.push('stat');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -114,7 +114,7 @@ try {
   fs.mkdirSync(existingFile, 0o666);
 } catch (err) {
   errors.push('mkdir');
-  assert.ok(0 <= err.message.indexOf(existingFile));
+  assert.ok(err.message.includes(existingFile));
 }
 
 try {
@@ -122,7 +122,7 @@ try {
   fs.chmodSync(fn, 0o666);
 } catch (err) {
   errors.push('chmod');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -130,7 +130,7 @@ try {
   fs.lstatSync(fn);
 } catch (err) {
   errors.push('lstat');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -138,7 +138,7 @@ try {
   fs.readlinkSync(fn);
 } catch (err) {
   errors.push('readlink');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -146,7 +146,7 @@ try {
   fs.linkSync(fn, 'foo');
 } catch (err) {
   errors.push('link');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -154,8 +154,8 @@ try {
   fs.linkSync(existingFile, existingFile2);
 } catch (err) {
   errors.push('link');
-  assert.ok(0 <= err.message.indexOf(existingFile));
-  assert.ok(0 <= err.message.indexOf(existingFile2));
+  assert.ok(err.message.includes(existingFile));
+  assert.ok(err.message.includes(existingFile2));
 }
 
 try {
@@ -163,8 +163,8 @@ try {
   fs.symlinkSync(existingFile, existingFile2);
 } catch (err) {
   errors.push('symlink');
-  assert.ok(0 <= err.message.indexOf(existingFile));
-  assert.ok(0 <= err.message.indexOf(existingFile2));
+  assert.ok(err.message.includes(existingFile));
+  assert.ok(err.message.includes(existingFile2));
 }
 
 try {
@@ -172,7 +172,7 @@ try {
   fs.unlinkSync(fn);
 } catch (err) {
   errors.push('unlink');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -180,7 +180,7 @@ try {
   fs.rmdirSync(fn);
 } catch (err) {
   errors.push('rmdir');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -188,7 +188,7 @@ try {
   fs.rmdirSync(existingFile);
 } catch (err) {
   errors.push('rmdir');
-  assert.ok(0 <= err.message.indexOf(existingFile));
+  assert.ok(err.message.includes(existingFile));
 }
 
 try {
@@ -196,7 +196,7 @@ try {
   fs.openSync(fn, 'r');
 } catch (err) {
   errors.push('opens');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -204,7 +204,7 @@ try {
   fs.renameSync(fn, 'foo');
 } catch (err) {
   errors.push('rename');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 try {
@@ -212,8 +212,8 @@ try {
   fs.renameSync(existingDir, existingDir2);
 } catch (err) {
   errors.push('rename');
-  assert.ok(0 <= err.message.indexOf(existingDir));
-  assert.ok(0 <= err.message.indexOf(existingDir2));
+  assert.ok(err.message.includes(existingDir));
+  assert.ok(err.message.includes(existingDir2));
 }
 
 try {
@@ -221,7 +221,7 @@ try {
   fs.readdirSync(fn);
 } catch (err) {
   errors.push('readdir');
-  assert.ok(0 <= err.message.indexOf(fn));
+  assert.ok(err.message.includes(fn));
 }
 
 process.on('exit', function() {