- Test

Author: ferdikoomen

jest.config.js

@@ -5,25 +5,29 @@ module.exports = {
             testEnvironment: 'node',
             testMatch: [
                 '<rootDir>/src/**/*.spec.ts',
-                '<rootDir>/test/**/*.spec.js',
+                '<rootDir>/test/index.spec.js',
             ],
             moduleNameMapper: {
                 '\\.hbs$': '<rootDir>/src/templates/__mocks__/index.js',
             },
-            collectCoverageFrom: [
-                'src/**/*.ts',
-                '!src/**/*.d.ts',
-            ],
         },
         {
             displayName: 'E2E',
             testEnvironment: 'node',
             testMatch: [
-                '<rootDir>/test/e2e/index.js',
+                '<rootDir>/test/e2e/v2.fetch.spec.js',
+                // '<rootDir>/test/e2e/v2.xhr.spec.js',
+                // '<rootDir>/test/e2e/v2.node.spec.js',
+                // '<rootDir>/test/e2e/v3.fetch.spec.js',
+                // '<rootDir>/test/e2e/v3.xhr.spec.js',
+                // '<rootDir>/test/e2e/v3.node.spec.js',
             ],
-            globals: {
-                URL: 'http://localhost:3000',
-            },
         },
     ],
+    collectCoverageFrom: [
+        '<rootDir>/src/**/*.ts',
+        '!<rootDir>/src/**/*.d.ts',
+        '!<rootDir>/bin',
+        '!<rootDir>/dist',
+    ],
 };

package.json

@@ -54,13 +54,14 @@
         "test:update": "jest --selectProjects UNIT --updateSnapshot",
         "test:watch": "jest --selectProjects UNIT --watch",
         "test:coverage": "jest --selectProjects UNIT --coverage",
-        "test:e2e": "jest --selectProjects E2E",
-        "eslint": "eslint \"./src/**/*.ts\" \"./test/**/*.ts\" \"./bin/index.js\"",
-        "eslint:fix": "eslint \"./src/**/*.ts\" \"./test/**/*.ts\" \"./bin/index.js\" --fix",
-        "prettier": "prettier \"./src/**/*.ts\" \"./test/**/*.ts\" \"./bin/index.js\" --check",
-        "prettier:fix": "prettier \"./src/**/*.ts\" \"./test/**/*.ts\" \"./bin/index.js\" --write",
+        "test:e2e": "jest --selectProjects E2E --runInBand",
+        "eslint": "eslint \"./src/**/*.ts\" \"./bin/index.js\"",
+        "eslint:fix": "eslint \"./src/**/*.ts\" \"./bin/index.js\" --fix",
+        "prettier": "prettier \"./src/**/*.ts\" \"./bin/index.js\" --check",
+        "prettier:fix": "prettier \"./src/**/*.ts\" \"./bin/index.js\" --write",
         "prepublish": "yarn run clean && yarn run release",
-        "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
+        "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b",
+        "aap": "node ./test/e2e/index.js"
     },
     "dependencies": {
         "camelcase": "6.0.0",

test/e2e/index.js

@@ -1,57 +1,4 @@
 'use strict';
 
-const generate = require('./scripts/generate');
-const copy = require('./scripts/copy');
-const compile = require('./scripts/compile');
-const build = require('./scripts/build');
 const server = require('./scripts/server');
-const browser = require('./scripts/browser');
-
-describe('e2e', () => {
-
-    beforeAll(async () => {
-        await generate('v2', 'fetch');
-        await generate('v2', 'xhr');
-        await generate('v2', 'node');
-        await generate('v3', 'fetch');
-        await generate('v3', 'xhr');
-        await generate('v3', 'node');
-
-        await copy('v2', 'fetch');
-        await copy('v2', 'xhr');
-        await copy('v2', 'node');
-        await copy('v3', 'fetch');
-        await copy('v3', 'xhr');
-        await copy('v3', 'node');
-
-        await build('v2', 'fetch');
-        await build('v2', 'xhr');
-        await build('v2', 'node');
-        await build('v3', 'fetch');
-        await build('v3', 'xhr');
-        await build('v3', 'node');
-
-        await server.start();
-        await browser.start();
-    }, 30000);
-
-    afterAll(async () => {
-        await server.stop();
-        await browser.stop();
-    });
-
-    it('runs in chrome', async () => {
-        expect(true).toBeTruthy();
-    });
-
-    it('runs in node', async () => {
-        // const child1 = require('./generated/v2/fetch/index.js');
-        // const child2 = require('./generated/v3/fetch/index.js');
-        // const resultDefaultsService1 = child1.testDefaultsService();
-        // const resultDefaultsService2 = child2.testDefaultsService();
-        // expect(resultDefaultsService1).toContain('aap');
-        // expect(resultDefaultsService2).toContain('aap');
-        expect(true).toBeTruthy();
-    });
-
-});
+server.start('v2', 'fetch');

test/e2e/index.txt

@@ -8,14 +8,22 @@ let page
 async function start() {
     browser = await puppeteer.launch();
     page = await browser.newPage();
+    await page.goto(`http://localhost:3000/`, {
+        waitUntil: 'networkidle0',
+    });
 }
 
 async function stop() {
     await page.close();
     await browser.close();
 }
 
+async function evaluate(fn) {
+    return await page.evaluate(fn);
+}
+
 module.exports = {
     start,
     stop,
+    evaluate,
 };

test/e2e/readme.md

@@ -5,11 +5,11 @@ const path = require('path');
 const os = require('os');
 
 function compile(version, client) {
-    const baseDir = `./test/e2e/generated/src/${version}/${client}`;
+    const baseDir = `./test/e2e/generated/${version}/${client}/js/api/`;
     const tsconfig = {
         compilerOptions: {
             target: 'es6',
-            module: 'commonjs',
+            module: 'es6',
             moduleResolution: 'node',
         },
         include: ['./index.ts'],

test/e2e/scripts/browser.js

@@ -1,11 +1,19 @@
 'use strict';
 
 const fs = require('fs');
+const path = require('path');
+const glob = require('glob');
 
 async function copy(version, client) {
-    return new Promise(resolve => {
-        fs.copyFile('./test/e2e/test/index.ts', `./test/e2e/generated/${version}/${client}/index.ts`, resolve);
-    });
+    const input = path.resolve('./test/e2e/test/');
+    const output = path.resolve(`./test/e2e/generated/${version}/${client}/js`);
+    const files = glob.sync('*.js', { cwd: input });
+    for (let file of files) {
+        fs.copyFileSync(
+            path.resolve(input, file),
+            path.resolve(output, file)
+        );
+    }
 }
 
 module.exports = copy;

test/e2e/scripts/build.js

@@ -5,7 +5,7 @@ const OpenAPI = require('../../../dist');
 async function generate(version, client) {
     await OpenAPI.generate({
         input: `./test/spec/${version}.json`,
-        output: `./test/e2e/generated/${version}/${client}/api`,
+        output: `./test/e2e/generated/${version}/${client}/js/api/`,
         httpClient: client,
         useOptions: false,
         useUnionTypes: false,