From a3fdd5711ef44e6988c33cfcecb8075d51240ed9 Mon Sep 17 00:00:00 2001
From: Jytesh <44925963+Jytesh@users.noreply.github.com>
Date: Wed, 30 Jun 2021 11:14:02 +0530
Subject: [PATCH] Test: Removed this and requirable

Signed-off-by: Jytesh <44925963+Jytesh@users.noreply.github.com>
---
 package.json                                      | 2 --
 packages/keyv-mongo/package.json                  | 7 +------
 packages/keyv-mongo/test/test.js                  | 2 +-
 packages/keyv-mysql/package.json                  | 7 +------
 packages/keyv-mysql/test/test.js                  | 2 +-
 packages/keyv-postgres/package.json               | 7 +------
 packages/keyv-postgres/test/test.js               | 2 +-
 packages/keyv-redis/package.json                  | 7 +------
 packages/keyv-redis/test/test.js                  | 2 +-
 packages/keyv-sql/package.json                    | 7 +------
 packages/keyv-sql/test/test.js                    | 2 +-
 packages/keyv-sqlite/package.json                 | 7 +------
 packages/keyv-sqlite/test/test.js                 | 2 +-
 packages/keyv-test-suite/test/unit.js             | 2 +-
 packages/keyv/test/keyv.js                        | 2 +-
 packages/keyv/test/storage-adapters/mongodb.js    | 2 +-
 packages/keyv/test/storage-adapters/mysql.js      | 2 +-
 packages/keyv/test/storage-adapters/postgresql.js | 2 +-
 packages/keyv/test/storage-adapters/redis.js      | 2 +-
 packages/keyv/test/storage-adapters/sqlite.js     | 2 +-
 20 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/package.json b/package.json
index c67e0b84..af07f4cb 100644
--- a/package.json
+++ b/package.json
@@ -95,11 +95,9 @@
     "ava": "latest",
     "delay": "latest",
     "dotenv": "latest",
-    "knex": "latest",
     "lerna": "latest",
     "nyc": "latest",
     "pify": "latest",
-    "requirable": "latest",
     "sqlite3": "latest",
     "standard": "latest",
     "this": "latest",
diff --git a/packages/keyv-mongo/package.json b/packages/keyv-mongo/package.json
index b4721134..a2a9ec7e 100644
--- a/packages/keyv-mongo/package.json
+++ b/packages/keyv-mongo/package.json
@@ -37,10 +37,5 @@
   "scripts": {
     "test": "nyc --temp-dir ../../.nyc_output ava"
   },
-  "license": "MIT",
-  "ava": {
-    "require": [
-      "requirable"
-    ]
-  }
+  "license": "MIT"
 }
diff --git a/packages/keyv-mongo/test/test.js b/packages/keyv-mongo/test/test.js
index e53c265d..96734c67 100644
--- a/packages/keyv-mongo/test/test.js
+++ b/packages/keyv-mongo/test/test.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
 const Keyv = require('@keyvhq/keyv')
-const KeyvMongo = require('this')
+const KeyvMongo = require('../')
 
 require('dotenv').config()
 const mongoURL = process.env.MONGO_URL || 'mongodb://127.0.0.1:27017'
diff --git a/packages/keyv-mysql/package.json b/packages/keyv-mysql/package.json
index bbfa4aa0..0c199bc0 100644
--- a/packages/keyv-mysql/package.json
+++ b/packages/keyv-mysql/package.json
@@ -38,10 +38,5 @@
   "scripts": {
     "test": "nyc --temp-dir ../../.nyc_output ava"
   },
-  "license": "MIT",
-  "ava": {
-    "require": [
-      "requirable"
-    ]
-  }
+  "license": "MIT"
 }
diff --git a/packages/keyv-mysql/test/test.js b/packages/keyv-mysql/test/test.js
index 329552fc..4f7ee06d 100644
--- a/packages/keyv-mysql/test/test.js
+++ b/packages/keyv-mysql/test/test.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
 const Keyv = require('@keyvhq/keyv')
