- Working on babel tests

Author: ferdikoomen

jest.config.js

@@ -15,12 +15,14 @@ module.exports = {
             displayName: 'E2E',
             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.fetch.spec.js',
+                // '<rootDir>/test/e2e/v2.xhr.spec.js',
+                // '<rootDir>/test/e2e/v2.node.spec.js',
+                // '<rootDir>/test/e2e/v2.babel.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/v3.babel.spec.js',
             ],
         },
     ],

package.json

@@ -75,6 +75,7 @@
         "rimraf": "3.0.2"
     },
     "devDependencies": {
+        "@babel/cli": "7.11.6",
         "@babel/core": "7.11.6",
         "@babel/preset-env": "7.11.5",
         "@babel/preset-typescript": "7.10.4",

test/e2e/scripts/browser.js

@@ -16,6 +16,7 @@ async function start() {
         ]
     });
     page = await browser.newPage();
+    page.on('console', msg => console.log(msg.text()));
     await page.goto(`http://localhost:3000/`, {
         waitUntil: 'networkidle0',
     });

test/e2e/scripts/compile.js

@@ -4,8 +4,8 @@ const ts = require('typescript');
 const path = require('path');
 const os = require('os');
 
-function compile(version, client) {
-    const baseDir = `./test/e2e/generated/${version}/${client}/`;
+function compile(dir) {
+    const baseDir = `./test/e2e/generated/${dir}/`;
     const tsconfig = {
         compilerOptions: {
             target: 'es6',

test/e2e/scripts/copy.js

@@ -2,10 +2,10 @@
 
 const fs = require('fs');
 
-async function copy(version, client) {
+function copy(dir) {
     fs.copyFileSync(
         './test/e2e/assets/script.js',
-        `./test/e2e/generated/${version}/${client}/script.js`,
+        `./test/e2e/generated/${dir}/script.js`,
     );
 }
 

test/e2e/scripts/generate.js

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

test/e2e/scripts/server.js

@@ -5,14 +5,14 @@ const express = require('express');
 let app;
 let server
 
-async function start(version, client) {
+async function start(dir) {
     return new Promise(resolve => {
         app = express();
 
         // 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}/`, {
+        app.use('/js', express.static(`./test/e2e/generated/${dir}/`, {
             extensions: ['', 'js'],
             index: 'index.js'
         }));
@@ -24,14 +24,6 @@ async function start(version, client) {
             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.

test/e2e/scripts/transpile.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const glob = require('glob');
+const fs = require('fs');
+const babel = require('@babel/core');
+
+function transpile(dir) {
+    glob.sync(`./test/e2e/generated/${dir}/**/*.ts`).forEach(file => {
+        try {
+            const content = fs.readFileSync(file, 'utf8').toString();
+            const result = babel.transformSync(content, {filename: file});
+            const filename = file.replace(/\.ts$/, '.js');
+            fs.writeFileSync(filename, result.code);
+        } catch (error) {
+            console.error(error);
+        }
+    });
+}
+
+module.exports = transpile;

test/e2e/v2.babel.spec.js

@@ -0,0 +1,38 @@
+'use strict';
+
+const generate = require('./scripts/generate');
+const copy = require('./scripts/copy');
+const transpile = require('./scripts/transpile');
+const server = require('./scripts/server');
+const browser = require('./scripts/browser');
+
+describe('v2.fetch', () => {
+
+    beforeAll(async () => {
+        await generate('v2/babel', 'v2', 'fetch', true, true);
+        await copy('v2/babel');
+        transpile('v2/babel');
+        await server.start('v2/babel');
+        await browser.start();
+    }, 30000);
+
+    afterAll(async () => {
+        await server.stop();
+        await browser.stop();
+    });
+
+    it('complexService', async () => {
+        const result = await browser.evaluate(async () => {
+            return await window.api.ComplexService.complexTypes({
+                parameterObject: {
+                    first: {
+                        second: {
+                            third: 'Hello World!'
+                        }
+                    }
+                }
+            });
+        });
+        expect(result).toBeDefined();
+    });
+});

test/e2e/v2.fetch.spec.js

@@ -9,10 +9,10 @@ const browser = require('./scripts/browser');
 describe('v2.fetch', () => {
 
     beforeAll(async () => {
-        await generate('v2', 'fetch');
-        await copy('v2', 'fetch');
-        await compile('v2', 'fetch');
-        await server.start('v2', 'fetch');
+        await generate('v2/fetch', 'v2', 'fetch');
+        await copy('v2/fetch');
+        compile('v2/fetch');
+        await server.start('v2/fetch');
         await browser.start();
     }, 30000);