Develop

.github/workflows/review.yml

@@ -5,9 +5,10 @@ on: [pull_request]
 jobs:
   test-and-build:
     runs-on: it
-
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
@@ -33,15 +34,23 @@ jobs:
       - name: build fusion docker image
         run: |
           docker build . --tag=nexus-web:fresh
-      # TODO: The following have been commented out because cypress tests are failing in the CI. Uncomment these when 3911 is fixed.
-      # - name: Start services
-      #   run: docker-compose -f ci/docker-compose.yml up -d && sleep 60
-      # - name: Copy nexus-web into Cypress container
-      #   # avoids permission issue where cypress writes screenshots to host with root as user
-      #   # which we can't then delete easily
-      #   run: docker cp ./. cypress:/e2e
-      # - name: e2e tests
-      #   run: echo | docker exec -e DEBUG=cypress:launcher:browsers -t cypress cypress run --config-file cypress.config.ts --browser chrome --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
+      - name: Start services
+        run: docker-compose -f ci/docker-compose.yml up -d && sleep 60
+      - name: Copy nexus-web into Cypress container
+        # avoids permission issue where cypress writes screenshots to host with root as user
+        # which we can't then delete easily
+        run: docker cp ./. cypress:/e2e
+      - name: e2e tests
+        run: >-
+          echo | timeout --verbose 20m docker exec
+          -e 'DEBUG=cypress:launcher:browsers'
+          -t
+          cypress
+          cypress run
+          --config-file cypress.config.ts
+          --browser chrome
+          --record
+          --key ${{ secrets.CYPRESS_RECORD_KEY }}
       - name: Cleanup Docker Containers
         if: ${{ always() }}
         run: docker-compose -f ci/docker-compose.yml down --rmi "local" --volumes

.gitignore

@@ -15,3 +15,4 @@ cypress.env.json
 *.sops*
 .sops-*.*
 *.key
+*.asdcas

README.md

