fix jest test

Genymobile · Jun 13, 2024 · 8e47448 · 8e47448
1 parent d481be8
commit 8e47448
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -8,6 +8,7 @@
     "jsxSingleQuote": true,
     "trailingComma": "all",
     "bracketSpacing": false,
+    "spaceBeforeFunctionParen": false,
     "jsxBracketSameLine": false,
     "arrowParens": "always",
     "proseWrap": "preserve",

diff --git a/src/plugins/FileUpload.js b/src/plugins/FileUpload.js
@@ -302,7 +302,7 @@ module.exports = class FileUpload extends OverlayPlugin {
             case 'success':
                 this.displayStep('successScreen');
                 // On flashing success, force display success screen
-                if (this.flashing && this.widget.classList.contains('gm-hidden')) {
+                if (this.flashing && !this.instance.store.getters.isWidgetOpened(this.overlayID)) {
                     this.toggleWidget();
                 }
                 this.flashing = false;
@@ -313,7 +313,7 @@ module.exports = class FileUpload extends OverlayPlugin {
             case 'install_error':
                 this.displayStep('errorScreen');
                 // On flashing error, force display errorscreen
-                if (this.flashing && this.widget.classList.contains('gm-hidden')) {
+                if (this.flashing && !this.instance.store.getters.isWidgetOpened(this.overlayID)) {
                     this.toggleWidget();
                 }
                 this.flashing = false;

diff --git a/src/plugins/MouseEvents.js b/src/plugins/MouseEvents.js
@@ -87,7 +87,9 @@ module.exports = class MouseEvents {
         }
         this.instance.sendEvent(json);
 
-        this.removeMouseUpListener();
+        if (this.removeMouseUpListener) {
+            this.removeMouseUpListener();
+        }
     }
 
     /**

diff --git a/tests/mocks/DeviceRenderer.js b/tests/mocks/DeviceRenderer.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const Original = require('../../src/DeviceRenderer');
-
 module.exports = class DeviceRenderer extends Original {
     constructor(options) {
         document.body.innerHTML = `
@@ -38,6 +37,10 @@ module.exports = class DeviceRenderer extends Original {
                 return {};
             },
             subscribe: jest.fn(),
+            dispatch: jest.fn(),
+            getters: {
+                isWidgetOpened: () => false,
+            },
         };
         this.apiManager = {
             registerFunction: jest.fn(),

diff --git a/tests/unit/clipboard.test.js b/tests/unit/clipboard.test.js
@@ -4,6 +4,7 @@ jest.mock('loglevel');
 
 const Clipboard = require('../../src/plugins/Clipboard');
 const Instance = require('../mocks/DeviceRenderer');
+const store = require('../../src/store/index');
 
 let clipboard;
 let instance;
@@ -12,6 +13,7 @@ let plugin;
 describe('Clipboard Plugin', () => {
     beforeEach(() => {
         instance = new Instance();
+        store(instance);
         clipboard = new Clipboard(instance, {});
         plugin = document.getElementsByClassName('gm-clipboard-plugin')[0];
     });
@@ -25,6 +27,7 @@ describe('Clipboard Plugin', () => {
     describe('UI', () => {
         beforeEach(() => {
             instance = new Instance();
+            store(instance);
             clipboard = new Clipboard(instance, {
                 CLIPBOARD_TITLE: 'TEST CLIPBOARD PLUGIN TITLE',
             });

diff --git a/tests/unit/fileupload.test.js b/tests/unit/fileupload.test.js
@@ -1,7 +1,8 @@
 'use strict';
-
+jest.mock('loglevel');
 const FileUpload = require('../../src/plugins/FileUpload');
 const Instance = require('../mocks/DeviceRenderer');
+const store = require('../../src/store/index');
 
 let uploader;
 let instance;
@@ -10,6 +11,8 @@ let plugin;
 describe('FileUpload Plugin', () => {
     beforeEach(() => {
         instance = new Instance();
+        store(instance);
+
         uploader = new FileUpload(instance, {
             UPLOADER_INSTALLING: 'TEST UPLOADER PLUGIN INSTALLING...',
         });
@@ -31,6 +34,7 @@ describe('FileUpload Plugin', () => {
     describe('UI', () => {
         beforeEach(() => {
             instance = new Instance();
+            store(instance);
             uploader = new FileUpload(instance, {
                 UPLOADER_TITLE: 'TEST UPLOADER PLUGIN TITLE',
                 UPLOADER_HOME_TITLE: 'TEST UPLOADER PLUGIN HOME TITLE',