Rerun cypress tests (#164)

* logout before createSimulation

* more logging

* logging in spec

* always delete simulation in logout

* constant for cypress simulation key

* add changeset

Author: dagda1

.changes/rerun-cypress-tests.md

@@ -0,0 +1,4 @@
+---
+"@simulacrum/auth0-cypress": minor
+---
+Destroy simulation before creating a new one

integrations/cypress/cypress.json

@@ -2,14 +2,12 @@
   "baseUrl": "http://localhost:3000",
   "video": false,
   "screenshotOnRunFailure": false,
-  "defaultCommandTimeout": 20000,
   "fixturesFolder": "cypress/fixtures",
   "integrationFolder": "cypress/integration",
   "pluginsFile": "cypress/plugins/index.js",
   "screenshotsFolder": "cypress/screenshots",
   "videosFolder": "cypress/videos",
   "supportFile": "cypress/support/index.ts",
   "configFile": "cypress/tsconfig.json",
-  "chromeWebSecurity": false,
-  "execTimeout": 10000
+  "chromeWebSecurity": false
 }

integrations/cypress/cypress/integration/login.spec.ts

@@ -33,7 +33,6 @@ describe("auth", () => {
     });
   });
 
-
   describe("createSimulation in beforeEach and logout in afterEach", () => {
     beforeEach(() => {
       cy.createSimulation(auth0Config);

integrations/cypress/cypress/support/commands/constants.ts

@@ -0,0 +1 @@
+export const SimulationId = 'cypress';

integrations/cypress/cypress/support/commands/create-simulation.ts

@@ -1,6 +1,7 @@
 import { Slice } from '@effection/atom';
 import { CreateSimulation, GetClientFromSpec, TestState } from '../types';
 import { makeCypressLogger } from '../utils/cypress-logger';
+import { SimulationId } from './constants';
 
 export interface MakeCreateSimulationOptions {
   atom: Slice<TestState>;
@@ -10,7 +11,7 @@ export interface MakeCreateSimulationOptions {
 const log = makeCypressLogger('simulacrum-create-simulation');
 
 export const makeCreateSimulation = ({ atom, getClientFromSpec }: MakeCreateSimulationOptions) => (options: CreateSimulation) => {
-  return new Cypress.Promise((resolve, reject) => {
+  return cy.logout().then(() => {
     let client = getClientFromSpec(Cypress.spec.name);
 
     let { debug = false, domain, client_id, ...auth0Options } = options;
@@ -19,35 +20,37 @@ export const makeCreateSimulation = ({ atom, getClientFromSpec }: MakeCreateSimu
 
     let port = Number(domain.split(':').slice(-1)[0]);
 
-    assert(typeof client !== 'undefined', 'no client created in createSimulation');
+    log(`creating simulation with options: ${JSON.stringify(options)}`);
 
-    client.createSimulation("auth0", {
-      options: {
-        ...auth0Options,
-        clientId: client_id,
-      },
-      services: {
-        auth0: {
-          port,
+    return new Cypress.Promise((resolve, reject) => {
+      client.createSimulation("auth0", {
+        options: {
+          ...auth0Options,
+          clientId: client_id,
         },
-      },
-      debug,
-      key: 'cypress'
-    }).then(simulation => {
-      atom.slice(Cypress.spec.name).update(current => {
-        return {
-          ...current,
-          simulation
-        };
+        services: {
+          auth0: {
+            port,
+          },
+        },
+        debug,
+        key: SimulationId
+      }).then(simulation => {
+        atom.slice(Cypress.spec.name).update(current => {
+          return {
+            ...current,
+            simulation
+          };
+        });
+
+        log(`sumalation created ${JSON.stringify(simulation)}`);
+
+        resolve(simulation);
+      }).catch((e) => {
+        log(`create-simulation failed ${e.message}`);
+
+        reject(e);
       });
-
-      log(`sumalation created ${JSON.stringify(simulation)}`);
-
-      resolve(simulation);
-    }).catch((e) => {
-      log(`create-simulation failed ${e.message}`);
-
-      reject(e);
     });
   });
 };

integrations/cypress/cypress/support/commands/given.ts

@@ -13,22 +13,24 @@ const log = makeCypressLogger('simulacrum-given');
 export const makeGiven = ({ atom, getClientFromSpec }: MakeGivenOptions) => (attrs: Partial<Person> = {}) => {
   return new Cypress.Promise((resolve, reject) => {
     let client = getClientFromSpec(Cypress.spec.name);
+
     let simulation = atom.slice(Cypress.spec.name, 'simulation').get();
 
     assert(!!simulation, 'no sumulation in given');
-    assert(!!client && typeof client.given === 'function', 'no valid client in given');
+
+    log(`creating person with attrs: ${JSON.stringify(attrs)}`);
 
     client.given<Person>(simulation, "person", attrs)
       .then((scenario) => {
+        log(`person created ${JSON.stringify(scenario)}`);
+
         atom.slice(Cypress.spec.name).update(current => {
           return {
             ...current,
             person: scenario.data
           };
         });
 
-        log(`scenario created with ${JSON.stringify(scenario)}`);
-
         resolve(scenario.data);
       })
       .catch((e) => {

integrations/cypress/cypress/support/commands/logout.ts

@@ -1,6 +1,8 @@
 import { Slice } from '@effection/atom';
+import { Simulation } from '@simulacrum/client';
 import { GetClientFromSpec, TestState } from '../types';
 import { makeCypressLogger } from '../utils/cypress-logger';
+import { SimulationId } from './constants';
 
 export interface MakeLogoutOptions {
   atom: Slice<TestState>;
@@ -11,23 +13,14 @@ const log = makeCypressLogger('simulacrum-logout');
 
 export const makeLogout = ({ atom, getClientFromSpec }: MakeLogoutOptions) => () => {
   return new Cypress.Promise((resolve, reject) => {
-    let client = getClientFromSpec(Cypress.spec.name);
-
     log('in logout');
 
-    let simulation = atom.slice(Cypress.spec.name, 'simulation').get();
-
-    if(!client || !simulation) {
-      log('no simulation or client');
-      resolve();
-      return;
-    }
+    let client = getClientFromSpec(Cypress.spec.name);
 
-    client.destroySimulation(simulation).then(() => {
+    client.destroySimulation({ id: SimulationId } as Simulation).then(() => {
       log('simulation destroyed');
 
       atom.slice(Cypress.spec.name).remove();
-
       resolve();
     }).catch(e => {
       log(`logout failed with ${e.message}`);

integrations/cypress/cypress/support/utils/spec.ts

@@ -1,19 +1,29 @@
 import { Slice } from '@effection/atom';
 import { Client, createClient } from '@simulacrum/client';
 import { TestState } from '../types';
+import { makeCypressLogger } from './cypress-logger';
 
 export interface MakeGetClientFromSpecOptions {
   atom: Slice<TestState>;
   port: number;
 }
 
+const log = makeCypressLogger('simulacrum-spec');
+
 export const makeGetClientFromSpec = ({ atom, port }: MakeGetClientFromSpecOptions) => function getClientFromSpec (spec: string) {
   let client: Client;
 
-  if(!atom.slice(spec).get()) {
+  if(typeof atom.slice(spec).get()?.client?.createSimulation !== 'function') {
+    log(`creating client for ${spec}`);
     client = createClient(`http://localhost:${port}`);
     atom.set({ [spec]: { client: client } });
+  } else {
+    log(`client already exists for ${spec}`);
+    client = atom.slice(spec, 'client').get();
   }
 
-  return atom.slice(spec, 'client').get();
+  // probably not needed but....good to know
+  assert(typeof client?.createSimulation === 'function', 'no client created in getClientFromSpec');
+
+  return client;
 };

integrations/cypress/cypress/support/utils/url.ts

@@ -0,0 +1,6 @@
+
+export function combineURLs(baseURL: string, relativeURL: string): string {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL;
+}