From d667a049b6b375eb1e91c2a67bf426028974d466 Mon Sep 17 00:00:00 2001
From: DIYgod <diy.d.god@gmail.com>
Date: Thu, 24 Jan 2019 15:03:34 +0800
Subject: [PATCH] test: clear up

---
 package.json                    | 2 +-
 test/{response.js => router.js} | 6 ++++--
 test/{ => utils}/axios.js       | 4 ++--
 test/{ => utils}/date.js        | 2 +-
 test/{ => utils}/md5.js         | 2 +-
 test/{ => utils}/puppeteer.js   | 2 +-
 test/{ => utils}/wait.js        | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)
 rename test/{response.js => router.js} (98%)
 rename test/{ => utils}/axios.js (94%)
 rename test/{ => utils}/date.js (97%)
 rename test/{ => utils}/md5.js (76%)
 rename test/{ => utils}/puppeteer.js (89%)
 rename test/{ => utils}/wait.js (86%)

diff --git a/package.json b/package.json
index 305257c09..7858b6167 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
   },
   "jest": {
     "testMatch": [
-      "**/test/*.js"
+      "**/test/**/*.js"
     ],
     "coverageReporters": [
       "text-summary",
diff --git a/test/response.js b/test/router.js
similarity index 98%
rename from test/response.js
rename to test/router.js
index 5ff9b26a8..aa23b2ab9 100644
--- a/test/response.js
+++ b/test/router.js
@@ -46,7 +46,8 @@ async function checkRSS(response) {
     });
 }
 
-describe('response', () => {
+describe('router', () => {
+    // root
     it(`/`, async () => {
         const response = await request.get('/');
         expect(response.status).toBe(200);
@@ -54,13 +55,13 @@ describe('response', () => {
         expect(response.headers['cache-control']).toBe('no-cache');
     });
 
+    // route
     it(`/test (origin)`, async () => {
         const response = await request.get('/test');
         expect(response.status).toBe(200);
 
         await checkRSS(response);
     });
-
     it(`/test (cache)`, async () => {
         const response = await request.get('/test');
         expect(response.status).toBe(200);
@@ -73,6 +74,7 @@ describe('response', () => {
         await checkRSS(response);
     });
 
+    // api
     it(`/api/routes/test`, async () => {
         const response = await request.get('/api/routes/test');
         expect(response.status).toBe(200);
diff --git a/test/axios.js b/test/utils/axios.js
similarity index 94%
rename from test/axios.js
rename to test/utils/axios.js
index 4e01ae19a..1561fb929 100644
--- a/test/axios.js
+++ b/test/utils/axios.js
@@ -1,7 +1,7 @@
-const axios = require('../lib/utils/axios');
+const axios = require('../../lib/utils/axios');
 const MockAdapter = require('axios-mock-adapter');
 const mock = new MockAdapter(axios);
-const config = require('../lib/config');
+const config = require('../../lib/config');
 
 describe('axios', () => {
     it('axios headers', async () => {
diff --git a/test/date.js b/test/utils/date.js
similarity index 97%
rename from test/date.js
rename to test/utils/date.js
index 5315bf9df..7dff7d299 100644
--- a/test/date.js
+++ b/test/utils/date.js
@@ -1,4 +1,4 @@
-const parseDate = require('../lib/utils/date');
+const parseDate = require('../../lib/utils/date');
 const MockDate = require('mockdate');
 
 describe('date', () => {
diff --git a/test/md5.js b/test/utils/md5.js
similarity index 76%
rename from test/md5.js
rename to test/utils/md5.js
index 8033a55ca..b258e11a1 100644
--- a/test/md5.js
+++ b/test/utils/md5.js
@@ -1,4 +1,4 @@
-const md5 = require('../lib/utils/md5');
+const md5 = require('../../lib/utils/md5');
 
 describe('md5', () => {
     it('md5 RSSHub', async () => {
diff --git a/test/puppeteer.js b/test/utils/puppeteer.js
similarity index 89%
rename from test/puppeteer.js
rename to test/utils/puppeteer.js
index f381c31b4..d59b76fd4 100644
--- a/test/puppeteer.js
+++ b/test/utils/puppeteer.js
@@ -1,4 +1,4 @@
-const puppeteer = require('../lib/utils/puppeteer');
+const puppeteer = require('../../lib/utils/puppeteer');
 
 describe('puppeteer', () => {
     it('puppeteer run', async () => {
diff --git a/test/wait.js b/test/utils/wait.js
similarity index 86%
rename from test/wait.js
rename to test/utils/wait.js
index 862cf7d91..98e6de2f8 100644
--- a/test/wait.js
+++ b/test/utils/wait.js
@@ -1,4 +1,4 @@
-const wait = require('../lib/utils/wait');
+const wait = require('../../lib/utils/wait');
 
 describe('wait', () => {
     it('wait 0.1 second', async () => {