- E2E test working, failing on node, but support will be build soon

Author: ferdikoomen

jest.config.js

@@ -16,11 +16,11 @@ module.exports = {
             testEnvironment: 'node',
             testMatch: [
                 '<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',
+                '<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',
             ],
         },
     ],

package.json

@@ -39,8 +39,7 @@
     },
     "files": [
         "bin/index.js",
-        "dist/index.js",
-        "src/templates/**/*.ts"
+        "dist/index.js"
     ],
     "scripts": {
         "clean": "rimraf ./dist ./test/generated ./test/e2e/generated ./samples/generated ./coverage ./node_modules/.cache",
@@ -61,7 +60,7 @@
         "prettier:fix": "prettier \"./src/**/*.ts\" \"./bin/index.js\" --write",
         "prepublish": "yarn run clean && yarn run release",
         "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b",
-        "aap": "node ./test/e2e/index.js"
+        "aap": "node test/e2e/index.js"
     },
     "dependencies": {
         "camelcase": "6.0.0",

test/e2e/test/script.js renamed to test/e2e/assets/script.js

@@ -1,3 +1,3 @@
 import('./index.js').then(module => {
-    window.test = module;
+    window.api = module;
 });

test/e2e/index.js

@@ -6,6 +6,9 @@ let browser;
 let page
 
 async function start() {
+    // This starts the a new  puppeteer browser (Chrome)
+    // and load the localhost page, this page will load the
+    // javascript modules (see server.js for more info)
     browser = await puppeteer.launch();
     page = await browser.newPage();
     await page.goto(`http://localhost:3000/`, {

test/e2e/scripts/browser.js

@@ -5,7 +5,7 @@ const path = require('path');
 const os = require('os');
 
 function compile(version, client) {
-    const baseDir = `./test/e2e/generated/${version}/${client}/js/api/`;
+    const baseDir = `./test/e2e/generated/${version}/${client}/`;
     const tsconfig = {
         compilerOptions: {
             target: 'es6',
@@ -14,11 +14,15 @@ function compile(version, client) {
         },
         include: ['./index.ts'],
     };
+
+    // Compile files to JavaScript (ES6 modules)
     const configFile = ts.parseConfigFileTextToJson('tsconfig.json', JSON.stringify(tsconfig));
     const configFileResult = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.resolve(process.cwd(), baseDir), undefined, 'tsconfig.json');
     const compilerHost = ts.createCompilerHost(configFileResult.options);
     const compiler = ts.createProgram(configFileResult.fileNames, configFileResult.options, compilerHost);
     const result = compiler.emit();
+
+    // Show errors or warnings (if any)
     const diagnostics = ts.getPreEmitDiagnostics(compiler).concat(result.diagnostics);
     if (diagnostics.length) {
         console.log(ts.formatDiagnosticsWithColorAndContext(diagnostics, {

test/e2e/scripts/compile.js

@@ -1,19 +1,12 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
-const glob = require('glob');
 
 async function copy(version, client) {
-    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)
-        );
-    }
+    fs.copyFileSync(
+        './test/e2e/assets/script.js',
+        `./test/e2e/generated/${version}/${client}/script.js`,
+    );
 }
 
 module.exports = copy;

test/e2e/scripts/copy.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}/js/api/`,
+        output: `./test/e2e/generated/${version}/${client}/`,
         httpClient: client,
         useOptions: false,
         useUnionTypes: false,

test/e2e/scripts/generate.js

@@ -9,17 +9,34 @@ async function start(version, client) {
     return new Promise(resolve => {
         app = express();
 
-        app.use(express.static(`./test/e2e/generated/${version}/${client}`, {
+        // Serve the JavaScript files from the specific folder, since we are using browser
+        // based ES6 modules, this also means that we can just request the js/index.js file
+        // and all other relative paths are resolved from that file.
+        app.use('/js', express.static(`./test/e2e/generated/${version}/${client}/`, {
             extensions: ['', 'js'],
             index: 'index.js'
         }));
 
+        // When we request the index then we can just return the script loader.
+        // This file is copied from test/e2e/assets/script.js to the output directory
+        // of the specific version and client.
         app.get('/', (req, res) => {
-            res.send('<script src="public/script.js"></script>');
+            res.send('<script src="js/script.js"></script>');
         });
 
+        const aap = (obj) => {
+            const a = {};
+            for (const key in obj) {
+                a[key] = obj[key];
+            }
+            return a;
+        }
+
+        // Register an 'echo' server that just returns all data from the API calls.
+        // Although this might not be a 'correct' response, we can use this to test
+        // the majority of API calls.
         app.all('/base/api/*', (req, res) => {
-            res.send({
+            res.json({
                 method: req.method,
                 protocol: req.protocol,
                 hostname: req.hostname,