Merge pull request #4 from mauriziovitale/feature-improve-e2e-schematics

Add e2e for schematics

.eslintrc.js

@@ -0,0 +1,19 @@
+module.exports = {
+  'env': {
+    'browser': true,
+    'es6': true,
+  },
+  'extends': [
+    'google',
+  ],
+  'globals': {
+    'Atomics': 'readonly',
+    'SharedArrayBuffer': 'readonly',
+  },
+  'parserOptions': {
+    'ecmaVersion': 2018,
+    'sourceType': 'module',
+  },
+  'rules': {
+  },
+};

.travis.yml

@@ -0,0 +1,44 @@
+language: node_js
+dist: trusty
+sudo: required
+node_js:
+  - "12.13.1"
+git:
+  depth: 25
+  quiet: true
+
+before_install:
+  - npm install -g yarn
+
+install: npm install
+
+
+branches:
+  only:
+  - master
+  - development
+
+stages:
+  - name: "Test & Build"
+
+jobs:
+    include:
+        - stage: "Test & Build"
+          name: Build
+          script: nx run lite-serve:build
+        - stage: "Test & Build"
+          name: Test
+          script:
+            - nx run lite-serve:build
+            - npm install file:dist/libs/lite-serve
+            - nx run lite-serve-e2e:e2e
+        - stage: deploy
+          if: branch == master and type == push && !fork
+          node_js: 'node' # pre-installed version
+          script:
+            - npm install -g semantic-release@^15
+            - nx run lite-serve:build
+            - npm run semantic-release
+
+cache:
+  directories:

.vscode/extensions.json

@@ -1,6 +1,12 @@
 {
   "recommendations": [
     "ms-vscode.vscode-typescript-tslint-plugin",
-    "esbenp.prettier-vscode"
+    "angular.ng-template",
+    "streetsidesoftware.code-spell-checker",
+    "ms-azuretools.vscode-docker",
+    "editorconfig.editorconfig",
+    "davidanson.vscode-markdownlint",
+    "esbenp.prettier-vscode",
+    "eamodio.gitlens"
   ]
 }

.vscode/launch.json

@@ -0,0 +1,77 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "jest",
+            "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+            "args": [
+                "--runInBand",
+                "--coverage=false",
+                "--config=`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} jest.config.js`",
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "jest watch",
+            "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+            "args": [
+                "--runInBand",
+                "--coverage=false",
+                "--watch",
+                "--config=`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} jest.config.js`",
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "e2e",
+            "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
+            "args": [
+                "`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} protractor.conf.js`",
+                "--specs=${file}"
+            ],
+            "envFile": "${workspaceFolder}/.env",
+            "console": "integratedTerminal",
+            "sourceMaps": true,
+            "smartStep": true,
+            "skipFiles": [
+                "${workspaceFolder}/node_modules/**/*.js",
+                "<node_internals>/**/*.js"
+            ],
+            "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "e2e with local adf",
+            "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
+            "args": [
+                "`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} protractor.conf.js`",
+                "--specs=${file}",
+                "--disableChecks",
+                "--with-local-adf"
+            ],
+            "envFile": "${workspaceFolder}/.env",
+            "console": "integratedTerminal",
+            "sourceMaps": true,
+            "smartStep": true,
+            "skipFiles": [
+                "${workspaceFolder}/node_modules/**/*.js",
+                "<node_internals>/**/*.js"
+            ],
+            "internalConsoleOptions": "neverOpen"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/.DS_Store": true,
+        "**/coverage": true,
+        "**/.happypack": true
+    },
+    "editor.renderIndentGuides": true,
+    "tslint.configFile": "tslint.json",
+    "markdownlint.config": {
+        "MD032": false,
+        "MD004": false,
+        "MD024": false,
+        "MD009": false,
+        "MD013": false,
+        "MD036": false,
+        "MD033" : false,
+        "MD031" : false
+    },
+    "cSpell.words": [
+        "webscript"
+    ]
+}

apps/lite-serve-e2e/tests/lite-serve.test.ts

@@ -3,19 +3,102 @@ import {
   runNxCommandAsync,
   uniq
 } from '@nrwl/nx-plugin/testing';
