add tests for admin app, and update tests for main app

Author: suhussai

clients/.DS_Store

@@ -65,3 +65,8 @@ amplifytools.xcconfig
 # ignore yarn.lock and package-lock.json files for now
 yarn.lock
 package-lock.json
+
+#cypress
+cypress/videos/*
+cypress/screenshots/*
+cypress.env.json

clients/Admin/.gitignore

@@ -0,0 +1,9 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  defaultCommandTimeout: 10000,
+  requestTimeout: 10000,
+  e2e: {
+    supportFile: false,
+  },
+});

clients/Admin/cypress.config.ts

@@ -0,0 +1,8 @@
+{
+  "host": "UPDATE_ME",
+  "adminUsername": "UPDATE_ME",
+  "adminUserPassword": "UPDATE_ME",
+  "newTenantName": "UPDATE_ME",
+  "newTenantEmail": "UPDATE_ME",
+  "newTenantTier": "UPDATE_ME"
+}

clients/Admin/cypress.env.json.example

@@ -0,0 +1,29 @@
+# Application End-to-End Testing
+
+## Instructions
+
+To run End-to-End (e2e) tests against the Sample Application, take the following steps:
+
+1. Make a copy of the example env file (`cypress.env.json.example`):
+
+```bash
+cp cypress.env.json.example cypress.env.json
+```
+
+2. Edit the new file and replace the sample values with real values.
+
+3. Navigate to the root of the Application project (`aws-saas-factory-ref-solution-serverless-saas/clients/Application/`) and run the following:
+
+```bash
+npx cypress run
+```
+
+This will run the tests located in the `cypress/e2e` folder.
+
+The documentation [here](https://docs.cypress.io/guides/guides/command-line#cypress-run) has more information on what can be passed in as arguments when running the Cypress tests.
+
+For example, running the following will show the Cypress UI and what is happening as each of the tests are run:
+
+```bash
+npx cypress run --headed
+```

clients/Admin/cypress/README.md

@@ -0,0 +1,86 @@
+describe('admin user tests', () => {
+  beforeEach(() => {
+    cy.visit(Cypress.env('host'));
+
+    cy.get('form input[name="username"]').type(Cypress.env('adminUsername'));
+    cy.get('form input[name="password"]').type(
+      Cypress.env('adminUserPassword')
+    );
+
+    cy.intercept({
+      url: 'https://cognito-idp.*.amazonaws.com',
+    }).as('signIn');
+
+    cy.get('form button[type="submit"]').click();
+    cy.wait('@signIn');
+
+    cy.wait(1500);
+    cy.get('body').then((body) => {
+      if (body.find('form input[name="confirm_password"]').length > 0) {
+        cy.get('form input[name="password"]').type(
+          Cypress.env('adminUserPassword')
+        );
+        cy.get('form input[name="confirm_password"]').type(
+          Cypress.env('adminUserPassword')
+        );
+
+        cy.get('form button[type="submit"]').click();
+        cy.wait('@signIn');
+      }
+      if (body.find('input[name="unverifiedAttr"]').length > 0) {
+        cy.get('button').contains('Skip').click();
+      }
+    });
+  });
+
+  it('can create new tenants', () => {
+    const myTenant = {
+      name: Cypress.env('newTenantName'),
+      email: Cypress.env('newTenantEmail'),
+      tier: Cypress.env('newTenantTier'),
+    };
+    cy.location().should((loc) => {
+      expect(loc.href).to.contain('/dashboard');
+      expect(loc.href).to.not.contain('/unauthorized');
+    });
+
+    cy.get('a').contains('Tenants').click();
+    cy.location().should((loc) => {
+      expect(loc.href).to.contain('/tenants/list');
+    });
+
+    cy.get("button[color='primary'").contains('Add Tenant').click();
+    cy.location().should((loc) => {
+      expect(loc.href).to.contain('/tenants/create');
+    });
+
+    cy.get('form').within(() => {
+      cy.get('input[formcontrolname="tenantName"]').type(myTenant.name);
+      cy.get('input[formcontrolname="tenantEmail"]').type(myTenant.email);
+      cy.get('select[formcontrolname="tenantTier"]').select(myTenant.tier);
+    });
+
+    cy.intercept({
+      method: 'POST',
+      url: '**/registration',
+    }).as('postRegistration');
+
+    cy.intercept({
+      method: 'GET',
+      url: '**/tenants',
+    }).as('getTenants');
+
+    cy.get('button').contains('Submit').click();
+    cy.wait('@postRegistration');
+
+    cy.location().should((loc) => {
+      expect(loc.href).to.contain('/tenants/list');
+    });
+
+    cy.wait('@getTenants');
+
+    cy.get('table td').contains(myTenant.name).should('be.visible');
+    cy.get('table td').contains(myTenant.email).should('be.visible');
+    cy.get('table td').contains(myTenant.tier).should('be.visible');
+  });
+});

