test: common.js -> common

This commit changes many test styles to change all references
from require('./common.js'); to require('./common');.

The latter is much more common, with the former only being used in 50
tests. It is just a stylistic change, and it seems that `common.js` was
introduced by a rogue test and copied and pasted into the rest.

Semver: patch
PR-URL: https://github.com/iojs/io.js/pull/917
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

diff --git a/test/fixtures/clustered-server/app.js b/test/fixtures/clustered-server/app.js
index 3fca2aa..f89d70e 100644 (file)
--- a/test/fixtures/clustered-server/app.js
+++ b/test/fixtures/clustered-server/app.js
@@ -1,6 +1,6 @@
 var http = require('http');
 var cluster = require('cluster');
-var common = require('../../common.js');
+var common = require('../../common');
 
 function handleRequest(request, response) {
   response.end('hello world\n');

diff --git a/test/gc/test-http-client-connaborted.js b/test/gc/test-http-client-connaborted.js
index 4fbb429..c58b4d5 100644 (file)
--- a/test/gc/test-http-client-connaborted.js
+++ b/test/gc/test-http-client-connaborted.js
@@ -11,7 +11,7 @@ var http  = require('http'),
     count   = 0,
     countGC = 0,
     todo    = 500,
-    common = require('../common.js'),
+    common = require('../common'),
     assert = require('assert'),
     PORT = common.PORT;
 

diff --git a/test/gc/test-http-client-onerror.js b/test/gc/test-http-client-onerror.js
index 80a3fcf..bf9fb7c 100644 (file)
--- a/test/gc/test-http-client-onerror.js
+++ b/test/gc/test-http-client-onerror.js
@@ -13,7 +13,7 @@ var http  = require('http'),
     count   = 0,
     countGC = 0,
     todo    = 500,
-    common = require('../common.js'),
+    common = require('../common'),
     assert = require('assert'),
     PORT = common.PORT;
 

diff --git a/test/gc/test-http-client-timeout.js b/test/gc/test-http-client-timeout.js
index 99a97d7..727d133 100644 (file)
--- a/test/gc/test-http-client-timeout.js
+++ b/test/gc/test-http-client-timeout.js
@@ -15,7 +15,7 @@ var http  = require('http'),
     count   = 0,
     countGC = 0,
     todo    = 550,
-    common = require('../common.js'),
+    common = require('../common'),
     assert = require('assert'),
     PORT = common.PORT;
 

diff --git a/test/gc/test-http-client.js b/test/gc/test-http-client.js
index 4c64bba..6aedda7 100644 (file)
--- a/test/gc/test-http-client.js
+++ b/test/gc/test-http-client.js
@@ -11,7 +11,7 @@ var http  = require('http'),
     count   = 0,
     countGC = 0,
     todo    = 500,
-    common = require('../common.js'),
+    common = require('../common'),
     assert = require('assert'),
     PORT = common.PORT;
 

diff --git a/test/gc/test-net-timeout.js b/test/gc/test-net-timeout.js
index 5d2387d..2ef03b2 100644 (file)
--- a/test/gc/test-net-timeout.js
+++ b/test/gc/test-net-timeout.js
@@ -22,7 +22,7 @@ var net  = require('net'),
     count   = 0,
     countGC = 0,
     todo    = 500,
-    common = require('../common.js'),
+    common = require('../common'),
     assert = require('assert'),
     PORT = common.PORT;
 

diff --git a/test/message/error_exit.js b/test/message/error_exit.js
index 6473867..51c2569 100644 (file)
--- a/test/message/error_exit.js
+++ b/test/message/error_exit.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 
 process.on('exit', function(code) {

diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
index 26e3e0a..fd9cd41 100644 (file)
--- a/test/parallel/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -4,7 +4,7 @@ if (module.parent) {
   process.exit(42);
 }
 
-var common = require('../common.js'),
+var common = require('../common'),
     assert = require('assert'),
     child = require('child_process'),
     nodejs = '"' + process.execPath + '"';

diff --git a/test/parallel/test-domain-exit-dispose-again.js b/test/parallel/test-domain-exit-dispose-again.js
index 3a72e3a..c651181 100644 (file)
--- a/test/parallel/test-domain-exit-dispose-again.js
+++ b/test/parallel/test-domain-exit-dispose-again.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var domain = require('domain');
 var disposalFailed = false;

diff --git a/test/parallel/test-domain-exit-dispose.js b/test/parallel/test-domain-exit-dispose.js
index 5293d69..a01cee5 100644 (file)
--- a/test/parallel/test-domain-exit-dispose.js
+++ b/test/parallel/test-domain-exit-dispose.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var domain = require('domain');
 var disposalFailed = false;

diff --git a/test/parallel/test-domain-http-server.js b/test/parallel/test-domain-http-server.js
index 2c05742..77e1091 100644 (file)
--- a/test/parallel/test-domain-http-server.js
+++ b/test/parallel/test-domain-http-server.js
@@ -1,7 +1,7 @@
 var domain = require('domain');
 var http = require('http');
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 
 var objects = { foo: 'bar', baz: {}, num: 42, arr: [1,2,3] };
 objects.baz.asdf = objects;

diff --git a/test/parallel/test-domain-timers.js b/test/parallel/test-domain-timers.js
index 8c11d7e..5a34bc7 100644 (file)
--- a/test/parallel/test-domain-timers.js
+++ b/test/parallel/test-domain-timers.js
@@ -1,6 +1,6 @@
 var domain = require('domain');
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 
 var timeout_err, timeout, immediate_err;
 

diff --git a/test/parallel/test-http-exit-delay.js b/test/parallel/test-http-exit-delay.js
index fce01b5..191b96d 100644 (file)
--- a/test/parallel/test-http-exit-delay.js
+++ b/test/parallel/test-http-exit-delay.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 var http = require('http');
 
 var start;

diff --git a/test/parallel/test-http-set-timeout-server.js b/test/parallel/test-http-set-timeout-server.js
index 95a3124..ccad6f1 100644 (file)
--- a/test/parallel/test-http-set-timeout-server.js
+++ b/test/parallel/test-http-set-timeout-server.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var http = require('http');
 var net = require('net');

diff --git a/test/parallel/test-https-set-timeout-server.js b/test/parallel/test-https-set-timeout-server.js
index f33c85a..c5058e5 100644 (file)
--- a/test/parallel/test-https-set-timeout-server.js
+++ b/test/parallel/test-https-set-timeout-server.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var https = require('https');
 var tls = require('tls');

diff --git a/test/parallel/test-repl-domain.js b/test/parallel/test-repl-domain.js
index 6c3048e..929cb0f 100644 (file)
--- a/test/parallel/test-repl-domain.js
+++ b/test/parallel/test-repl-domain.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 
 var util   = require('util');
 var repl   = require('repl');

diff --git a/test/parallel/test-repl-timeout-throw.js b/test/parallel/test-repl-timeout-throw.js
index 2febf2e..f171341 100644 (file)
--- a/test/parallel/test-repl-timeout-throw.js
+++ b/test/parallel/test-repl-timeout-throw.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 
 var spawn = require('child_process').spawn;
 

diff --git a/test/parallel/test-signal-safety.js b/test/parallel/test-signal-safety.js
index 4707b63..b037232 100644 (file)
--- a/test/parallel/test-signal-safety.js
+++ b/test/parallel/test-signal-safety.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var Signal = process.binding('signal_wrap').Signal;
 

diff --git a/test/parallel/test-stream-push-order.js b/test/parallel/test-stream-push-order.js
index 1d7d09d..5e403c7 100644 (file)
--- a/test/parallel/test-stream-push-order.js
+++ b/test/parallel/test-stream-push-order.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var Readable = require('stream').Readable;
 var assert = require('assert');
 

diff --git a/test/parallel/test-stream2-base64-single-char-read-end.js b/test/parallel/test-stream2-base64-single-char-read-end.js
index bf049e3..2082c71 100644 (file)
--- a/test/parallel/test-stream2-base64-single-char-read-end.js
+++ b/test/parallel/test-stream2-base64-single-char-read-end.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var R = require('_stream_readable');
 var W = require('_stream_writable');
 var assert = require('assert');

diff --git a/test/parallel/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
index ce6a511..72b1e42 100644 (file)
--- a/test/parallel/test-stream2-compatibility.js
+++ b/test/parallel/test-stream2-compatibility.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var R = require('_stream_readable');
 var assert = require('assert');
 

diff --git a/test/parallel/test-stream2-finish-pipe.js b/test/parallel/test-stream2-finish-pipe.js
index df7d7a1..beabea0 100644 (file)
--- a/test/parallel/test-stream2-finish-pipe.js
+++ b/test/parallel/test-stream2-finish-pipe.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var stream = require('stream');
 var Buffer = require('buffer').Buffer;
 

diff --git a/test/parallel/test-stream2-large-read-stall.js b/test/parallel/test-stream2-large-read-stall.js
index c76c300..55d25a9 100644 (file)
--- a/test/parallel/test-stream2-large-read-stall.js
+++ b/test/parallel/test-stream2-large-read-stall.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 
 // If everything aligns so that you do a read(n) of exactly the

diff --git a/test/parallel/test-stream2-objects.js b/test/parallel/test-stream2-objects.js
index e99ac09..d7c5329 100644 (file)
--- a/test/parallel/test-stream2-objects.js
+++ b/test/parallel/test-stream2-objects.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var Readable = require('_stream_readable');
 var Writable = require('_stream_writable');
 var assert = require('assert');

diff --git a/test/parallel/test-stream2-pipe-error-once-listener.js b/test/parallel/test-stream2-pipe-error-once-listener.js
index c8b9350..0dbe878 100644 (file)
--- a/test/parallel/test-stream2-pipe-error-once-listener.js
+++ b/test/parallel/test-stream2-pipe-error-once-listener.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 
 var util = require('util');

diff --git a/test/parallel/test-stream2-push.js b/test/parallel/test-stream2-push.js
index c42bb6d..9268f05 100644 (file)
--- a/test/parallel/test-stream2-push.js
+++ b/test/parallel/test-stream2-push.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var stream = require('stream');
 var Readable = stream.Readable;
 var Writable = stream.Writable;

diff --git a/test/parallel/test-stream2-readable-from-list.js b/test/parallel/test-stream2-readable-from-list.js
index b0bedac..3604ae3 100644 (file)
--- a/test/parallel/test-stream2-readable-from-list.js
+++ b/test/parallel/test-stream2-readable-from-list.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 var fromList = require('_stream_readable')._fromList;
 
 // tiny node-tap lookalike.

diff --git a/test/parallel/test-stream2-readable-non-empty-end.js b/test/parallel/test-stream2-readable-non-empty-end.js
index 72b952a..d77564c 100644 (file)
--- a/test/parallel/test-stream2-readable-non-empty-end.js
+++ b/test/parallel/test-stream2-readable-non-empty-end.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 var Readable = require('_stream_readable');
 
 var len = 0;

diff --git a/test/parallel/test-stream2-set-encoding.js b/test/parallel/test-stream2-set-encoding.js
index e4e1495..47f0789 100644 (file)
--- a/test/parallel/test-stream2-set-encoding.js
+++ b/test/parallel/test-stream2-set-encoding.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var R = require('_stream_readable');
 var util = require('util');

diff --git a/test/parallel/test-stream2-transform.js b/test/parallel/test-stream2-transform.js
index 5c5d633..3bdef8f 100644 (file)
--- a/test/parallel/test-stream2-transform.js
+++ b/test/parallel/test-stream2-transform.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-var common = require('../common.js');
+var common = require('../common');
 var PassThrough = require('_stream_passthrough');
 var Transform = require('_stream_transform');
 

diff --git a/test/parallel/test-stream2-unpipe-drain.js b/test/parallel/test-stream2-unpipe-drain.js
index 1c27cf8..d593b6a 100644 (file)
--- a/test/parallel/test-stream2-unpipe-drain.js
+++ b/test/parallel/test-stream2-unpipe-drain.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var stream = require('stream');
 var crypto = require('crypto');

diff --git a/test/parallel/test-stream2-unpipe-leak.js b/test/parallel/test-stream2-unpipe-leak.js
index 8bfc2a6..fae2b73 100644 (file)
--- a/test/parallel/test-stream2-unpipe-leak.js
+++ b/test/parallel/test-stream2-unpipe-leak.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var stream = require('stream');
 

diff --git a/test/parallel/test-stream2-writable.js b/test/parallel/test-stream2-writable.js
index 5df3b18..d90a2b6 100644 (file)
--- a/test/parallel/test-stream2-writable.js
+++ b/test/parallel/test-stream2-writable.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var W = require('_stream_writable');
 var D = require('_stream_duplex');
 var assert = require('assert');

diff --git a/test/parallel/test-zlib-close-after-write.js b/test/parallel/test-zlib-close-after-write.js
index d159604..cbb1ac1 100644 (file)
--- a/test/parallel/test-zlib-close-after-write.js
+++ b/test/parallel/test-zlib-close-after-write.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 

diff --git a/test/parallel/test-zlib-convenience-methods.js b/test/parallel/test-zlib-convenience-methods.js
index eb9a2b2..a32d5d1 100644 (file)
--- a/test/parallel/test-zlib-convenience-methods.js
+++ b/test/parallel/test-zlib-convenience-methods.js
@@ -1,6 +1,6 @@
 // test convenience methods with and without options supplied
 
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 

diff --git a/test/parallel/test-zlib-dictionary-fail.js b/test/parallel/test-zlib-dictionary-fail.js
index ad8a95e..ea50bf4 100644 (file)
--- a/test/parallel/test-zlib-dictionary-fail.js
+++ b/test/parallel/test-zlib-dictionary-fail.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 

diff --git a/test/parallel/test-zlib-dictionary.js b/test/parallel/test-zlib-dictionary.js
index 8af4482..3a159e6 100644 (file)
--- a/test/parallel/test-zlib-dictionary.js
+++ b/test/parallel/test-zlib-dictionary.js
@@ -1,6 +1,6 @@
 // test compression/decompression with dictionary
 
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 var path = require('path');

diff --git a/test/parallel/test-zlib-flush.js b/test/parallel/test-zlib-flush.js
index 0b189ce..cfebda7 100644 (file)
--- a/test/parallel/test-zlib-flush.js
+++ b/test/parallel/test-zlib-flush.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 var path = require('path');

diff --git a/test/parallel/test-zlib-from-gzip.js b/test/parallel/test-zlib-from-gzip.js
index 51a275c..b218b4e 100644 (file)
--- a/test/parallel/test-zlib-from-gzip.js
+++ b/test/parallel/test-zlib-from-gzip.js
@@ -1,7 +1,7 @@
 // test unzipping a file that was created with a non-node gzip lib,
 // piped in as fast as possible.
 
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 var path = require('path');

diff --git a/test/parallel/test-zlib-from-string.js b/test/parallel/test-zlib-from-string.js
index 6382781..4ce77a8 100644 (file)
--- a/test/parallel/test-zlib-from-string.js
+++ b/test/parallel/test-zlib-from-string.js
@@ -1,6 +1,6 @@
 // test compressing and uncompressing a string with zlib
 
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 

diff --git a/test/parallel/test-zlib-invalid-input.js b/test/parallel/test-zlib-invalid-input.js
index ce5c2d6..948ea22 100644 (file)
--- a/test/parallel/test-zlib-invalid-input.js
+++ b/test/parallel/test-zlib-invalid-input.js
@@ -1,6 +1,6 @@
 // test uncompressing invalid input
 
-var common = require('../common.js'),
+var common = require('../common'),
     assert = require('assert'),
     zlib = require('zlib');
 

diff --git a/test/parallel/test-zlib-params.js b/test/parallel/test-zlib-params.js
index 006f1ea..6f19209 100644 (file)
--- a/test/parallel/test-zlib-params.js
+++ b/test/parallel/test-zlib-params.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 var path = require('path');

diff --git a/test/parallel/test-zlib-write-after-close.js b/test/parallel/test-zlib-write-after-close.js
index 5e798a2..54b3166 100644 (file)
--- a/test/parallel/test-zlib-write-after-close.js
+++ b/test/parallel/test-zlib-write-after-close.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 

diff --git a/test/parallel/test-zlib.js b/test/parallel/test-zlib.js
index 869567c..bb9ba53 100644 (file)
--- a/test/parallel/test-zlib.js
+++ b/test/parallel/test-zlib.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var zlib = require('zlib');
 var path = require('path');

diff --git a/test/pummel/test-stream2-basic.js b/test/pummel/test-stream2-basic.js
index fc0cac0..543acd6 100644 (file)
--- a/test/pummel/test-stream2-basic.js
+++ b/test/pummel/test-stream2-basic.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var R = require('_stream_readable');
 var assert = require('assert');
 

diff --git a/test/sequential/test-regress-GH-3542.js b/test/sequential/test-regress-GH-3542.js
index 5411e1c..32b3433 100644 (file)
--- a/test/sequential/test-regress-GH-3542.js
+++ b/test/sequential/test-regress-GH-3542.js
@@ -3,7 +3,7 @@ if (process.platform !== 'win32') {
   return process.exit(0);
 }
 
-var common = require('../common.js'),
+var common = require('../common'),
     assert = require('assert'),
     fs = require('fs'),
     path = require('path'),

diff --git a/test/sequential/test-regress-GH-3739.js b/test/sequential/test-regress-GH-3739.js
index 709f712..d08cfce 100644 (file)
--- a/test/sequential/test-regress-GH-3739.js
+++ b/test/sequential/test-regress-GH-3739.js
@@ -1,4 +1,4 @@
-var common = require('../common.js'),
+var common = require('../common'),
     assert = require('assert'),
     fs = require('fs'),
     path = require('path');

diff --git a/test/sequential/test-stream2-fs.js b/test/sequential/test-stream2-fs.js
index cf9453e..552d686 100644 (file)
--- a/test/sequential/test-stream2-fs.js
+++ b/test/sequential/test-stream2-fs.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var R = require('_stream_readable');
 var assert = require('assert');
 

diff --git a/test/sequential/test-stream2-httpclient-response-end.js b/test/sequential/test-stream2-httpclient-response-end.js
index bea0df3..6279608 100644 (file)
--- a/test/sequential/test-stream2-httpclient-response-end.js
+++ b/test/sequential/test-stream2-httpclient-response-end.js
@@ -1,4 +1,4 @@
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var http = require('http');
 var msg = 'Hello';

diff --git a/test/sequential/test-stream2-stderr-sync.js b/test/sequential/test-stream2-stderr-sync.js
index 105eff8..9b63411 100644 (file)
--- a/test/sequential/test-stream2-stderr-sync.js
+++ b/test/sequential/test-stream2-stderr-sync.js
@@ -1,6 +1,6 @@
 // Make sure that sync writes to stderr get processed before exiting.
 
-var common = require('../common.js');
+var common = require('../common');
 var assert = require('assert');
 var util = require('util');