+import { readFileSync, writeFileSync } from 'fs';
 
 describe('lite-serve e2e', () => {
-  it('should create lite-serve', async done => {
+  it('should setup an existing project', async done => {
     const plugin = uniq('lite-serve');
     ensureNxProject('@angular-custom-builders/lite-serve:setup', 'dist/libs/lite-serve');
+    const pluginE2EName = `${plugin}-e2e`;
+    const projects = { [plugin] : createAppDefinition(plugin), [pluginE2EName]: createAppE2EDefinition(pluginE2EName)};
+
+    patchWorkspaceJsonForPlugin(projects);
+
+    await runNxCommandAsync(
+      `g @angular-custom-builders/lite-serve:setup --name ${plugin}`
+    );
+    const result = await runNxCommandAsync(`run ${plugin}:lite-serve --port=432`);
+    expect(result.stdout).toContain(`lite-serve serving folder dist/apps/${plugin} on port 432`);
+
+    done();
+  });
+
+  it('should raise an exception in case the e2e project does not follow the default naming convention', async done => {
+    const plugin = uniq('lite-serve');
+    ensureNxProject('@angular-custom-builders/lite-serve:setup', 'dist/libs/lite-serve');
+
+    const pluginE2EName = `${plugin}-custom-e2e`;
+    const projects = { [plugin] : createAppDefinition(plugin), [pluginE2EName]: createAppE2EDefinition(pluginE2EName)};
+
+    patchWorkspaceJsonForPlugin(projects);
+
+    const result = await runNxCommandAsync(
+      `g @angular-custom-builders/lite-serve:setup --name ${plugin}`
+    );
+    expect(result.stderr).toContain(`The project ${plugin}-e2e does not exist`);
+
+    done();
+  });
+
+  it('should be able to setup a project with a custom e2e name', async done => {
+    const plugin = uniq('lite-serve');
+    ensureNxProject('@angular-custom-builders/lite-serve:setup', 'dist/libs/lite-serve');
+
+    const pluginE2EName = `${plugin}-custom-e2e`;
+    const projects = { [plugin] : createAppDefinition(plugin), [pluginE2EName]: createAppE2EDefinition(pluginE2EName)};
+
+    patchWorkspaceJsonForPlugin(projects);
 
     await runNxCommandAsync(
-      `generate @angular-custom-builders/lite-serve:setup ${plugin}`
+      `g @angular-custom-builders/lite-serve:setup --name ${plugin} -e ${pluginE2EName}`
     );
-    // const result = await runNxCommandAsync(`run ${plugin}:lite-server --port=432`);
-    // expect(result.stdout).toContain(`lite-serve serving folder dist on port 432`);
+    const result = await runNxCommandAsync(`run ${plugin}:lite-serve --port=432`);
+    expect(result.stdout).toContain(`lite-serve serving folder dist/apps/${plugin} on port 432`);
 
     done();
   });
 
+  function patchWorkspaceJsonForPlugin(projects) {
+    const p = JSON.parse(readFileSync(tmpProjPath('workspace.json')).toString());
+    p.projects = projects;
+    writeFileSync(tmpProjPath('workspace.json'), JSON.stringify(p, null, 2));
+  }
+
+  function createAppDefinition(plugin: string) {
+    return {
+      root: plugin,
+      sourceRoot: `${plugin}/src`,
+      projectType: 'application',
+      architect: {
+        build: {
+          builder: '@angular-devkit/build-angular:browser',
+          options: {
+            outputPath: `dist/apps/${plugin}`
+          }
+        }
+      }
+    }
+  }
+
+  function createAppE2EDefinition(plugin: string) {
+    return {
+      root: plugin,
+      sourceRoot: `${plugin}-e2e/src`,
+      projectType: 'application',
+      architect: {
+        e2e: {
+          options: {
+            devServerTarget: `${plugin}:serve`
+          }
+        }
+      }
+    }
+  }
+
+  function tmpProjPath(path?: string) {
+    return path
+      ? `${process.cwd()}/tmp/nx-e2e/proj/${path}`
+      : `${process.cwd()}/tmp/nx-e2e/proj`;
+  }
+
 });

libs/lite-serve/src/schematics/lite-serve/schematic.spec.ts

@@ -7,6 +7,7 @@ import { LiteServeSchematicSchema } from './schema';
 
 describe('lite-serve schematic', () => {
   let appTree: Tree;
+
   const options: LiteServeSchematicSchema = { name: 'test' };
 
   const testRunner = new SchematicTestRunner(
@@ -20,7 +21,7 @@ describe('lite-serve schematic', () => {
 
   it('should run successfully', async () => {
     await expect(
-      testRunner.runSchematicAsync('liteServe', options, appTree).toPromise()
+      testRunner.runSchematicAsync('setup', options, appTree).toPromise()
     ).resolves.not.toThrowError();
   });
 });