clients/Admin/cypress/e2e/admin-user.cy.ts

@@ -36,6 +36,7 @@
     "@angular/cli": "~14.0.5",
     "@angular/compiler-cli": "~14.0.0",
     "@types/jasmine": "~4.0.0",
+    "cypress": "^12.4.1",
     "jasmine-core": "~4.1.0",
     "karma": "~6.3.0",
     "karma-chrome-launcher": "~3.1.0",

clients/Admin/package.json

@@ -1,4 +1,4 @@
-# Dashboard
+# Application
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.0.5.
 

clients/Application/README.md

@@ -7,7 +7,7 @@
   },
   "newProjectRoot": "projects",
   "projects": {
-    "dashboard": {
+    "application": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -47,8 +47,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kb",
-                  "maximumError": "4kb"
+                  "maximumWarning": "6kb",
+                  "maximumError": "6kb"
                 }
               ],
               "fileReplacements": [
@@ -74,18 +74,18 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "dashboard:build:production"
+              "browserTarget": "application:build:production"
             },
             "development": {
-              "browserTarget": "dashboard:build:development"
+              "browserTarget": "application:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "dashboard:build"
+            "browserTarget": "application:build"
           }
         },
         "test": {

clients/Application/angular.json

@@ -1,10 +1,9 @@
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
+  defaultCommandTimeout: 10000,
+  requestTimeout: 10000,
   e2e: {
     supportFile: false,
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
   },
 });

clients/Application/cypress.config.ts

@@ -1,7 +1,9 @@
 {
-  "host": "http://localhost:4200",
+  "host": "UPDATE_ME!",
   "tenantName": "UPDATE_ME!",
   "tenantUsername": "UPDATE_ME!",
   "tenantUserPassword": "UPDATE_ME!",
-  "email": "[email protected]"
+  "newUserName": "UPDATE_ME!",
+  "newUserEmail": "UPDATE_ME!",
+  "newUserRole": "UPDATE_ME!"
 }

clients/Application/cypress.env.json.example

@@ -10,17 +10,7 @@ To run End-to-End (e2e) tests against the Sample Application, take the following
 cp cypress.env.json.example cypress.env.json
 ```
 
-2. Edit the new file and replace the sample values with real values. The following should help when deciding what to use in place of the sample values provided:
-
-- `host`: The URL where the Sample Application is running. If testing locally, this is usually `"http://localhost:4200"`.
-
-- `tenantName`: The name of the tenant used to identify the appropriate Cognito User Pool to use for Authentication.
-
-- `tenantUsername`: The username to use when logging in.
-
-- `tenantUserPassword`: The password to use when logging in.
-
-- `email`: The email address to use for testing. (This should be a valid email address.)
+2. Edit the new file and replace the sample values with real values.
 
 3. Navigate to the root of the Application project (`aws-saas-factory-ref-solution-serverless-saas/clients/Application/`) and run the following:
 

clients/Application/cypress/README.md

@@ -26,7 +26,7 @@ describe("check that the app redirects to /unauthorized when tenant is not set",
   });
 });
 
-describe("check that the app redirects to a page with a sign-in form when tenant is set and user is not logged in", () => {
+describe("check that the app redirects to a sign-in page when tenant name is set and user is not logged in", () => {
   beforeEach(() => {
     cy.visit(Cypress.env("host"));
 
@@ -47,7 +47,6 @@ describe("check that the app redirects to a page with a sign-in form when tenant
   it("redirects when visiting orders page", () => {
     cy.visit(Cypress.env("host") + "/orders");
     cy.location().should((loc) => {
-      expect(loc.href).to.not.contain("/unauthorized");
       expect(loc.href).to.not.contain("/orders");
     });
 
@@ -60,7 +59,6 @@ describe("check that the app redirects to a page with a sign-in form when tenant
   it("redirects when visiting products page", () => {
     cy.visit(Cypress.env("host") + "/products");
     cy.location().should((loc) => {
-      expect(loc.href).to.not.contain("/unauthorized");
       expect(loc.href).to.not.contain("/products");
     });
 
@@ -73,7 +71,6 @@ describe("check that the app redirects to a page with a sign-in form when tenant
   it("redirects when visiting a random page", () => {
     cy.visit(Cypress.env("host") + "/random");
     cy.location().should((loc) => {
-      expect(loc.href).to.not.contain("/unauthorized");
       expect(loc.href).to.not.contain("/random");
     });