@zondax/zemu - npm Package Compare versions

Comparing version 0.36.2-beta.5 to 0.36.2-beta.6

dist/buttons.js

@@ -12,3 +12,3 @@ "use strict";
     y: 65,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -18,3 +18,3 @@ const quitAppButton = {
     y: 0,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -24,3 +24,3 @@ exports.tapContinueButton = {
     y: 250,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -30,3 +30,3 @@ const prevPageButton = {
     y: 45,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -36,3 +36,3 @@ const toggleOption1 = {
     y: 125,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -42,3 +42,3 @@ const toggleOption2 = {
     y: 200,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -48,3 +48,3 @@ const toggleOption3 = {
     y: 250,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -54,3 +54,3 @@ const navRightButton = {
     y: 625,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -60,3 +60,3 @@ const navLeftButton = {
     y: 625,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -66,3 +66,3 @@ const approveTapButton = {
     y: 550,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -77,3 +77,3 @@ const approveHoldButton = {
     y: 650,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -83,3 +83,3 @@ const confirmYesButton = {
     y: 550,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -89,3 +89,3 @@ const confirmNoButton = {
     y: 650,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -95,3 +95,3 @@ const showQRButton = {
     y: 300,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -101,3 +101,3 @@ const closeQRButton = {
     y: 650,
-    delay: 0.1,
+    delay: 0.25,
 };
@@ -104,0 +104,0 @@ exports.TouchElements = new Map([

dist/constants.d.ts

@@ -21,3 +21,3 @@ /** ******************************************************************************
 export declare const DEFAULT_START_DELAY = 20000;
-export declare const DEFAULT_KEY_DELAY = 100;
+export declare const DEFAULT_KEY_DELAY = 250;
 export declare const DEFAULT_HOST = "127.0.0.1";
@@ -24,0 +24,0 @@ export declare const BASE_NAME = "zemu-";

dist/constants.js

@@ -8,3 +8,3 @@ "use strict";
 exports.DEFAULT_START_DELAY = 20000;
-exports.DEFAULT_KEY_DELAY = 100;
+exports.DEFAULT_KEY_DELAY = 250;
 exports.DEFAULT_HOST = "127.0.0.1";
@@ -11,0 +11,0 @@ exports.BASE_NAME = "zemu-";

dist/Zemu.d.ts

@@ -36,2 +36,3 @@ /// <reference types="node" />
     private mainMenuSnapshot;
+    private initialEvents;
     constructor(elfPath: string, libElfs?: Record<string, string>, host?: string, desiredTransportPort?: number, desiredSpeculosApiPort?: number, emuImage?: string);
@@ -70,4 +71,4 @@ static LoadPng2RGB(filename: string): PNGWithMetadata;
     compareSnapshotsAndReject(path: string, testcaseName: string, waitForScreenUpdate?: boolean, startImgIndex?: number, timeout?: number): Promise<boolean>;
-    navigateUntilText(path: string, testcaseName: string, text: string, waitForScreenUpdate?: boolean, takeSnapshots?: boolean, startImgIndex?: number, timeout?: number, runLastAction?: boolean): Promise<number>;
-    navigateAndCompareUntilText(path: string, testcaseName: string, text: string, waitForScreenUpdate?: boolean, startImgIndex?: number, timeout?: number): Promise<boolean>;
+    navigateUntilText(path: string, testcaseName: string, text: string | RegExp, waitForScreenUpdate?: boolean, takeSnapshots?: boolean, startImgIndex?: number, timeout?: number, runLastAction?: boolean): Promise<number>;
+    navigateAndCompareUntilText(path: string, testcaseName: string, text: string | RegExp, waitForScreenUpdate?: boolean, startImgIndex?: number, timeout?: number): Promise<boolean>;
     getEvents(): Promise<IEvent[]>;
@@ -74,0 +75,0 @@ deleteEvents(): Promise<void>;

dist/Zemu.js

@@ -126,4 +126,5 @@ "use strict";
             await this.waitForText(this.startOptions.startText, this.startOptions.startTimeout, this.startOptions.caseSensitive);
-            this.log(`Get initial snapshot`);
+            this.log(`Get initial snapshot and events`);
             this.mainMenuSnapshot = await this.snapshot();
+            this.initialEvents = await this.getEvents();
         }
@@ -402,2 +403,3 @@ catch (e) {
         let filename = this.getSnapshotPath(snapshotPrefixTmp, imageIndex, takeSnapshots);
+        await this.waitForScreenChanges(this.initialEvents);
         await this.snapshot(filename);
@@ -407,2 +409,3 @@ let start = new Date();
         const isStaxDevice = this.startOptions.model === "stax";
+        const textRegex = new RegExp(text, "i");
         while (!found) {
@@ -417,3 +420,3 @@ const currentTime = new Date();
             filename = this.getSnapshotPath(snapshotPrefixTmp, imageIndex, takeSnapshots);
-            found = events.some((event) => event.text.includes(text)); // TODO
+            found = events.some((event) => textRegex.test(event.text));
             if (found)
@@ -494,4 +497,4 @@ break;
         if (waitForScreenUpdate) {
+            await this.waitUntilScreenIsNot(prevScreen);
             await this.waitForScreenChanges(prevEvents);
-            await this.waitUntilScreenIsNot(prevScreen);
         }
@@ -498,0 +501,0 @@ else {

package.json

@@ -5,3 +5,3 @@ {
   "license": "Apache-2.0",
-  "version": "0.36.2-beta.5",
+  "version": "0.36.2-beta.6",
   "description": "Zemu Testing Framework",
@@ -8,0 +8,0 @@ "main": "./dist/index.js",

src/buttons.ts

@@ -27,3 +27,3 @@ /** ******************************************************************************
   y: 65,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -34,3 +34,3 @@
   y: 0,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -41,3 +41,3 @@
   y: 250,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -48,3 +48,3 @@
   y: 45,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -55,3 +55,3 @@
   y: 125,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -62,3 +62,3 @@
   y: 200,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -69,3 +69,3 @@
   y: 250,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -76,3 +76,3 @@
   y: 625,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -83,3 +83,3 @@
   y: 625,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -90,3 +90,3 @@
   y: 550,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -103,3 +103,3 @@
   y: 650,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -110,3 +110,3 @@
   y: 550,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -117,3 +117,3 @@
   y: 650,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -124,3 +124,3 @@
   y: 300,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -131,3 +131,3 @@
   y: 650,
-  delay: 0.1,
+  delay: 0.25,
 };
@@ -134,0 +134,0 @@

src/constants.ts

@@ -23,3 +23,3 @@ /** ******************************************************************************
 export const DEFAULT_START_DELAY = 20000;
-export const DEFAULT_KEY_DELAY = 100;
+export const DEFAULT_KEY_DELAY = 250;
 export const DEFAULT_HOST = "127.0.0.1";
@@ -26,0 +26,0 @@ export const BASE_NAME = "zemu-";

src/Zemu.ts

@@ -84,2 +84,3 @@ /** ******************************************************************************
   private mainMenuSnapshot!: ISnapshot;
+  private initialEvents!: IEvent[];
 
@@ -201,4 +202,5 @@ constructor(
 
-      this.log(`Get initial snapshot`);
+      this.log(`Get initial snapshot and events`);
       this.mainMenuSnapshot = await this.snapshot();
+      this.initialEvents = await this.getEvents();
     } catch (e) {
@@ -590,3 +592,3 @@ this.log(`[ZEMU] ${e}`);
     testcaseName: string,
-    text: string,
+    text: string | RegExp,
     waitForScreenUpdate = true,
@@ -608,2 +610,3 @@ takeSnapshots = true,
     let filename = this.getSnapshotPath(snapshotPrefixTmp, imageIndex, takeSnapshots);
+    await this.waitForScreenChanges(this.initialEvents);
     await this.snapshot(filename);
@@ -615,2 +618,4 @@
 
+    const textRegex = new RegExp(text, "i");
+
     while (!found) {
@@ -628,3 +633,3 @@ const currentTime = new Date();
 
-      found = events.some((event: IEvent) => event.text.includes(text)); // TODO
+      found = events.some((event: IEvent) => textRegex.test(event.text));
       if (found) break;
@@ -656,3 +661,3 @@
     testcaseName: string,
-    text: string,
+    text: string | RegExp,
     waitForScreenUpdate = true,
@@ -732,4 +737,4 @@ startImgIndex = 0,
     if (waitForScreenUpdate) {
+      await this.waitUntilScreenIsNot(prevScreen);
       await this.waitForScreenChanges(prevEvents);
-      await this.waitUntilScreenIsNot(prevScreen);
     } else {
@@ -736,0 +741,0 @@ // A minimum delay is required

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3029765

increased by0.02%

Lines of code

3058

increased by0.26%

No dependency changes