diff --git a/angular.json b/angular.json index 2c2a2ae..0e3c6c3 100644 --- a/angular.json +++ b/angular.json @@ -114,33 +114,6 @@ } } }, - "parent-form-e2e": { - "root": "apps/parent-form-e2e", - "sourceRoot": "apps/parent-form-e2e/src", - "projectType": "application", - "architect": { - "e2e": { - "builder": "@nrwl/cypress:cypress", - "options": { - "cypressConfig": "apps/parent-form-e2e/cypress.json", - "tsConfig": "apps/parent-form-e2e/tsconfig.e2e.json", - "devServerTarget": "parent-form:serve" - }, - "configurations": { - "production": { - "devServerTarget": "parent-form:serve:production" - } - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": ["apps/parent-form-e2e/tsconfig.e2e.json"], - "exclude": ["**/node_modules/**", "!apps/parent-form-e2e/**"] - } - } - } - }, "global-form": { "projectType": "application", "schematics": {}, @@ -228,33 +201,6 @@ } } }, - "global-form-e2e": { - "root": "apps/global-form-e2e", - "sourceRoot": "apps/global-form-e2e/src", - "projectType": "application", - "architect": { - "e2e": { - "builder": "@nrwl/cypress:cypress", - "options": { - "cypressConfig": "apps/global-form-e2e/cypress.json", - "tsConfig": "apps/global-form-e2e/tsconfig.e2e.json", - "devServerTarget": "global-form:serve" - }, - "configurations": { - "production": { - "devServerTarget": "global-form:serve:production" - } - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": ["apps/global-form-e2e/tsconfig.e2e.json"], - "exclude": ["**/node_modules/**", "!apps/global-form-e2e/**"] - } - } - } - }, "baseline": { "projectType": "application", "schematics": {}, @@ -341,33 +287,6 @@ } } } - }, - "baseline-e2e": { - "root": "apps/baseline-e2e", - "sourceRoot": "apps/baseline-e2e/src", - "projectType": "application", - "architect": { - "e2e": { - "builder": "@nrwl/cypress:cypress", - "options": { - "cypressConfig": "apps/baseline-e2e/cypress.json", - "tsConfig": "apps/baseline-e2e/tsconfig.e2e.json", - "devServerTarget": "baseline:serve" - }, - "configurations": { - "production": { - "devServerTarget": "baseline:serve:production" - } - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": ["apps/baseline-e2e/tsconfig.e2e.json"], - "exclude": ["**/node_modules/**", "!apps/baseline-e2e/**"] - } - } - } } }, "cli": { diff --git a/apps/baseline-e2e/cypress.json b/apps/baseline-e2e/cypress.json deleted file mode 100644 index a3ad9c0..0000000 --- a/apps/baseline-e2e/cypress.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "fileServerFolder": ".", - "fixturesFolder": "./src/fixtures", - "integrationFolder": "./src/integration", - "pluginsFile": "./src/plugins/index", - "supportFile": false, - "video": true, - "videosFolder": "../../dist/cypress/apps/baseline-e2e/videos", - "screenshotsFolder": "../../dist/cypress/apps/baseline-e2e/screenshots", - "chromeWebSecurity": false -} diff --git a/apps/baseline-e2e/src/fixtures/example.json b/apps/baseline-e2e/src/fixtures/example.json deleted file mode 100644 index 294cbed..0000000 --- a/apps/baseline-e2e/src/fixtures/example.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io" -} diff --git a/apps/baseline-e2e/src/integration/app.spec.ts b/apps/baseline-e2e/src/integration/app.spec.ts deleted file mode 100644 index 7c03bec..0000000 --- a/apps/baseline-e2e/src/integration/app.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { getGreeting } from '../support/app.po'; - -describe('baseline', () => { - beforeEach(() => cy.visit('/')); - - it('should display welcome message', () => { - getGreeting().contains('Welcome to baseline!'); - }); -}); diff --git a/apps/baseline-e2e/src/plugins/index.js b/apps/baseline-e2e/src/plugins/index.js deleted file mode 100644 index bc34d63..0000000 --- a/apps/baseline-e2e/src/plugins/index.js +++ /dev/null @@ -1,22 +0,0 @@ -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor'); - -module.exports = (on, config) => { - // `on` is used to hook into various events Cypress emits - // `config` is the resolved Cypress config - - // Preprocess Typescript - on('file:preprocessor', preprocessTypescript(config)); -}; diff --git a/apps/baseline-e2e/src/support/app.po.ts b/apps/baseline-e2e/src/support/app.po.ts deleted file mode 100644 index 3293424..0000000 --- a/apps/baseline-e2e/src/support/app.po.ts +++ /dev/null @@ -1 +0,0 @@ -export const getGreeting = () => cy.get('h1'); diff --git a/apps/baseline-e2e/src/support/commands.ts b/apps/baseline-e2e/src/support/commands.ts deleted file mode 100644 index ca4d256..0000000 --- a/apps/baseline-e2e/src/support/commands.ts +++ /dev/null @@ -1,25 +0,0 @@ -// *********************************************** -// This example commands.js shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: -// https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add("login", (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This will overwrite an existing command -- -// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/apps/baseline-e2e/src/support/index.ts b/apps/baseline-e2e/src/support/index.ts deleted file mode 100644 index 3d469a6..0000000 --- a/apps/baseline-e2e/src/support/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -// *********************************************************** -// This example support/index.js is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import './commands'; diff --git a/apps/baseline-e2e/tsconfig.e2e.json b/apps/baseline-e2e/tsconfig.e2e.json deleted file mode 100644 index 629b4c1..0000000 --- a/apps/baseline-e2e/tsconfig.e2e.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "sourceMap": false, - "outDir": "../../dist/out-tsc" - }, - "include": ["src/**/*.ts"] -} diff --git a/apps/baseline-e2e/tsconfig.json b/apps/baseline-e2e/tsconfig.json deleted file mode 100644 index ee6531b..0000000 --- a/apps/baseline-e2e/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["cypress", "node"] - }, - "include": ["**/*.ts"] -} diff --git a/apps/baseline-e2e/tslint.json b/apps/baseline-e2e/tslint.json deleted file mode 100644 index 04809f8..0000000 --- a/apps/baseline-e2e/tslint.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "../../tslint.json", "rules": [] } diff --git a/apps/global-form-e2e/cypress.json b/apps/global-form-e2e/cypress.json deleted file mode 100644 index a8d8695..0000000 --- a/apps/global-form-e2e/cypress.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "fileServerFolder": ".", - "fixturesFolder": "./src/fixtures", - "integrationFolder": "./src/integration", - "pluginsFile": "./src/plugins/index", - "supportFile": false, - "video": true, - "videosFolder": "../../dist/cypress/apps/global-form-e2e/videos", - "screenshotsFolder": "../../dist/cypress/apps/global-form-e2e/screenshots", - "chromeWebSecurity": false -} diff --git a/apps/global-form-e2e/src/fixtures/example.json b/apps/global-form-e2e/src/fixtures/example.json deleted file mode 100644 index 294cbed..0000000 --- a/apps/global-form-e2e/src/fixtures/example.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io" -} diff --git a/apps/global-form-e2e/src/integration/app.spec.ts b/apps/global-form-e2e/src/integration/app.spec.ts deleted file mode 100644 index 130e297..0000000 --- a/apps/global-form-e2e/src/integration/app.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { getGreeting } from '../support/app.po'; - -describe('global-form', () => { - beforeEach(() => cy.visit('/')); - - it('should display welcome message', () => { - getGreeting().contains('Welcome to global-form!'); - }); -}); diff --git a/apps/global-form-e2e/src/plugins/index.js b/apps/global-form-e2e/src/plugins/index.js deleted file mode 100644 index bc34d63..0000000 --- a/apps/global-form-e2e/src/plugins/index.js +++ /dev/null @@ -1,22 +0,0 @@ -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor'); - -module.exports = (on, config) => { - // `on` is used to hook into various events Cypress emits - // `config` is the resolved Cypress config - - // Preprocess Typescript - on('file:preprocessor', preprocessTypescript(config)); -}; diff --git a/apps/global-form-e2e/src/support/app.po.ts b/apps/global-form-e2e/src/support/app.po.ts deleted file mode 100644 index 3293424..0000000 --- a/apps/global-form-e2e/src/support/app.po.ts +++ /dev/null @@ -1 +0,0 @@ -export const getGreeting = () => cy.get('h1'); diff --git a/apps/global-form-e2e/src/support/commands.ts b/apps/global-form-e2e/src/support/commands.ts deleted file mode 100644 index ca4d256..0000000 --- a/apps/global-form-e2e/src/support/commands.ts +++ /dev/null @@ -1,25 +0,0 @@ -// *********************************************** -// This example commands.js shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: -// https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add("login", (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This will overwrite an existing command -- -// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/apps/global-form-e2e/src/support/index.ts b/apps/global-form-e2e/src/support/index.ts deleted file mode 100644 index 3d469a6..0000000 --- a/apps/global-form-e2e/src/support/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -// *********************************************************** -// This example support/index.js is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import './commands'; diff --git a/apps/global-form-e2e/tsconfig.e2e.json b/apps/global-form-e2e/tsconfig.e2e.json deleted file mode 100644 index 629b4c1..0000000 --- a/apps/global-form-e2e/tsconfig.e2e.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "sourceMap": false, - "outDir": "../../dist/out-tsc" - }, - "include": ["src/**/*.ts"] -} diff --git a/apps/global-form-e2e/tsconfig.json b/apps/global-form-e2e/tsconfig.json deleted file mode 100644 index ee6531b..0000000 --- a/apps/global-form-e2e/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["cypress", "node"] - }, - "include": ["**/*.ts"] -} diff --git a/apps/global-form-e2e/tslint.json b/apps/global-form-e2e/tslint.json deleted file mode 100644 index 04809f8..0000000 --- a/apps/global-form-e2e/tslint.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "../../tslint.json", "rules": [] } diff --git a/apps/parent-form-e2e/cypress.json b/apps/parent-form-e2e/cypress.json deleted file mode 100644 index 5b72e84..0000000 --- a/apps/parent-form-e2e/cypress.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "fileServerFolder": ".", - "fixturesFolder": "./src/fixtures", - "integrationFolder": "./src/integration", - "pluginsFile": "./src/plugins/index", - "supportFile": false, - "video": true, - "videosFolder": "../../dist/cypress/apps/parent-form-e2e/videos", - "screenshotsFolder": "../../dist/cypress/apps/parent-form-e2e/screenshots", - "chromeWebSecurity": false -} diff --git a/apps/parent-form-e2e/src/fixtures/example.json b/apps/parent-form-e2e/src/fixtures/example.json deleted file mode 100644 index 294cbed..0000000 --- a/apps/parent-form-e2e/src/fixtures/example.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io" -} diff --git a/apps/parent-form-e2e/src/integration/app.spec.ts b/apps/parent-form-e2e/src/integration/app.spec.ts deleted file mode 100644 index e32bfd0..0000000 --- a/apps/parent-form-e2e/src/integration/app.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { getGreeting } from '../support/app.po'; - -describe('parent-form', () => { - beforeEach(() => cy.visit('/')); - - it('should display welcome message', () => { - getGreeting().contains('Welcome to parent-form!'); - }); -}); diff --git a/apps/parent-form-e2e/src/plugins/index.js b/apps/parent-form-e2e/src/plugins/index.js deleted file mode 100644 index bc34d63..0000000 --- a/apps/parent-form-e2e/src/plugins/index.js +++ /dev/null @@ -1,22 +0,0 @@ -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor'); - -module.exports = (on, config) => { - // `on` is used to hook into various events Cypress emits - // `config` is the resolved Cypress config - - // Preprocess Typescript - on('file:preprocessor', preprocessTypescript(config)); -}; diff --git a/apps/parent-form-e2e/src/support/app.po.ts b/apps/parent-form-e2e/src/support/app.po.ts deleted file mode 100644 index 3293424..0000000 --- a/apps/parent-form-e2e/src/support/app.po.ts +++ /dev/null @@ -1 +0,0 @@ -export const getGreeting = () => cy.get('h1'); diff --git a/apps/parent-form-e2e/src/support/commands.ts b/apps/parent-form-e2e/src/support/commands.ts deleted file mode 100644 index ca4d256..0000000 --- a/apps/parent-form-e2e/src/support/commands.ts +++ /dev/null @@ -1,25 +0,0 @@ -// *********************************************** -// This example commands.js shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: -// https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add("login", (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This will overwrite an existing command -- -// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) diff --git a/apps/parent-form-e2e/src/support/index.ts b/apps/parent-form-e2e/src/support/index.ts deleted file mode 100644 index 3d469a6..0000000 --- a/apps/parent-form-e2e/src/support/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -// *********************************************************** -// This example support/index.js is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import './commands'; diff --git a/apps/parent-form-e2e/tsconfig.e2e.json b/apps/parent-form-e2e/tsconfig.e2e.json deleted file mode 100644 index 629b4c1..0000000 --- a/apps/parent-form-e2e/tsconfig.e2e.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "sourceMap": false, - "outDir": "../../dist/out-tsc" - }, - "include": ["src/**/*.ts"] -} diff --git a/apps/parent-form-e2e/tsconfig.json b/apps/parent-form-e2e/tsconfig.json deleted file mode 100644 index ee6531b..0000000 --- a/apps/parent-form-e2e/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "types": ["cypress", "node"] - }, - "include": ["**/*.ts"] -} diff --git a/apps/parent-form-e2e/tslint.json b/apps/parent-form-e2e/tslint.json deleted file mode 100644 index 04809f8..0000000 --- a/apps/parent-form-e2e/tslint.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": "../../tslint.json", "rules": [] } diff --git a/nx.json b/nx.json index ec85d48..0da6034 100644 --- a/nx.json +++ b/nx.json @@ -11,21 +11,12 @@ "contact": { "tags": [] }, - "parent-form-e2e": { - "tags": [] - }, "parent-form": { "tags": [] }, - "global-form-e2e": { - "tags": [] - }, "global-form": { "tags": [] }, - "baseline-e2e": { - "tags": [] - }, "baseline": { "tags": [] }