Removed some globals from tests (#3712)

* `chai` is no longer global

* sinon is no longer globally defined

* expect(..) is no longer defined globally

* Removed obsolete eslint hints about globals

* Removed unused variable ( `expect(..)` )

test/chai-setup.js

@@ -1,6 +1,5 @@
-const chai = (global.chai = require('chai'));
+const chai = require('chai');
 
 chai.should();
 chai.use(require('chai-as-promised'));
-
-global.expect = chai.expect;
+chai.use(require('sinon-chai'));

test/index.js

@@ -3,9 +3,7 @@
 
 require('source-map-support').install();
 
-global.sinon = require('sinon');
 require('./chai-setup');
-global.chai.use(require('sinon-chai'));
 
 global.d = new Date();
 

test/integration/builder/additional.js

@@ -1,7 +1,8 @@
-/*global expect*/
 /*eslint no-var:0, max-len:0 */
 'use strict';
 
+const { expect } = require('chai');
+
 const Knex = require('../../../knex');
 const _ = require('lodash');
 const delay = require('../../../lib/util/delay');

test/integration/builder/deletes.js

@@ -1,5 +1,4 @@
 /*global d*/
-
 'use strict';
 
 module.exports = function(knex) {

test/integration/builder/inserts.js

@@ -1,7 +1,8 @@
-/*global expect, d*/
-
+/*global d*/
 'use strict';
 
+const { expect } = require('chai');
+
 const uuid = require('uuid');
 const _ = require('lodash');
 const sinon = require('sinon');

test/integration/builder/selects.js

@@ -1,6 +1,8 @@
-/*global expect, d*/
+/*global d*/
 'use strict';
 
+const { expect } = require('chai');
+
 const _ = require('lodash');
 const assert = require('assert');
 const Runner = require('../../../lib/runner');

test/integration/builder/transaction.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 const Knex = require('../../../knex');
 const _ = require('lodash');
 const sinon = require('sinon');

test/integration/builder/updates.js

@@ -1,7 +1,8 @@
-/*global expect, d*/
-
+/*global d*/
 'use strict';
 
+const { expect } = require('chai');
+
 module.exports = function(knex) {
   describe('Updates', function() {
     it('should handle updates', function() {

test/integration/connection-config-provider.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 const _ = require('lodash');
 const makeKnex = require('../../knex');
 

test/integration/datatype/bigint.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 module.exports = function(knex) {
   const bigintTimestamp = 1464294366973;
   const negativeBigintTimestamp = -1464294366973;

test/integration/logger.js

@@ -1,7 +1,9 @@
-/*global expect, d*/
+/*global d*/
 
 'use strict';
 
+const { expect } = require('chai');
+
 const _ = require('lodash');
 
 module.exports = function(knex) {

test/integration/migrate/index.js

@@ -1,6 +1,7 @@
-/*global expect*/
 'use strict';
 
+const { expect } = require('chai');
+
 const equal = require('assert').equal;
 const fs = require('fs');
 const path = require('path');

test/integration/schema/index.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 const _ = require('lodash');
 
 const wrapIdentifier = (value, wrap) => {

test/integration/seed/index.js

@@ -1,6 +1,7 @@
-/*global expect*/
 'use strict';
 
+const { expect } = require('chai');
+
 const path = require('path');
 const rimraf = require('rimraf');
 

test/integration/suite.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 module.exports = function(knex) {
   const sinon = require('sinon');
 

test/unit/dialects/mssql.js

@@ -1,5 +1,3 @@
-// global it, describe
-
 'use strict';
 const expect = require('chai').expect;
 const knex = require('../../../knex');

test/unit/dialects/oracledb.js

@@ -1,5 +1,3 @@
-// global it, describe
-
 'use strict';
 const _ = require('lodash');
 const expect = require('chai').expect;

test/unit/dialects/sqlite3.js

@@ -1,6 +1,5 @@
-// global it, describe, expect
-
 'use strict';
+
 const sinon = require('sinon');
 const DDL = require('../../../lib/dialects/sqlite3/schema/ddl');
 

test/unit/schema/mysql.js

@@ -1,4 +1,4 @@
-/*global expect*/
+const { expect } = require('chai');
 
 const sinon = require('sinon');
 const MySQL_Client = require('../../../lib/dialects/mysql');

test/unit/schema/oracle.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 const sinon = require('sinon');
 const Oracle_Client = require('../../../lib/dialects/oracle');
 const client = new Oracle_Client({ client: 'oracledb' });

test/unit/schema/oracledb.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 const sinon = require('sinon');
 const Oracle_Client = require('../../../lib/dialects/oracledb');
 const client = new Oracle_Client({ client: 'oracledb' });

test/unit/schema/postgres.js

@@ -1,4 +1,4 @@
-/*global expect*/
+const { expect } = require('chai');
 
 let tableSql;
 

test/unit/schema/redshift.js

@@ -1,8 +1,8 @@
-/*global expect*/
 /* eslint max-len:0 */
-
 'use strict';
 
+const { expect } = require('chai');
+
 let tableSql;
 
 const Redshift_Client = require('../../../lib/dialects/redshift');

test/unit/schema/sqlite3.js

@@ -1,7 +1,7 @@
-/*global expect*/
-
 'use strict';
 
+const { expect } = require('chai');
+
 let tableSql;
 
 const sinon = require('sinon');

test/unit/seed/seeder.js

@@ -1,7 +1,8 @@
-/*global expect*/
 /*eslint no-var:0, indent:0, max-len:0 */
 'use strict';
 
+const { expect } = require('chai');
+
 const mockFs = require('mock-fs');
 const knex = require('../../../knex');