cleaning up

Author: silkentrance

test/assertions.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-octal */
 
-var
+const
   assert = require('assert'),
   fs = require('fs'),
   path = require('path'),
@@ -18,7 +18,7 @@ module.exports.assertName = function assertName(name, expected) {
 
 
 module.exports.assertMode = function assertMode(name, mode) {
-  var stat = fs.statSync(name);
+  const stat = fs.statSync(name);
 
   // mode values do not work properly on Windows. Ignore “group” and
   // “other” bits then. Ignore execute bit on that platform because it
@@ -57,7 +57,7 @@ module.exports.assertProperResult = function assertProperResult(result, withfd)
 
 module.exports.assertExists = function assertExists(name, isfile) {
   assert.ok(existsSync(name), name + ' should exist');
-  var stat = fs.statSync(name);
+  const stat = fs.statSync(name);
   if (isfile) assert.ok(stat.isFile(), name + ' should be a file');
   else assert.ok(stat.isDirectory(), name + ' should be a directory');
 };

test/dir-sync-test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   fs = require('fs'),
   path = require('path'),

test/dir-test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   fs = require('fs'),
   path = require('path'),
@@ -20,7 +20,7 @@ describe('tmp', function () {
   describe('#dir()', function () {
     describe('when running inband standard tests', function () {
       inbandStandardTests(false, function before(done) {
-        var that = this;
+        const that = this;
         tmp.dir(this.opts, function (err, name, removeCallback) {
           if (err) return done(err);
           that.topic = { name: name, removeCallback: removeCallback };

test/file-sync-test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   fs = require('fs'),
   inbandStandardTests = require('./inband-standard'),

test/inband-standard.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   fs = require('fs'),
   path = require('path'),
@@ -12,7 +12,7 @@ var
 
 
 module.exports = function inbandStandard(isFile, beforeHook) {
-  var testMode = isFile ? 0600 : 0700;
+  const testMode = isFile ? 0600 : 0700;
   describe('without any parameters', inbandStandardTests({ mode: testMode, prefix: 'tmp-' }, null, isFile, beforeHook));
   describe('with prefix', inbandStandardTests({ mode: testMode }, { prefix: 'something' }, isFile, beforeHook));
   describe('with postfix', inbandStandardTests({ mode: testMode }, { postfix: '.txt' }, isFile, beforeHook));

test/issue129-test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   assertions = require('./assertions'),
   childProcess = require('./child-process').childProcess;

test/name-sync-test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   inbandStandardTests = require('./name-inband-standard'),
   tmp = require('../lib/tmp');

test/name-test.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-octal */
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   assert = require('assert'),
   inbandStandardTests = require('./name-inband-standard'),
   tmp = require('../lib/tmp');
@@ -11,7 +11,7 @@ describe('tmp', function () {
   describe('#tmpName()', function () {
     describe('when running inband standard tests', function () {
       inbandStandardTests(function before(done) {
-        var that = this;
+        const that = this;
         tmp.dir(this.opts, function (err, name) {
           if (err) return done(err);
           that.topic = name;

test/spawn-custom.js

@@ -1,20 +1,16 @@
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   path = require('path'),
   readJsonConfig = require('./util').readJsonConfig,
-  spawn = require('./spawn');
+  spawn = require('./spawn'),
+  config = readJsonConfig(process.argv[2]);
 
-var config = readJsonConfig(process.argv[2]);
 spawn.graceful = !!config.graceful;
 
-var args = [];
-
-for (var i=3; i<process.argv.length; i++) {
-  args[i-3] = process.argv[i];
-}
+const args = Array.prototype.slice.call(process.argv, 3);
 
 // import the test case function and execute it
-var fn = require(path.join(__dirname, 'outband', config.tc));
+const fn = require(path.join(__dirname, 'outband', config.tc));
 fn.apply(spawn, args);
 

test/spawn-generic.js

@@ -1,12 +1,12 @@
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   path = require('path'),
   readJsonConfig = require('./util').readJsonConfig,
   spawn = require('./spawn'),
-  tmp = require('../lib/tmp');
+  tmp = require('../lib/tmp'),
+  config = readJsonConfig(process.argv[2]);
 
-var config = readJsonConfig(process.argv[2]);
 spawn.graceful = !!config.graceful;
 
 var fnUnderTest = null;
@@ -18,7 +18,7 @@ else fnUnderTest = (config.file) ? tmp.fileSync : tmp.dirSync;
 if (config.graceful) tmp.setGracefulCleanup();
 
 // import the test case function and execute it
-var fn = require(path.join(__dirname, 'outband', config.tc));
+const fn = require(path.join(__dirname, 'outband', config.tc));
 if (config.async)
   fnUnderTest(config.options, function (err, name, fdOrCallback, cb) {
     if (err) spawn.err(err);

test/spawn.js

@@ -30,7 +30,7 @@ module.exports = {
     process.exit(code || 0);
   },
   kill: function (signal) {
-    process.kill(process.pid, signal || 'SIGINT');
+    process.kill(signal || 'SIGINT');
   }
 };
 

test/util.js

@@ -1,9 +1,9 @@
 // vim: expandtab:ts=2:sw=2
 
-var
+const
   fs = require('fs');
 
 module.exports.readJsonConfig = function readJsonConfig(path) {
-  var contents = fs.readFileSync(path);
+  const contents = fs.readFileSync(path);
   return JSON.parse(contents);
 };