Merge pull request #922 from ONEARMY/fix-pr920

Fix pr920 - clear indexDB local cache before automated test
ONEARMY · Mar 28, 2020 · 65a0728 · 65a0728
2 parents caad9bf + d16cf93
commit 65a0728
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/cypress/support/hooks.ts b/cypress/support/hooks.ts
@@ -9,6 +9,8 @@ import { Firestore } from './db/firebase'
  */
 
 before(() => {
+  indexedDB.deleteDatabase('OneArmyCache')
+  cy.clearLocalStorage()
   cy.wrap('Initialising Database').then({ timeout: 60000 }, doc => {
     // large initial timeout in case server slow to respond
     return new Cypress.Promise(async resolve => {

diff --git a/functions/src/Integrations/firebase-discord.ts b/functions/src/Integrations/firebase-discord.ts
@@ -12,7 +12,8 @@ export const notifyPinAccepted = functions.firestore
   .onWrite(async (change, context) => {
     const info = change.after.exists ? change.after.data() : null
     const prevInfo = change.before.exists ? change.before.data() : null
-    const beenAccepted = (prevInfo !== null) ? prevInfo.hasBeenAccepted : null;
+    const beenAccepted =
+      prevInfo !== null ? prevInfo.moderation === 'accepted' : null
     if (info === null || info.moderation !== 'accepted' || beenAccepted) {
       return
     }

diff --git a/src/models/common.models.tsx b/src/models/common.models.tsx
@@ -27,7 +27,6 @@ export type IModerationStatus =
 
 export interface IModerable {
   moderation: IModerationStatus
-  hasBeenAccepted?: boolean
   _createdBy?: string
   _id?: string
 }

diff --git a/src/stores/Maps/maps.store.ts b/src/stores/Maps/maps.store.ts
@@ -163,9 +163,6 @@ export class MapsStore extends ModuleStore {
     if (!hasAdminRights(this.activeUser)) {
       return false
     }
-    if (pin.moderation === 'accepted') {
-      pin.hasBeenAccepted = true
-    }
     this.setPin(pin)
   }
   public needsModeration(pin: IMapPin) {