test: move got tests into got folder (#2542)

package.json

@@ -59,7 +59,7 @@
     "lint:js": "eslint --cache --cache-location './.cache/eslint' '**/*.js'",
     "lint:js:fix": "eslint --cache --cache-location './.cache/eslint' --fix '**/*.js'",
     "lint:ts": "dtslint --expectOnly types",
-    "test": "nyc --reporter=lcov --reporter=text mocha tests",
+    "test": "nyc --reporter=lcov --reporter=text mocha --recursive tests",
     "test:coverage": "open coverage/lcov-report/index.html"
   },
   "license": "MIT",

tests/test_allow_unmocked.js → tests/got/test_allow_unmocked.js

@@ -3,10 +3,10 @@
 const { expect } = require('chai')
 const http = require('http')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 
 const got = require('./got_client')
-const { startHttpServer } = require('./servers')
+const { startHttpServer } = require('../servers')
 
 describe('allowUnmocked option', () => {
   it('with allowUnmocked, mocked request still works', async () => {

tests/test_allow_unmocked_https.js → tests/got/test_allow_unmocked_https.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 
 const got = require('./got_client')
-const servers = require('./servers')
+const servers = require('../servers')
 
 describe('allowUnmocked option (https)', () => {
   it('Nock with allowUnmocked and an url match', async () => {

tests/test_back_filters.js → tests/got/test_back_filters.js

@@ -6,9 +6,9 @@ const path = require('path')
 const rimraf = require('rimraf')
 
 const got = require('./got_client')
-const { startHttpServer } = require('./servers')
+const { startHttpServer } = require('../servers')
 
-const nock = require('../')
+const nock = require('../..')
 
 const nockBack = nock.back
 const originalMode = nockBack.currentMode

tests/test_basic_auth.js → tests/got/test_basic_auth.js

@@ -2,7 +2,7 @@
 
 const { expect } = require('chai')
 const assertRejects = require('assert-rejects')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('basic auth with username and password', () => {

tests/test_body_match.js → tests/got/test_body_match.js

@@ -3,7 +3,7 @@
 const assertRejects = require('assert-rejects')
 const { expect } = require('chai')
 const FormData = require('form-data')
-const nock = require('../')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('`matchBody()`', () => {

tests/test_content_encoding.js → tests/got/test_content_encoding.js

@@ -2,7 +2,7 @@
 
 const { expect } = require('chai')
 const zlib = require('zlib')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('Content Encoding', () => {

tests/test_default_reply_headers.js → tests/got/test_default_reply_headers.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('`defaultReplyHeaders()`', () => {

tests/test_define.js → tests/got/test_define.js

@@ -3,7 +3,7 @@
 const http = require('http')
 const { expect } = require('chai')
 const assertRejects = require('assert-rejects')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('`define()`', () => {

tests/test_delay.js → tests/got/test_delay.js

@@ -7,10 +7,10 @@ const http = require('http')
 const stream = require('stream')
 const assertRejects = require('assert-rejects')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
-const textFilePath = path.resolve(__dirname, './assets/reply_file_1.txt')
+const textFilePath = path.resolve(__dirname, '../assets/reply_file_1.txt')
 const textFileContents = fs.readFileSync(textFilePath, { encoding: 'utf8' })
 
 async function resolvesInAtLeast(promise, durationMillis) {

tests/test_dynamic_mock.js → tests/got/test_dynamic_mock.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 // "dynamic" refers to `reply` getting a single callback argument that returns or calls the callback with an array of [status, [body, headers]]]

tests/test_events.js → tests/got/test_events.js

@@ -5,7 +5,7 @@ const http = require('http')
 const path = require('path')
 const sinon = require('sinon')
 
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 function ignore() {}
@@ -62,7 +62,7 @@ it('emits request and request body', async () => {
 })
 
 it('emits request and replied events when response body is a stream', async () => {
-  const textFilePath = path.resolve(__dirname, './assets/reply_file_1.txt')
+  const textFilePath = path.resolve(__dirname, '../assets/reply_file_1.txt')
   const scope = nock('http://example.test')
     .get('/')
     .replyWithFile(200, textFilePath)

tests/test_fake_timer.js → tests/got/test_fake_timer.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const fakeTimers = require('@sinonjs/fake-timers')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 // https://github.com/nock/nock/issues/1334

tests/test_header_matching.js → tests/got/test_header_matching.js

@@ -4,7 +4,7 @@ const http = require('http')
 const assertRejects = require('assert-rejects')
 const { expect } = require('chai')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('Header matching', () => {

tests/test_intercept.js → tests/got/test_intercept.js

@@ -6,7 +6,7 @@ const { expect } = require('chai')
 const sinon = require('sinon')
 const assertRejects = require('assert-rejects')
 const url = require('url')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 const acceptableGlobalKeys = new Set([

tests/test_intercept_parallel.js → tests/got/test_intercept_parallel.js

@@ -2,7 +2,7 @@
 
 const { expect } = require('chai')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 // Tests for a regression where multiple ClientRequests call `.end` during the

tests/test_logging.js → tests/got/test_logging.js

@@ -3,7 +3,7 @@
 const debug = require('debug')
 const sinon = require('sinon')
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('Logging using the `debug` package', () => {

tests/test_net_connect.js → tests/got/test_net_connect.js

@@ -3,10 +3,10 @@
 const { expect } = require('chai')
 const assertRejects = require('assert-rejects')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 
 const got = require('./got_client')
-const servers = require('./servers')
+const servers = require('../servers')
 
 describe('`disableNetConnect()`', () => {
   it('prevents connection to unmocked hosts', async () => {

tests/test_nock_lifecycle.js → tests/got/test_nock_lifecycle.js

@@ -2,12 +2,12 @@
 
 const http = require('http')
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const sinon = require('sinon')
 const assertRejects = require('assert-rejects')
 
 const got = require('./got_client')
-const servers = require('./servers')
+const servers = require('../servers')
 
 describe('Nock lifecycle functions', () => {
   describe('`activate()`', () => {

tests/test_nock_off.js → tests/got/test_nock_off.js

@@ -2,10 +2,10 @@
 
 const { expect } = require('chai')
 const http = require('http')
-const nock = require('..')
+const nock = require('../..')
 
 const got = require('./got_client')
-const httpsServer = require('./servers')
+const httpsServer = require('../servers')
 
 describe('NOCK_OFF env var', () => {
   let original
@@ -41,8 +41,8 @@ describe('NOCK_OFF env var', () => {
     nock.restore()
     const originalClient = http.ClientRequest
 
-    delete require.cache[require.resolve('..')]
-    const newNock = require('..')
+    delete require.cache[require.resolve('../..')]
+    const newNock = require('../..')
 
     expect(http.ClientRequest).to.equal(originalClient)
     expect(newNock.isActive()).to.equal(false)

tests/test_persist_optionally.js → tests/got/test_persist_optionally.js

@@ -7,10 +7,10 @@ const http = require('http')
 const path = require('path')
 const assertRejects = require('assert-rejects')
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
-const textFilePath = path.resolve(__dirname, './assets/reply_file_1.txt')
+const textFilePath = path.resolve(__dirname, '../assets/reply_file_1.txt')
 
 describe('`optionally()`', () => {
   it('optional mocks do not appear in `pendingMocks()`', () => {

tests/test_query.js → tests/got/test_query.js

@@ -3,7 +3,7 @@
 const { expect } = require('chai')
 const sinon = require('sinon')
 const url = require('url')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 const assertRejects = require('assert-rejects')
 

tests/test_query_complex.js → tests/got/test_query_complex.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('`query()` complex encoding', () => {

tests/test_recorder.js → tests/got/test_recorder.js

@@ -6,10 +6,10 @@ const { URLSearchParams } = require('url')
 const zlib = require('zlib')
 const sinon = require('sinon')
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 
 const got = require('./got_client')
-const servers = require('./servers')
+const servers = require('../servers')
 
 describe('Recorder', () => {
   let globalCount

tests/test_redirects.js → tests/got/test_redirects.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 it('follows redirects', async () => {

tests/test_remove_interceptor.js → tests/got/test_remove_interceptor.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('`removeInterceptor()`', () => {

tests/test_repeating.js → tests/got/test_repeating.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 const assertRejects = require('assert-rejects')
 

tests/test_reply_body.js → tests/got/test_reply_body.js

@@ -3,7 +3,7 @@
 // Tests for the body argument passed to `.reply()`.
 
 const { expect } = require('chai')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('`reply()` body', () => {

tests/test_reply_function_async.js → tests/got/test_reply_function_async.js

@@ -7,7 +7,7 @@
 const { expect } = require('chai')
 const assertRejects = require('assert-rejects')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('asynchronous `reply()` function', () => {

tests/test_reply_function_sync.js → tests/got/test_reply_function_sync.js

@@ -7,7 +7,7 @@
 const assertRejects = require('assert-rejects')
 const { expect } = require('chai')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
 describe('synchronous `reply()` function', () => {

tests/test_reply_headers.js → tests/got/test_reply_headers.js

@@ -10,10 +10,10 @@ const fakeTimers = require('@sinonjs/fake-timers')
 const fs = require('fs')
 const path = require('path')
 
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
-const textFilePath = path.resolve(__dirname, './assets/reply_file_1.txt')
+const textFilePath = path.resolve(__dirname, '../assets/reply_file_1.txt')
 
 describe('`reply()` headers', () => {
   describe('using parameter value', () => {

tests/test_reply_with_file.js → tests/got/test_reply_with_file.js

@@ -7,11 +7,11 @@ const path = require('path')
 const sinon = require('sinon')
 const { expect } = require('chai')
 const proxyquire = require('proxyquire').preserveCache()
-const nock = require('..')
+const nock = require('../..')
 const got = require('./got_client')
 
-const textFilePath = path.resolve(__dirname, './assets/reply_file_1.txt')
-const binaryFilePath = path.resolve(__dirname, './assets/reply_file_2.txt.gz')
+const textFilePath = path.resolve(__dirname, '../assets/reply_file_1.txt')
+const binaryFilePath = path.resolve(__dirname, '../assets/reply_file_2.txt.gz')
 
 describe('`replyWithFile()`', () => {
   it('reply with file', async () => {
@@ -65,8 +65,8 @@ describe('`replyWithFile()`', () => {
   })
 
   describe('with no fs', () => {
-    const { Scope } = proxyquire('../lib/scope', {
-      './interceptor': proxyquire('../lib/interceptor', {
+    const { Scope } = proxyquire('../../lib/scope', {
+      './interceptor': proxyquire('../../lib/interceptor', {
         fs: null,
       }),
     })

tests/test_request_overrider.js → tests/got/test_request_overrider.js

@@ -15,11 +15,11 @@ const https = require('https')
 const { URL } = require('url')
 const { expect } = require('chai')
 const sinon = require('sinon')
-const nock = require('..')
+const nock = require('../..')
 const FormData = require('form-data')
 
 const got = require('./got_client')
-const servers = require('./servers')
+const servers = require('../servers')
 
 describe('Request Overrider', () => {
   it('response is an http.IncomingMessage instance', done => {