-const KeyvMysql = require('this')
+const KeyvMysql = require('../')
 
 require('dotenv').config()
 const dbUrl = process.env.MYSQL_URL || 'mysql://root:root@localhost/keyv_test'
diff --git a/packages/keyv-postgres/package.json b/packages/keyv-postgres/package.json
index 3519d254..01830b07 100644
--- a/packages/keyv-postgres/package.json
+++ b/packages/keyv-postgres/package.json
@@ -38,10 +38,5 @@
   "scripts": {
     "test": "nyc --temp-dir ../../.nyc_output ava --serial"
   },
-  "license": "MIT",
-  "ava": {
-    "require": [
-      "requirable"
-    ]
-  }
+  "license": "MIT"
 }
diff --git a/packages/keyv-postgres/test/test.js b/packages/keyv-postgres/test/test.js
index 3e959447..37a52a8f 100644
--- a/packages/keyv-postgres/test/test.js
+++ b/packages/keyv-postgres/test/test.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
 const Keyv = require('@keyvhq/keyv')
-const KeyvPostgres = require('this')
+const KeyvPostgres = require('../')
 
 const store = () => new KeyvPostgres({ uri: 'postgresql://postgres:postgres@localhost:5432/keyv_test' })
 keyvTestSuite(test, Keyv, store)
diff --git a/packages/keyv-redis/package.json b/packages/keyv-redis/package.json
index 27d90ca6..d4785fab 100644
--- a/packages/keyv-redis/package.json
+++ b/packages/keyv-redis/package.json
@@ -38,10 +38,5 @@
     "test": "nyc --temp-dir ../../.nyc_output ava",
     "test:docker": "docker-compose up --build --abort-on-container-exit --exit-code-from test"
   },
-  "license": "MIT",
-  "ava": {
-    "require": [
-      "requirable"
-    ]
-  }
+  "license": "MIT"
 }
diff --git a/packages/keyv-redis/test/test.js b/packages/keyv-redis/test/test.js
index 19ecbd2a..04c461d8 100644
--- a/packages/keyv-redis/test/test.js
+++ b/packages/keyv-redis/test/test.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
 const Keyv = require('@keyvhq/keyv')
-const KeyvRedis = require('this')
+const KeyvRedis = require('../')
 const Redis = require('ioredis')
 
 require('dotenv').config()
diff --git a/packages/keyv-sql/package.json b/packages/keyv-sql/package.json
index 2798d2eb..d47099e8 100644
--- a/packages/keyv-sql/package.json
+++ b/packages/keyv-sql/package.json
@@ -32,10 +32,5 @@
   "scripts": {
     "test": "nyc --temp-dir ../../.nyc_output ava"
   },
-  "license": "MIT",
-  "ava": {
-    "require": [
-      "requirable"
-    ]
-  }
+  "license": "MIT"
 }
diff --git a/packages/keyv-sql/test/test.js b/packages/keyv-sql/test/test.js
index f61bbcb5..4104e8e3 100644
--- a/packages/keyv-sql/test/test.js
+++ b/packages/keyv-sql/test/test.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
 const Keyv = require('@keyvhq/keyv')
-const KeyvSql = require('this')
+const KeyvSql = require('../')
 
 const sqlite3 = require('sqlite3')
 const pify = require('pify')
diff --git a/packages/keyv-sqlite/package.json b/packages/keyv-sqlite/package.json
index 05bf65b0..e1286bb5 100644
--- a/packages/keyv-sqlite/package.json
+++ b/packages/keyv-sqlite/package.json
@@ -38,10 +38,5 @@
   "scripts": {
     "test": "nyc --temp-dir ../../.nyc_output ava"
   },
-  "license": "MIT",
-  "ava": {
-    "require": [
-      "requirable"
-    ]
-  }
+  "license": "MIT"
 }
diff --git a/packages/keyv-sqlite/test/test.js b/packages/keyv-sqlite/test/test.js
index ff36eb24..e2310c58 100644
--- a/packages/keyv-sqlite/test/test.js
+++ b/packages/keyv-sqlite/test/test.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
 const Keyv = require('@keyvhq/keyv')
