fix merge conflicts

1 files changed, 10 insertions, 8 deletions

diff --git a/mascara/test/util/mascara-test-helper.js b/mascara/test/util/mascara-test-helper.js
index 9cf4fa900..0439fbba3 100644
--- a/mascara/test/util/mascara-test-helper.js
+++ b/mascara/test/util/mascara-test-helper.js
@@ -2,27 +2,29 @@ const EventEmitter = require('events')
 const IDB = require('idb-global')
 const KEY = 'metamask-test-config'
 module.exports = class Helper extends EventEmitter {
-  constructor () {
-    super()
-  }
 
   tryToCleanContext () {
     this.unregister()
     .then(() => this.clearDb())
     .then(() => super.emit('complete'))
-    .catch((err) => super.emit('complete'))
+    .catch((err) => {
+      if (err) {
+        super.emit('complete')
+      }
+    })
   }
 
   unregister () {
     return global.navigator.serviceWorker.getRegistration()
     .then((registration) => {
-      if (registration) return registration.unregister()
+      if (registration) {
+ return registration.unregister()
       .then((b) => b ? Promise.resolve() : Promise.reject())
-      else return Promise.resolve()
+} else return Promise.resolve()
     })
   }
   clearDb () {
-    return new Promise ((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       const deleteRequest = global.indexDB.deleteDatabase(KEY)
       deleteRequest.addEventListener('success', resolve)
       deleteRequest.addEventListener('error', reject)
@@ -33,7 +35,7 @@ module.exports = class Helper extends EventEmitter {
     const db = new IDB({
       version: 2,
       key: KEY,
-      initialState: state
+      initialState: state,
     })
     return db.open()
   }