Fix flaky Cypress tests

Accenture · Sep 24, 2019 · a2cb254 · a2cb254
1 parent e4bc9f6
commit a2cb254
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/examples/tests/cypress/integration/channels.spec.js b/examples/tests/cypress/integration/channels.spec.js
@@ -6,7 +6,7 @@ describe('Channels', () => {
       cy.subscribe('mike', 'my.public.event');
       // "foo":"bar" due to way how Cypress handles escaping of curly braces
       cy.sendEvent('my.public.event', '"foo":"bar"');
-      cy.assertReceivedEvents('event-log', '(.*my.public.event)(.*"foo":"bar")');
+      cy.assertReceivedEventLog('event-log', '(.*my.public.event)(.*"foo":"bar")');
       cy.disconnect();
     });
 
@@ -16,11 +16,11 @@ describe('Channels', () => {
       cy.subscribe('mike', 'message');
       // "name":"mike","foo":"bar" due to way how Cypress handles escaping of curly braces
       cy.sendEvent('message', '"name":"mike","foo":"bar"');
-      cy.assertReceivedEvents('event-log', 'message', '"name":"mike","foo":"bar"');
+      cy.assertReceivedEventLog('event-log', '"name":"mike","foo":"bar"');
       // send constrained event for different user - John
       cy.sendEvent('message', '"name":"john","foo":"bar"');
       // Mike shouldn't receive any new event
-      cy.wait(2000).assertReceivedEvents(
+      cy.assertReceivedEventLog(
         'event-log',
         '(.*message)(.*"name":"mike","foo":"bar")'
       );

diff --git a/examples/tests/cypress/integration/subscriptions-jwt.spec.js b/examples/tests/cypress/integration/subscriptions-jwt.spec.js
@@ -17,7 +17,7 @@ describe('Subscriptions with JWT auth', () => {
       cy.setAndVerifyInput('greeting', 'hello');
       cy.setAndVerifyInput('name', 'mike');
       cy.submit();
-      cy.wait(2000).assertReceivedEvents('eventList', '"name":"john","greeting":"hello"');
+      cy.assertReceivedEvents('eventList', '"name":"john","greeting":"hello"');
     });
 
     it(`Creates ${type} subscriptions based on JWT in connection call and applies constraints`, () => {
@@ -30,7 +30,7 @@ describe('Subscriptions with JWT auth', () => {
       cy.setAndVerifyInput('greeting', 'hello');
       cy.setAndVerifyInput('name', 'mike');
       cy.submit();
-      cy.wait(2000).assertReceivedEvents(
+      cy.assertReceivedEvents(
         'eventList',
         '"name":"john.doe","greeting":"hello"'
       );

diff --git a/examples/tests/cypress/integration/subscriptions-no-auth.spec.js b/examples/tests/cypress/integration/subscriptions-no-auth.spec.js
@@ -24,7 +24,7 @@ describe('Subscriptions with no auth', () => {
       cy.setAndVerifyInput('greeting', 'hello');
       cy.setAndVerifyInput('name', 'mike');
       cy.submit();
-      cy.wait(2000).assertReceivedEvents('eventList', '"name":"john","greeting":"hello"');
+      cy.assertReceivedEvents('eventList', '"name":"john","greeting":"hello"');
     });
   });
 });
diff --git a/examples/tests/cypress/support/commands.js b/examples/tests/cypress/support/commands.js
@@ -48,7 +48,15 @@ Cypress.Commands.add('sendEvent', (eventType, message) => {
 
 Cypress.Commands.add('assertReceivedEvents', (element, message) => {
   // assert number and content of received events
-  cy.get(`#${element}`)
+  cy.get(`#${element} > li`, {timeout: 30000})
+    .should('be.visible')
+    .first()
+    .contains(message)
+});
+
+Cypress.Commands.add('assertReceivedEventLog', (element, message) => {
+  // assert number and content of received events
+  cy.get(`#${element}`, {timeout: 30000})
     .should('have.length', 1)
     .first()
     .contains(new RegExp(message, 'g'));