added 3-click centring tests

ui/cypress/e2e/app.cy.js

@@ -32,16 +32,3 @@ describe('app', () => {
     cy.findByRole('button', { name: /Beamline Actions/u }).should('be.visible');
   });
 });
-
-describe('queue', () => {
-  beforeEach(() => {
-    cy.login();
-    cy.findByRole('link', { name: 'MXCuBE-Web (OSC)' }).should('be.visible');
-    cy.takeControl();
-  });
-
-  it('mount a test sample', () => {
-    cy.mountSample('test', 'test');
-    cy.findByText('Sample: test - test').should('be.visible');
-  });
-});

ui/cypress/e2e/queue.cy.js

@@ -0,0 +1,14 @@
+/* global cy, it, describe, beforeEach */
+
+describe('queue', () => {
+  beforeEach(() => {
+    cy.login();
+    cy.findByRole('link', { name: 'MXCuBE-Web (OSC)' }).should('be.visible');
+    cy.takeControl();
+  });
+
+  it('mount a test sample', () => {
+    cy.mountSample('test', 'test');
+    cy.findByText('Sample: test - test').should('be.visible');
+  });
+});

ui/cypress/e2e/sampleControls.cy.js

@@ -0,0 +1,41 @@
+/* global cy, it, describe, beforeEach, Cypress */
+
+describe('3-click centring', () => {
+  beforeEach(() => {
+    cy.login();
+    cy.findByRole('link', { name: 'MXCuBE-Web (OSC)' }).should('be.visible');
+    cy.takeControl();
+  });
+
+  it('3-click centring should not work without sample', () => {
+    cy.clearSamples();
+    cy.contains('button', '3-click centring').click();
+    cy.findByRole('alert', 'Error: There is no sample mounted').should(
+      'be.visible',
+    );
+  });
+
+  it('Each click is rotating the sample by 90 degrees', () => {
+    cy.mountSample();
+    cy.contains('button', '3-click centring').click();
+    /* eslint-disable-next-line promise/catch-or-return */
+    cy.get('.form-control[name="diffractometer.phi"]')
+      .invoke('val')
+      /* eslint-disable-next-line promise/prefer-await-to-then */
+      .then((value) => {
+        let omegaValue = Number.parseFloat(value);
+        Cypress._.times(2, () => {
+          omegaValue += 90;
+          cy.get('.canvas-container').click();
+          // to update the omega value, a small amount of time must be waited and the page reloaded
+          cy.wait(1000);
+          cy.reload();
+          // press the centring button again after reload to stay in the correct mode
+          cy.contains('button', '3-click centring').click();
+          cy.get('.form-control[name="diffractometer.phi"]')
+            .invoke('val')
+            .should('equal', omegaValue.toFixed(2));
+        });
+      });
+  });
+});

ui/cypress/support.js

@@ -19,9 +19,9 @@ Cypress.Commands.add('takeControl', () => {
 
   // ensure to click away the observer mode dialog box if present
   /* eslint-disable-next-line promise/catch-or-return, promise/prefer-await-to-then */
-  cy.findByRole('dialog').then(($dialog) => {
-    if ($dialog.text().includes('Observer mode')) {
-      cy.wrap($dialog.find('.form-control')).type('test');
+  cy.get('body').then(($body) => {
+    if ($body.text().includes('Observer mode')) {
+      cy.wrap($body.find('.modal-dialog').find('.form-control')).type('test');
       cy.findByText('OK').click();
     }
   });
@@ -31,6 +31,7 @@ Cypress.Commands.add('takeControl', () => {
   Cypress.on('uncaught:exception', (err, runnable) => {
     return true;
   });
+  cy.reload();
 });
 
 Cypress.Commands.add('mountSample', (sample = 'test', protein = 'test') => {
@@ -43,3 +44,8 @@ Cypress.Commands.add('mountSample', (sample = 'test', protein = 'test') => {
   // reload for button changes to take effect
   cy.reload();
 });
+
+Cypress.Commands.add('clearSamples', () => {
+  cy.request('PUT', '/mxcube/api/v0.1/queue/clear');
+  cy.reload();
+});

ui/package.json

@@ -81,7 +81,7 @@
     "@testing-library/user-event": "^13.5.0",
     "babel-preset-react-app": "10.0.1",
     "concurrently": "^7.0.0",
-    "cypress": "13.1.0",
+    "cypress": "13.12.0",
     "eslint": "8.42.0",
     "eslint-config-galex": "4.5.2",
     "eslint-plugin-import": "2.27.5",