Merge branch 'staging' into feature/cloudflare-r2-backups

# Conflicts: # site/gatsby-site/cypress/e2e/integration/discover.cy.js
lmcnulty · Nov 14, 2023 · 37cc9eb · 37cc9eb
2 parents 5d71605 + 7b03680
commit 37cc9eb
Show file tree

Hide file tree

Showing 3 changed files with 166 additions and 153 deletions.
diff --git a/site/gatsby-site/cypress/e2e/integration/discover.cy.js b/site/gatsby-site/cypress/e2e/integration/discover.cy.js
@@ -39,14 +39,10 @@ describe('The Discover app', () => {
 
       cy.location('search', { timeout: 8000 }).should('contain', 'is_incident_report=true');
 
-      cy.waitForStableDOM();
-
       cy.contains('[data-cy="display-options"]', 'Incident Reports')
         .should('exist')
         .and('be.visible');
 
-      cy.waitForStableDOM();
-
       cy.get('div[data-cy="hits-container"]').children().should('have.length.at.least', 28);
     }
   );

diff --git a/site/gatsby-site/cypress/e2e/unit/functions/processNotifications.cy.js b/site/gatsby-site/cypress/e2e/unit/functions/processNotifications.cy.js
@@ -789,7 +789,7 @@ describe('Functions', () => {
         expect(notificationsCollection.updateOne.getCall(i).args[1].$set.processed).to.be.equal(
           true
         );
-        expect(notificationsCollection.updateOne.getCall(i).args[1].$set).not.to.have.ownProperty(
+        expect(notificationsCollection.updateOne.getCall(i).args[1].$set).to.have.ownProperty(
           'sentDate'
         );
       }
@@ -808,9 +808,9 @@ describe('Functions', () => {
         expect(notificationsCollection.updateOne.getCall(i + 2).args[1].$set.processed).to.be.equal(
           true
         );
-        expect(
-          notificationsCollection.updateOne.getCall(i + 2).args[1].$set
-        ).not.to.have.ownProperty('sentDate');
+        expect(notificationsCollection.updateOne.getCall(i + 2).args[1].$set).to.have.ownProperty(
+          'sentDate'
+        );
       }
 
       for (let i = 0; i < pendingNotificationsToIncidentUpdates.length; i++) {
@@ -827,9 +827,9 @@ describe('Functions', () => {
         expect(notificationsCollection.updateOne.getCall(i + 4).args[1].$set.processed).to.be.equal(
           true
         );
-        expect(
-          notificationsCollection.updateOne.getCall(i + 4).args[1].$set
-        ).not.to.have.ownProperty('sentDate');
+        expect(notificationsCollection.updateOne.getCall(i + 4).args[1].$set).to.have.ownProperty(
+          'sentDate'
+        );
       }
 
       expect(