Migrate from protractor to cypress

.github/workflows/ionic.yml

@@ -51,15 +51,15 @@ jobs:
  - 21-points
  include:
  - jdl: monolith-jwt
- e2e: 0
+ e2e: 1
  - jdl: monolith-oauth2
- e2e: 0
+ e2e: 1
  - jdl: gateway-oauth2
- e2e: 0
+ e2e: 1
  - jdl: reactive-oauth2
- e2e: 0
+ e2e: 1
  - jdl: 21-points
- e2e: 0
+ e2e: 1
 
  steps:
  #----------------------------------------------------------------------
@@ -104,10 +104,30 @@ jobs:
  run: npm run docker:app:up
  - name: Wait for backend to start
  run: npm run ci:server:await
+ - name: Modify /etc/hosts
+ run: |
+ echo '127.0.0.1 keycloak' | sudo tee -a /etc/hosts
+ cat /etc/hosts
  - name: Launch ionic e2e test
+ id: e2e
  if: ${{ matrix.e2e == 1 }}
- run: xvfb-run --server-args="-screen 0 1024x768x24" --auto-servernum npm run e2e
- working-directory: ${{ github.workspace }}/ionic4j
+ uses: cypress-io/github-action@v2
+ with:
+ browser: chrome
+ command: npm run e2e:ci
+ working-directory: ${{ github.workspace }}/ionic4j
+ - name: 'E2E: Store failure screenshots'
+ uses: actions/upload-artifact@v3
+ if: always() && steps.e2e.outcome == 'failure'
+ with:
+ name: screenshots-${{ matrix.jdl }}
+ path: ${{ github.workspace }}/ionic4j/cypress/screenshots
+ - name: 'E2E: Store failure videos'
+ uses: actions/upload-artifact@v3
+ if: always() && steps.e2e.outcome == 'failure'
+ with:
+ name: videos-${{ matrix.jdl }}
+ path: ${{ github.workspace }}/ionic4j/cypress/videos
  - name: Dump docker logs on failure
  if: failure()
  uses: jwalton/gh-docker-logs@v2

.yo-rc.json

@@ -42,12 +42,18 @@
  ],
  "sbs": false,
  "written": true
+ },
+ "server": {
+ "command": false,
+ "priorities": ["postWriting"],
+ "sbs": true,
+ "written": true
  }
  },
  "jhipsterVersion": "7.7.0",
  "prettierDefaultIndent": 2,
  "projectName": "JHipster Ionic Blueprint v2",
  "skipCommitHook": true,
- "subGenerators": ["app", "ionic", "project-name"]
+ "subGenerators": ["app", "ionic", "project-name", "server"]
  }
 }

cli/cli.mjs

@@ -22,7 +22,7 @@ const packageFolderName = basename(packagePath);
  [packageFolderName]: version,
  },
  printBlueprintLogo: () => {
- console.log('===================== JHipster ionic =====================');
+ console.log('===================== JHipster Ionic =====================');
  console.log('');
  },
  lookups: [{ packagePaths: [packagePath], lookups: ['generators'] }],

generators/app/__snapshots__/generator.spec.mjs.snap