@@ -55,6 +55,23 @@ Run unit tests:
 yarn test
 ```
 
+Run end to end tests:
+
+1. Ensure you have the `cypress.env.json` file locally.
+2.
+
+a. To run the tests in headed mode:
+
+```
+yarn cy:open
+```
+
+b. To run the tests in headless mode:
+
+```
+yarn cy:run
+```
+
 ## Build for production
 
 Compile app in `dist/` folder.

ci/config/delta-postgres.conf

@@ -1,6 +1,6 @@
 app {
   http {
-    base-uri = "http://delta:8080/v1"
+    base-uri = "http://delta:8098/v1"
     interface = 0.0.0.0
   }
 

ci/docker-compose.yml

@@ -1,14 +1,13 @@
 version: '3.3'
 services:
   cypress:
-    image: 'cypress/included:10.3.1-typescript'
+    image: 'cypress/included:12.17.0'
     depends_on:
       - fusion
       - delta
     environment:
-      - CYPRESS_NEXUS_API_URL=http://delta.test:8080/v1
+      - CYPRESS_NEXUS_API_URL=http://delta.test:8098/v1
       - CYPRESS_BASE_URL=http://fusion.test:8000
-
     working_dir: /e2e
     container_name: cypress
     entrypoint: ['bash']
@@ -19,11 +18,13 @@ services:
       - delta
     environment:
       ANALYSIS_PLUGIN_SHOW_ON_TYPES: 'Analysis,DetailedCircuit,AnalysisReport,Report'
-      API_ENDPOINT: 'http://delta.test:8080/v1'
+      API_ENDPOINT: 'http://delta.test:8098/v1'
       CLIENT_ID: 'fusion'
     image: nexus-web:fresh
     expose:
       - 8000
+    ports:
+      - 8000:8000
     networks:
       default:
         aliases:
@@ -56,9 +57,12 @@ services:
         './bin/delta-app',
         '-Xmx4G',
         '-Dapp.cluster.remote-interface=delta',
+        '-Dapp.http.port=8098',
       ]
     expose:
-      - 8080
+      - 8098
+    ports:
+      - 8098:8098
     volumes:
       - ./config:/config
       - /tmp:/default-volume
@@ -79,6 +83,7 @@ services:
       - --hostname-port=8080
       - --hostname-strict=false
       - --hostname-strict-backchannel=false
+      - --log-level=DEBUG
     ports:
       - 8080:8080
     networks:

cypress.config.ts

@@ -4,7 +4,7 @@ import {
   createNexusOrgAndProject,
   createResource,
   deprecateNexusOrgAndProject,
-} from './cypress/plugins/nexus';
+} from './cypress/support/Utils/nexus';
 import { uuidv4 } from './src/shared/utils';
 import setup, { TestUsers } from './cypress/support/setupRealmsAndUsers';
 
@@ -14,23 +14,34 @@ export default defineConfig({
   projectId: '1iihco',
   viewportWidth: 1200,
   video: true,
+  screenshotOnRunFailure: false,
   e2e: {
     baseUrl: 'http://localhost:8000',
     fileServerFolder: '/cypress',
     defaultCommandTimeout: 50000,
     specPattern: 'cypress/e2e/**/*.cy.{js,jsx,ts,tsx}',
-    // @ts-ignore
-    experimentalSessionAndOrigin: true,
-    // testIsolation: false,
+    chromeWebSecurity: false,
+
     env: {
       DEBUG: 'cypress:launcher:browsers',
       ELECTRON_DISABLE_GPU: 'true',
       ELECTRON_EXTRA_LAUNCH_ARGS: '--disable-gpu',
     },
     setupNodeEvents(on, config) {
       on('before:browser:launch', (browser, launchOptions) => {
+        launchOptions.args.push('--window-size=1920,1080');
         if (browser.name == 'chrome') {
           launchOptions.args.push('--disable-gpu');
+          launchOptions.args.push('--no-sandbox');
+
+          launchOptions.args.push('--disable-web-security');
+          launchOptions.args.push(
+            '--unsafely-treat-insecure-origin-as-secure=http://keycloak.test:8080'
+          );
+          if (!browser.isHeaded) {
+            console.log('Pushing Headless New');
+            launchOptions.args.push('--headless=new');
+          }
         }
         return launchOptions;
       }),
@@ -65,7 +76,7 @@ export default defineConfig({
             const projectLabel = `${projectLabelBase}-${uuidv4()}`;
             const projectDescription =
               'An project used for Cypress automated tests';
-
+            console.log('Auth TOKEN', authToken);
             try {
               const nexus = createNexusClient({
                 uri: nexusApiUrl,

cypress/e2e/Studios.cy-ignore.ts → cypress/e2e/Studios.cy.ts

@@ -44,14 +44,14 @@ describe('Studios', () => {
     studioDetailsPage = new StudioDetailsPage();
   });
 
-  // after(function() {
-  //   cy.task('project:teardown', {
-  //     nexusApiUrl: Cypress.env('NEXUS_API_URL'),
-  //     authToken: this.nexusToken,
-  //     orgLabel: Cypress.env('ORG_LABEL'),
-  //     projectLabel: this.projectLabel,
-  //   });
-  // });
+  after(function() {
+    cy.task('project:teardown', {
+      nexusApiUrl: Cypress.env('NEXUS_API_URL'),
+      authToken: this.nexusToken,
+      orgLabel: Cypress.env('ORG_LABEL'),
+      projectLabel: this.projectLabel,
+    });
+  });
 
   it('user can create a studio with a workspace and dashboard', function() {
     cy.visit(
@@ -70,9 +70,9 @@ describe('Studios', () => {
 
         cy.findByText('Enable Filter').click();
 
-        return cy.findByRole('button', { name: /Save/ }).click();
-      })
-      .then(() => {
+        cy.findByRole('button', { name: /Save/ }).click({ force: true });
+        // cy.wait('@saveDashboardRequest');
+
         studioDetailsPage.openEditDashboard();
 
         cy.findByLabelText(/Enable Filter/i).should('be.checked');

cypress/support/Studios/StudioDetails.ts

@@ -17,10 +17,10 @@ export class StudioDetailsPage extends StudioListPage {
   }
 
   openEditDashboard() {
-    cy.findByRole('button', { name: /Dashboard/ }).click();
+    cy.findByRole('button', { name: /Dashboard/ }).click({ force: true });
     cy.get('button[data-testid="edit-dashboard"]')
       .contains(/Edit/)
-      .click();
+      .click({ force: true });
     cy.findByRole('dialog').findByText('Edit');
   }
 
@@ -42,14 +42,16 @@ export class StudioDetailsPage extends StudioListPage {
     cy.findByRole('button', { name: /Add/ }).click();
     cy.findByPlaceholderText(/Name/i).type(dashboardName);
     cy.findByRole('combobox', { name: /View/ }).click();
-    cy.findByTitle(
-      'https://bluebrain.github.io/nexus/vocabulary/defaultSparqlIndex'
-    ).click();
+    cy.get(
+      '[data-testid="https://bluebrain.github.io/nexus/vocabulary/defaultSparqlIndex"]'
+    );
+    cy.get(
+      '[data-testid="https://bluebrain.github.io/nexus/vocabulary/defaultSparqlIndex"]'
+    ).trigger('click');
+
     cy.findByRole('checkbox', { name: /Enable Sort/i }).click();
     cy.findByRole('button', { name: /Save/ }).click();
-    cy.findByRole('menuitem', { name: new RegExp(workspaceName, 'i') }).click();
-    cy.get('ul')
-      .contains(new RegExp(dashboardName, 'i'))
-      .click();
+    console.log('Saved');
+    cy.findByText(new RegExp(dashboardName, 'i')).should('exist');
   }
 }

cypress/support/Studios/StudioList.ts

@@ -3,7 +3,6 @@ export class StudioListPage {
     cy.findByRole('button', { name: /Create Studio/i }).click();
     cy.findByRole('textbox', { name: /Label/ }).type(name);
     cy.findByRole('button', { name: /Save/ }).click();
-
     const studioElement = cy.findByRole('heading', { name });
     studioElement.contains(name);
     return studioElement;

cypress/support/Utils/nexus.ts

@@ -0,0 +1,67 @@
+import { NexusClient, ResourcePayload } from '@bbp/nexus-sdk';
+
+export const createNexusOrgAndProject = async ({
+  nexus,
+  orgLabel,
+  orgDescription,
+  projectLabel,
+  projectDescription,
+}: {
+  nexus: NexusClient;
+  orgLabel: string;
+  orgDescription: string;
+  projectLabel: string;
+  projectDescription: string;
+}) => {
+  // Create Org if does not exist
+  try {
+    const org = await nexus.Organization.get(orgLabel);
+
+    if (org._deprecated) {
+      throw new Error('Org deprecated');
+    }
+  } catch (e) {
+    await nexus.Organization.create(orgLabel, {
+      description: orgDescription,
+    });
+  }
+
+  // Create project if does not exist
+  try {
+    await nexus.Project.get(orgLabel, projectLabel);
+  } catch (e) {
+    await nexus.Project.create(orgLabel, projectLabel, {
+      description: projectDescription,
+    });
+  }
+};
+
+export const deprecateNexusOrgAndProject = async ({
+  nexus,
+  orgLabel,
+  projectLabel,
+}: {
+  nexus: NexusClient;
+  orgLabel: string;
+  projectLabel: string;
+}) => {
+  // Deprecate project
+  try {
+    const project = await nexus.Project.get(orgLabel, projectLabel);
+    await nexus.Project.deprecate(orgLabel, projectLabel, project._rev);
+  } catch (e) {
+    console.error('Encountered an error whilst trying to deprecate project', e);
+  }
+};
+
+export const createResource = async ({
+  nexus,
+  orgLabel,
+  projectLabel,
+  resource,
+}: {
+  nexus: NexusClient;
+  orgLabel: string;
+  projectLabel: string;
+  resource: ResourcePayload;
+}) => await nexus.Resource.create(orgLabel, projectLabel, resource);

cypress/support/setupRealmsAndUsers.ts

@@ -3,7 +3,7 @@ const fetch = require('node-fetch');
 const fs = require('fs');
 
 const keycloakUrl = 'http://keycloak.test:8080';
-const deltaBaseUrl = 'http://delta.test:8080/v1';
+const deltaBaseUrl = 'http://delta.test:8098/v1';
 
 // /* these are used for administrating keycloak */
 const keycloakAdmin = {