chore: ensure all node tests do require('./common') first so they c…

…an work independently Fix #8308
Automattic · Nov 9, 2019 · bea0b6d · bea0b6d
1 parent 6067dcd
commit bea0b6d
Show file tree

Hide file tree

Showing 71 changed files with 141 additions and 64 deletions.
diff --git a/test/aggregate.test.js b/test/aggregate.test.js
@@ -4,9 +4,10 @@
  * Module dependencies
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
-const start = require('./common');
 
 const Aggregate = require('../lib/aggregate');
 

diff --git a/test/cast.test.js b/test/cast.test.js
@@ -4,6 +4,8 @@
 
 'use strict';
 
+require('./common');
+
 const Schema = require('../lib/schema');
 const assert = require('assert');
 const cast = require('../lib/cast');

diff --git a/test/collection.capped.test.js b/test/collection.capped.test.js
@@ -4,9 +4,10 @@
 
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/collection.test.js b/test/collection.test.js
@@ -1,8 +1,9 @@
 'use strict';
 
+const start = require('./common');
+
 const Collection = require('../lib/collection');
 const assert = require('assert');
-const start = require('./common');
 
 const mongoose = start.mongoose;
 

diff --git a/test/colors.js b/test/colors.js
@@ -4,10 +4,11 @@
 
 'use strict';
 
+const start = require('./common');
+
 const DocumentArray = require('../lib/types/documentarray');
 const EmbeddedDocument = require('../lib/types/embedded');
 const assert = require('assert');
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/connection.test.js b/test/connection.test.js
@@ -4,12 +4,13 @@
  * Module dependencies.
  */
 
+const start = require('./common');
+
 const Promise = require('bluebird');
 const Q = require('q');
 const assert = require('assert');
 const co = require('co');
 const server = require('./common').server;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/document.isselected.test.js b/test/document.isselected.test.js
@@ -5,12 +5,14 @@
 'use strict';
 
 const start = require('./common');
-const mongoose = start.mongoose;
-const assert = require('assert');
+
+const Document = require('../lib/document');
 const EventEmitter = require('events').EventEmitter;
+const assert = require('assert');
+
+const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 const ObjectId = Schema.ObjectId;
-const Document = require('../lib/document');
 const DocumentObjectId = mongoose.Types.ObjectId;
 
 /**

diff --git a/test/document.modified.test.js b/test/document.modified.test.js
@@ -4,9 +4,10 @@
 
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/document.populate.test.js b/test/document.populate.test.js
@@ -5,10 +5,11 @@
 
 'use strict';
 
+const start = require('./common');
+
 const Document = require('../lib/document');
 const assert = require('assert');
 const co = require('co');
-const start = require('./common');
 const utils = require('../lib/utils');
 
 const mongoose = start.mongoose;

diff --git a/test/document.strict.test.js b/test/document.strict.test.js
@@ -4,10 +4,11 @@
 
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/document.test.js b/test/document.test.js
@@ -4,14 +4,15 @@
  * Module dependencies.
  */
 
+const start = require('./common');
+
 const Document = require('../lib/document');
 const EventEmitter = require('events').EventEmitter;
 const EmbeddedDocument = require('../lib/types/embedded');
 const Query = require('../lib/query');
 const assert = require('assert');
 const co = require('co');
 const random = require('../lib/utils').random;
-const start = require('./common');
 const utils = require('../lib/utils');
 const validator = require('validator');
 const Buffer = require('safe-buffer').Buffer;

diff --git a/test/document.unit.test.js b/test/document.unit.test.js
@@ -4,8 +4,9 @@
 
 'use strict';
 
-const assert = require('assert');
 const start = require('./common');
+
+const assert = require('assert');
 const storeShard = require('../lib/plugins/sharding').storeShard;
 
 const mongoose = start.mongoose;

diff --git a/test/errors.validation.test.js b/test/errors.validation.test.js
@@ -5,9 +5,10 @@
 
 'use strict';
 
+const start = require('./common');
+
 const ValidationError = require('../lib/error/validation');
 const assert = require('assert');
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/geojson.test.js b/test/geojson.test.js
@@ -4,9 +4,10 @@
  * Module dependencies.
  */
 
-const assert = require('assert');
 const start = require('./common');
 
+const assert = require('assert');
+
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 

diff --git a/test/gh-1408.test.js b/test/gh-1408.test.js
@@ -5,9 +5,10 @@
 
 'use strict';
 
-const assert = require('assert');
 const start = require('./common');
 