@@ -41,22 +41,40 @@ Object {
  "../ionic4j/capacitor.config.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic4j/e2e/pages/app.po.ts": Object {
+ "../ionic4j/cypress.json": Object {
  "stateCleared": "modified",
  },
- "../ionic4j/e2e/pages/login.po.ts": Object {
+ "../ionic4j/cypress/fixtures/integration-test.png": Object {
  "stateCleared": "modified",
  },
- "../ionic4j/e2e/protractor.conf.js": Object {
+ "../ionic4j/cypress/integration/app.e2e-spec.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic4j/e2e/spec/app.e2e-spec.ts": Object {
+ "../ionic4j/cypress/integration/login.e2e-spec.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic4j/e2e/spec/login.e2e-spec.ts": Object {
+ "../ionic4j/cypress/plugins/index.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic4j/e2e/tsconfig.json": Object {
+ "../ionic4j/cypress/support/commands.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic4j/cypress/support/config.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic4j/cypress/support/index.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic4j/cypress/support/pages/app.po.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic4j/cypress/support/pages/entity.po.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic4j/cypress/support/pages/login.po.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic4j/cypress/tsconfig.json": Object {
  "stateCleared": "modified",
  },
  "../ionic4j/ionic.config.json": Object {
@@ -550,22 +568,40 @@ Object {
  "../ionic-app/capacitor.config.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic-app/e2e/pages/app.po.ts": Object {
+ "../ionic-app/cypress.json": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic-app/cypress/fixtures/integration-test.png": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic-app/cypress/integration/app.e2e-spec.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic-app/cypress/integration/login.e2e-spec.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic-app/cypress/plugins/index.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic-app/cypress/support/commands.ts": Object {
+ "stateCleared": "modified",
+ },
+ "../ionic-app/cypress/support/config.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic-app/e2e/pages/login.po.ts": Object {
+ "../ionic-app/cypress/support/index.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic-app/e2e/protractor.conf.js": Object {
+ "../ionic-app/cypress/support/pages/app.po.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic-app/e2e/spec/app.e2e-spec.ts": Object {
+ "../ionic-app/cypress/support/pages/entity.po.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic-app/e2e/spec/login.e2e-spec.ts": Object {
+ "../ionic-app/cypress/support/pages/login.po.ts": Object {
  "stateCleared": "modified",
  },
- "../ionic-app/e2e/tsconfig.json": Object {
+ "../ionic-app/cypress/tsconfig.json": Object {
  "stateCleared": "modified",
  },
  "../ionic-app/ionic.config.json": Object {

generators/ionic/__snapshots__/generator.spec.mjs.snap

@@ -41,22 +41,40 @@ Object {
  "capacitor.config.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/pages/app.po.ts": Object {
+ "cypress.json": Object {
  "stateCleared": "modified",
  },
- "e2e/pages/login.po.ts": Object {
+ "cypress/fixtures/integration-test.png": Object {
  "stateCleared": "modified",
  },
- "e2e/protractor.conf.js": Object {
+ "cypress/integration/app.e2e-spec.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/spec/app.e2e-spec.ts": Object {
+ "cypress/integration/login.e2e-spec.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/spec/login.e2e-spec.ts": Object {
+ "cypress/plugins/index.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/tsconfig.json": Object {
+ "cypress/support/commands.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/config.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/index.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/pages/app.po.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/pages/entity.po.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/pages/login.po.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/tsconfig.json": Object {
  "stateCleared": "modified",
  },
  "ionic.config.json": Object {
@@ -517,22 +535,43 @@ Object {
  "capacitor.config.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/pages/app.po.ts": Object {
+ "cypress.json": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/fixtures/integration-test.png": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/integration/app.e2e-spec.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/integration/login.e2e-spec.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/plugins/index.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/commands.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/config.ts": Object {
+ "stateCleared": "modified",
+ },
+ "cypress/support/index.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/pages/login.po.ts": Object {
+ "cypress/support/oauth2.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/protractor.conf.js": Object {
+ "cypress/support/pages/app.po.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/spec/app.e2e-spec.ts": Object {
+ "cypress/support/pages/entity.po.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/spec/login.e2e-spec.ts": Object {
+ "cypress/support/pages/login.po.ts": Object {
  "stateCleared": "modified",
  },
- "e2e/tsconfig.json": Object {
+ "cypress/tsconfig.json": Object {
  "stateCleared": "modified",
  },
  "ionic.config.json": Object {

generators/ionic/files.mjs

@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 const PAGES_DIR = 'src/app/pages/';
-const E2E_TEST_DIR = 'e2e/';
+const E2E_ENTITY_DIR = 'cypress/support/pages/';
+const E2E_TEST_DIR = 'cypress/integration/';
 
 export const files = {
  client: [
  {
  templates: [
  'capacitor.config.ts',
  'ionic.config.json',
- 'e2e/pages/login.po.ts',
  'src/app/interceptors/auth.interceptor.ts',
  'src/app/pages/home/home.page.scss',
  'src/app/pages/welcome/welcome.page.scss',
@@ -104,16 +104,25 @@ export const entityFiles = {
  ],
  e2e: [
  {
- path: E2E_TEST_DIR,
+ path: E2E_ENTITY_DIR,
  templates: [
  {
  file: 'entities/_entity.po.ts',
  renameTo: ctx => `entities/${ctx.entityFolderName}/${ctx.entityFileName}.po.ts`,
  },
+ ],
+ },
+ {
+ path: E2E_TEST_DIR,
+ templates: [
  {
  file: 'entities/_entity.e2e-spec.ts',
  renameTo: ctx => `entities/${ctx.entityFolderName}/${ctx.entityFileName}.e2e-spec.ts`,
  },
+ {
+ file: 'entities/_entity.json',
+ renameTo: ctx => `entities/${ctx.entityFolderName}/${ctx.entityFileName}.json`,
+ },
  ],
  },
  ],

generators/ionic/generator.mjs

@@ -194,22 +194,9 @@ export default class extends GeneratorBaseEntities {
  },
  });
  // write client side files for angular
- this.addEntityToModule(
- entity.entityentityInstance,
- entity.entityClass,
- entity.entityAngularName,
- entity.entityFolderName,
- entity.entityFileName,
- entity.enableTranslation
- );
- this.addEntityRouteToModule(
- entity.entityInstance,
- entity.entityClass,
- entity.entityAngularName,
- entity.entityFolderName,
- entity.entityFileName,
- entity.enableTranslation
- );
+ const { entityClassHumanized, entityAngularName, entityFileName, entityFolderName } = entity;
+ this.addEntityToModule({ entityClassHumanized, entityAngularName, entityFileName });
+ this.addEntityRouteToModule({ entityAngularName, entityFolderName, entityFileName });
  })
  );
  },
@@ -312,14 +299,12 @@ ${chalk.green(` ionic serve`)}
  * @private
  * Add a new entity in the TS modules file.
  *
- * @param {string} entityInstance - Entity Instance
- * @param {string} entityClass - Entity Class
- * @param {string} entityAngularName - Entity Angular Name
- * @param {string} entityFolderName - Entity Folder Name
- * @param {string} entityFileName - Entity File Name
- * @param {boolean} enableTranslation - If translations are enabled or not
+ * @param {string} options - Entity Instance
+ * @param {string} options.entityClassHumanized - Entity Class
+ * @param {string} options.entityAngularName - Entity Angular Name
+ * @param {string} options.entityFileName - Entity File Name
  */
- addEntityToModule(entityInstance, entityClass, entityAngularName, entityFolderName, entityFileName, enableTranslation) {
+ addEntityToModule({ entityClassHumanized, entityAngularName, entityFileName }) {
  // workaround method being called on initialization
  if (!entityAngularName) {
  return;
@@ -329,7 +314,7 @@ ${chalk.green(` ionic serve`)}
  const isSpecificEntityAlreadyGenerated = utils.checkStringInFile(entityPagePath, `route: '${entityFileName}'`, this);
 
  if (!isSpecificEntityAlreadyGenerated) {
- const pageEntry = `{ name: '${entityAngularName}', component: '${entityAngularName}Page', route: '${entityFileName}' },`;
+ const pageEntry = `{ name: '${entityClassHumanized}', component: '${entityAngularName}Page', route: '${entityFileName}' },`;
  utils.rewriteFile(
  {
  file: entityPagePath,
@@ -363,7 +348,7 @@ ${chalk.green(` ionic serve`)}
  * @param {string} entityFileName - Entity File Name
  * @param {boolean} enableTranslation - If translations are enabled or not
  */
- addEntityRouteToModule(entityInstance, entityClass, entityAngularName, entityFolderName, entityFileName, enableTranslation) {
+ addEntityRouteToModule({ entityAngularName, entityFolderName, entityFileName }) {
  // workaround method being called on initialization
  if (!entityAngularName) {
  return;

generators/ionic/resources/base/.gitignore.jhi.ionic

@@ -0,0 +1,5 @@
+<&_ if (!fragment.section) { -&>
+# ionic rules:
+cypress/screenshots
+cypress/videos
+<&_ } -&>

generators/ionic/resources/base/.prettierignore.jhi.ionic

@@ -0,0 +1,6 @@
+<&_ if (!fragment.section) { -&>
+# ionic rules:
+.angular
+cypress/screenshots
+cypress/videos
+<&_ } -&>