-const KeyvSqlite = require('../src/index.js')
+const KeyvSqlite = require('../')
 
 const store = () => new KeyvSqlite({ uri: 'sqlite://test/testdb.sqlite', busyTimeout: 30000 })
 keyvTestSuite(test, Keyv, store)
diff --git a/packages/keyv-test-suite/test/unit.js b/packages/keyv-test-suite/test/unit.js
index 6cb0b3ef..8cc08bd5 100644
--- a/packages/keyv-test-suite/test/unit.js
+++ b/packages/keyv-test-suite/test/unit.js
@@ -1,6 +1,6 @@
 const test = require('ava')
 const Keyv = require('@keyvhq/keyv')
-const keyvTestSuite = require('this')
+const keyvTestSuite = require('../')
 
 const store = () => new Map()
 keyvTestSuite(test, Keyv, store)
diff --git a/packages/keyv/test/keyv.js b/packages/keyv/test/keyv.js
index 75d85cce..f4851c48 100644
--- a/packages/keyv/test/keyv.js
+++ b/packages/keyv/test/keyv.js
@@ -1,7 +1,7 @@
 const test = require('ava')
 const tk = require('timekeeper')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
-const Keyv = require('this')
+const Keyv = require('../')
 
 test.serial('Keyv is a class', t => {
   t.is(typeof Keyv, 'function')
diff --git a/packages/keyv/test/storage-adapters/mongodb.js b/packages/keyv/test/storage-adapters/mongodb.js
index 72ebea74..716f2e70 100644
--- a/packages/keyv/test/storage-adapters/mongodb.js
+++ b/packages/keyv/test/storage-adapters/mongodb.js
@@ -1,6 +1,6 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
-const Keyv = require('this')
+const Keyv = require('../../')
 const KeyvMongo = require('@keyvhq/keyv-mongo')
 
 const store = () => new KeyvMongo('mongodb://127.0.0.1:27017')
diff --git a/packages/keyv/test/storage-adapters/mysql.js b/packages/keyv/test/storage-adapters/mysql.js
index cadded22..b5397ea9 100644
--- a/packages/keyv/test/storage-adapters/mysql.js
+++ b/packages/keyv/test/storage-adapters/mysql.js
@@ -1,6 +1,6 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
-const Keyv = require('this')
+const Keyv = require('../../')
 const KeyvMysql = require('@keyvhq/keyv-mysql')
 
 const store = () => new KeyvMysql('mysql://mysql@localhost/keyv_test')
diff --git a/packages/keyv/test/storage-adapters/postgresql.js b/packages/keyv/test/storage-adapters/postgresql.js
index 5e0497e0..21381819 100644
--- a/packages/keyv/test/storage-adapters/postgresql.js
+++ b/packages/keyv/test/storage-adapters/postgresql.js
@@ -1,6 +1,6 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
-const Keyv = require('this')
+const Keyv = require('../../')
 const KeyvPostgres = require('postgres')
 
 const store = () => new KeyvPostgres('postgresql://postgres@localhost:5432/keyv_test')
diff --git a/packages/keyv/test/storage-adapters/redis.js b/packages/keyv/test/storage-adapters/redis.js
index 85956923..83362267 100644
--- a/packages/keyv/test/storage-adapters/redis.js
+++ b/packages/keyv/test/storage-adapters/redis.js
@@ -1,6 +1,6 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
-const Keyv = require('this')
+const Keyv = require('../../')
 const KeyvRedis = require('redis')
 
 const store = () => new KeyvRedis('redis://localhost')
diff --git a/packages/keyv/test/storage-adapters/sqlite.js b/packages/keyv/test/storage-adapters/sqlite.js
index ae116fbf..8b1b097e 100644
--- a/packages/keyv/test/storage-adapters/sqlite.js
+++ b/packages/keyv/test/storage-adapters/sqlite.js
@@ -1,6 +1,6 @@
 const test = require('ava')
 const keyvTestSuite = require('@keyvhq/keyv-test-suite')
-const Keyv = require('this')
+const Keyv = require('../../')
 const KeyvSqlite = require('sqlite')
 
 const store = () => new KeyvSqlite('sqlite://test/testdb.sqlite')