+const assert = require('assert');
+
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -1,9 +1,10 @@
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
 const random = require('../lib/utils').random;
-const start = require('./common');
 const stream = require('stream');
 
 const collection = 'blogposts_' + random();

diff --git a/test/model.aggregate.test.js b/test/model.aggregate.test.js
@@ -5,10 +5,11 @@
 
 'use strict';
 
+const start = require('./common');
+
 const Aggregate = require('../lib/aggregate');
 const assert = require('assert');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/model.create.test.js b/test/model.create.test.js
@@ -5,9 +5,11 @@
  */
 
 const start = require('./common');
+
 const assert = require('assert');
-const mongoose = start.mongoose;
 const random = require('../lib/utils').random;
+
+const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 const DocumentObjectId = mongoose.Types.ObjectId;
 

diff --git a/test/model.discriminator.querying.test.js b/test/model.discriminator.querying.test.js
@@ -5,6 +5,7 @@
 'use strict';
 
 const start = require('./common');
+
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 const assert = require('assert');

diff --git a/test/model.discriminator.test.js b/test/model.discriminator.test.js
@@ -4,11 +4,12 @@
  * Test dependencies.
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const clone = require('../lib/utils').clone;
 const co = require('co');
 const random = require('../lib/utils').random;
-const start = require('./common');
 const util = require('util');
 
 const mongoose = start.mongoose;

diff --git a/test/model.field.selection.test.js b/test/model.field.selection.test.js
@@ -4,10 +4,11 @@
 
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/model.findOneAndDelete.test.js b/test/model.findOneAndDelete.test.js
@@ -4,9 +4,10 @@
  * Test dependencies.
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
-const start = require('./common');
 const random = require('../lib/utils').random;
 
 const mongoose = start.mongoose;

diff --git a/test/model.findOneAndRemove.test.js b/test/model.findOneAndRemove.test.js
@@ -4,9 +4,10 @@
  * Test dependencies.
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
-const start = require('./common');
 const random = require('../lib/utils').random;
 
 const mongoose = start.mongoose;

diff --git a/test/model.findOneAndReplace.test.js b/test/model.findOneAndReplace.test.js
@@ -4,9 +4,10 @@
  * Test dependencies.
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
-const start = require('./common');
 const random = require('../lib/utils').random;
 
 const mongoose = start.mongoose;

diff --git a/test/model.findOneAndUpdate.test.js b/test/model.findOneAndUpdate.test.js
@@ -4,8 +4,9 @@
  * Test dependencies.
  */
 
-const CastError = require('../lib/error/cast');
 const start = require('./common');
+
+const CastError = require('../lib/error/cast');
 const assert = require('assert');
 const mongoose = start.mongoose;
 const random = require('../lib/utils').random;

diff --git a/test/model.geosearch.test.js b/test/model.geosearch.test.js
@@ -1,8 +1,9 @@
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/model.hydrate.test.js b/test/model.hydrate.test.js
@@ -4,9 +4,10 @@
 
 'use strict';
 
-const assert = require('assert');
 const start = require('./common');
 
+const assert = require('assert');
+
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
 const DocumentObjectId = mongoose.Types.ObjectId;

diff --git a/test/model.indexes.test.js b/test/model.indexes.test.js
@@ -4,9 +4,10 @@
  * Test dependencies.
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/model.mapreduce.test.js b/test/model.mapreduce.test.js
@@ -5,9 +5,10 @@
 
 'use strict';
 
+const start = require('./common');
+
 const assert = require('assert');
 const random = require('../lib/utils').random;
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/model.middleware.test.js b/test/model.middleware.test.js
@@ -4,9 +4,10 @@
  * Test dependencies.
  */
 
+const start = require('./common');
+
 const assert = require('assert');
 const co = require('co');
-const start = require('./common');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;

diff --git a/test/model.populate.divergent.test.js b/test/model.populate.divergent.test.js
@@ -5,8 +5,9 @@
 
 'use strict';
 
-const assert = require('assert');
 const start = require('./common');
+
+const assert = require('assert');
 const utils = require('../lib/utils');
 
 const mongoose = start.mongoose;

diff --git a/test/model.populate.setting.test.js b/test/model.populate.setting.test.js
@@ -6,9 +6,10 @@
 
 'use strict';
 
+const start = require('./common');
+
 const Buffer = require('safe-buffer').Buffer;
 const assert = require('assert');
-const start = require('./common');
 const utils = require('../lib/utils');
 
 const mongoose = start.mongoose;