@deot/dev-test 2.0.1 → 2.1.0

package/dist/index.cjs.js

@@ -343,37 +343,40 @@ class Launch {
           !page.isClosed() && page.close();
         });
       }
-      this._page = this.browser.newPage();
-      this._page.then((page) => {
-        this.page = page;
-        this.operater = new Operater(page);
-        page.evaluateOnNewDocument(
-          /* istanbul ignore next */
-          () => {
-            localStorage.clear();
-          }
-        );
-        page.on(
-          "console",
-          /* istanbul ignore next */
-          (e) => {
-            if (e.type() === "error") {
-              const err = e.args()[0];
-              console.error(
-                `Error from Puppeteer-loaded page:
+      this._page = new Promise((resolve) => {
+        (async () => {
+          let page = await this.browser.newPage();
+          await page.evaluateOnNewDocument(
+            /* istanbul ignore next */
+            () => {
+              localStorage.clear();
+            }
+          );
+          page.on(
+            "console",
+            /* istanbul ignore next */
+            (e) => {
+              if (e.type() === "error") {
+                const err = e.args()[0];
+                console.error(
+                  `Error from Puppeteer-loaded page:
 `,
-                err.remoteObject().description
-              );
+                  err.remoteObject().description
+                );
+              }
             }
-          }
-        );
+          );
+          this.page = page;
+          this.operater = new Operater(page);
+          resolve(page);
+        })();
       });
     }
     return this._page;
   }
 }
 
-const TIME_OUT = 30 * 1e3;
+const TIME_OUT = 60 * 1e3;
 const impl = () => {
   let launch = new Launch();
   beforeAll(async () => {
@@ -383,10 +386,16 @@ const impl = () => {
     await launch.createPage(true);
   });
   afterEach(async () => {
-    await launch.page.close();
+    /* istanbul ignore else -- @preserve */
+    if (!launch.page.isClosed()) {
+      await launch.page.close();
+    }
   });
   afterAll(async () => {
-    await launch.browser.close();
+    /* istanbul ignore else -- @preserve */
+    if (launch.browser.isConnected()) {
+      await launch.browser.close();
+    }
   });
   return launch;
 };
@@ -413,9 +422,19 @@ const expectByPolling = async (poll, expected, options) => {
     }
   }
 };
+const def = (target, key, value, options) => {
+  return Object.defineProperty(target, key, {
+    value,
+    enumerable: false,
+    writable: true,
+    configurable: true,
+    ...options
+  });
+};
 
 const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 	__proto__: null,
+	def,
 	expectByPolling,
 	sleep
 }, Symbol.toStringTag, { value: 'Module' }));

package/dist/index.d.ts

@@ -28,6 +28,8 @@ export declare class Command {
     press(key: string, timeout?: number): Promise<void>;
 }
 
+declare const def: <T = object>(target: T, key: PropertyKey, value?: any, options?: PropertyDescriptor) => T;
+
 declare namespace E2E {
     export {
         TIME_OUT,
@@ -86,7 +88,8 @@ declare const TIME_OUT: number;
 declare namespace Utils {
     export {
         sleep,
-        expectByPolling
+        expectByPolling,
+        def
     }
 }
 export { Utils }

package/dist/index.es.js

@@ -320,37 +320,40 @@ class Launch {
           !page.isClosed() && page.close();
         });
       }
-      this._page = this.browser.newPage();
-      this._page.then((page) => {
-        this.page = page;
-        this.operater = new Operater(page);
-        page.evaluateOnNewDocument(
-          /* istanbul ignore next */
-          () => {
-            localStorage.clear();
-          }
-        );
-        page.on(
-          "console",
-          /* istanbul ignore next */
-          (e) => {
-            if (e.type() === "error") {
-              const err = e.args()[0];
-              console.error(
-                `Error from Puppeteer-loaded page:
+      this._page = new Promise((resolve) => {
+        (async () => {
+          let page = await this.browser.newPage();
+          await page.evaluateOnNewDocument(
+            /* istanbul ignore next */
+            () => {
+              localStorage.clear();
+            }
+          );
+          page.on(
+            "console",
+            /* istanbul ignore next */
+            (e) => {
+              if (e.type() === "error") {
+                const err = e.args()[0];
+                console.error(
+                  `Error from Puppeteer-loaded page:
 `,
-                err.remoteObject().description
-              );
+                  err.remoteObject().description
+                );
+              }
             }
-          }
-        );
+          );
+          this.page = page;
+          this.operater = new Operater(page);
+          resolve(page);
+        })();
       });
     }
     return this._page;
   }
 }
 
-const TIME_OUT = 30 * 1e3;
+const TIME_OUT = 60 * 1e3;
 const impl = () => {
   let launch = new Launch();
   beforeAll(async () => {
@@ -360,10 +363,16 @@ const impl = () => {
     await launch.createPage(true);
   });
   afterEach(async () => {
-    await launch.page.close();
+    /* istanbul ignore else -- @preserve */
+    if (!launch.page.isClosed()) {
+      await launch.page.close();
+    }
   });
   afterAll(async () => {
-    await launch.browser.close();
+    /* istanbul ignore else -- @preserve */
+    if (launch.browser.isConnected()) {
+      await launch.browser.close();
+    }
   });
   return launch;
 };
@@ -390,9 +399,19 @@ const expectByPolling = async (poll, expected, options) => {
     }
   }
 };
+const def = (target, key, value, options) => {
+  return Object.defineProperty(target, key, {
+    value,
+    enumerable: false,
+    writable: true,
+    configurable: true,
+    ...options
+  });
+};
 
 const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 	__proto__: null,
+	def,
 	expectByPolling,
 	sleep
 }, Symbol.toStringTag, { value: 'Module' }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-test",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "main": "dist/index.es.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.0.0",
-    "puppeteer": "^20.7.3"
+    "@deot/dev-shared": "^2.1.0",
+    "puppeteer": "^20.8.0"
   }
 }