fix import puppeteer (#23)

* fix import puppeteer (#21) * The puppeteer version is fixed * The puppeteer version is fixed * The puppeteer version is fixed * fix import puppeteer * fix import puppeteer * fix uses puppeteer * fix test (#22) * The puppeteer version is fixed * The puppeteer version is fixed * The puppeteer version is fixed * fix import puppeteer * fix import puppeteer * fix uses puppeteer * fix test * recompiled js (#25) * The puppeteer version is fixed * The puppeteer version is fixed * The puppeteer version is fixed * fix import puppeteer * fix import puppeteer * fix uses puppeteer * fix test * recompiled js * removed testing library validator (#27) * removed testing library validator
hyperskill · Oct 18, 2023 · d1ba559 · d1ba559
1 parent fc6f7ff
commit d1ba559
Show file tree

Hide file tree

Showing 13 changed files with 530 additions and 194 deletions.
diff --git a/dist/hstest/environment/page.js b/dist/hstest/environment/page.js
diff --git a/dist/hstest/environment/page.js.map b/dist/hstest/environment/page.js.map
diff --git a/dist/hstest/stage/stageTest.js.map b/dist/hstest/stage/stageTest.js.map
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hs-test-web-ts",
-    "version": "4.0.1",
+    "version": "4.1.1",
     "description": "Hyperskill Testing Library on TypeScript",
     "main": "dist/hstest/index.js",
     "scripts": {
@@ -11,33 +11,32 @@
     "keywords": [],
     "author": "Vladimir Turov & Ainur Gimadeev",
     "dependencies": {
-        "@types/callsite": "^1.0.31",
+        "@types/callsite": "^1.0.32",
         "callsite": "^1.0.0",
-        "puppeteer": "^13.0.0",
-        "puppeteer-element2selector": "^0.0.3"
+        "puppeteer": "21.0.0",
+        "puppeteer-element2selector": "0.0.3"
     },
     "devDependencies": {
         "@babel/core": ">=7.9.6",
         "@babel/preset-env": ">=7.9.6",
         "@babel/preset-react": ">=7.9.4",
-        "@types/puppeteer": "^5.4.4",
-        "@types/webpack": "4.4.17",
-        "@types/webpack-dev-server": "3.1.1",
-        "@typescript-eslint/eslint-plugin": "^5.10.0",
-        "@typescript-eslint/parser": "^5.10.0",
-        "babel-loader": "^8.2.3",
-        "chai": "^4.3.4",
-        "css-loader": "^5.2.1",
-        "eslint": "^8.7.0",
+        "@types/webpack": "5.28.2",
+        "@types/webpack-dev-server": "4.7.2",
+        "@typescript-eslint/eslint-plugin": "^6.6.0",
+        "@typescript-eslint/parser": "^6.6.0",
+        "babel-loader": "^9.1.3",
+        "chai": "^4.3.8",
+        "css-loader": "^6.8.1",
+        "eslint": "^8.48.0",
         "file-loader": ">=6.0.0",
-        "mocha": "^9.1.3",
-        "react": "^16.13.1",
-        "react-dom": "^16.13.1",
-        "style-loader": "^1.2.1",
+        "mocha": "10.1.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "style-loader": "^3.3.3",
         "ts-node": "^10.4.0",
-        "typescript": "^4.5.4",
-        "webpack": "^4.46.0",
-        "webpack-cli": "^3.3.11",
-        "webpack-dev-server": "^4.11.1"
+        "typescript": "^5.2.2",
+        "webpack": "^5.88.2",
+        "webpack-cli": "^5.1.4",
+        "webpack-dev-server": "^4.15.1"
     }
-}
+}
diff --git a/hstest/environment/page.ts b/hstest/environment/page.ts
@@ -1,13 +1,14 @@
-import puppeteer, {ElementHandle, EvaluateFn} from 'puppeteer';
+import {ElementHandle, EvaluateFunc} from 'puppeteer';
 import Browser from "../chromium/browser.js";
 import BrowserPageHandler from "../handler/browserPageHandler.js";
 import CheckResult from "../outcome/checkResult.js";
 import WrongAnswer from "../exception/outcome/WrongAnswer.js";
 import TestPassed from "../exception/outcome/TestPassed.js";
 import Element from "./element.js";
 import EventHandler from "../handler/eventHandler.js";
+import * as puppeteer from 'puppeteer';
 
-class Page {
+class Page{
     url: string;
     browser: Browser;
     isOpened: boolean;
@@ -44,7 +45,7 @@ class Page {
     execute(func: NoArgsFunction): NoArgsFunction {
         return async () => {
             await this.open();
-            const result = await this.pageInstance.evaluate(func as EvaluateFn);
+            const result = await this.pageInstance.evaluate(func as EvaluateFunc<any>);
             return CheckResult.fromJson(result);
         };
     }
@@ -61,7 +62,7 @@ class Page {
 
     async evaluate(func: NoArgsFunction): Promise<object> {
         await this.open();
-        const evaluationResult = await this.pageInstance.evaluate(func as EvaluateFn);
+        const evaluationResult = await this.pageInstance.evaluate(func as EvaluateFunc<any>);
         if (CheckResult.isCheckResult(evaluationResult)) {
             if (!evaluationResult.isCorrect) {
                 throw new WrongAnswer(evaluationResult.feedback);
@@ -82,6 +83,11 @@ class Page {
         );
     }
 
+    async getClient(): Promise<puppeteer.Page> {
+        await this.open();
+        return this.pageInstance;
+    }
+
     async findById(id: string): Promise<Element | null> {
         return await (await this._getBodyTag()).findById(id);
     }

diff --git a/hstest/stage/checkerLibraryVersion.ts b/hstest/stage/checkerLibraryVersion.ts
diff --git a/hstest/stage/stageTest.ts b/hstest/stage/stageTest.ts
@@ -9,22 +9,15 @@ import Outcome from "../outcome/outcome.js";
 import OutcomeFactory from "../outcome/outcomeFactory.js";
 import WrongAnswer from "../exception/outcome/WrongAnswer.js";
 import UnexpectedErrorOutcome from "../outcome/unexpectedErrorOutcome.js";
-import CheckerLibraryVersion from "./checkerLibraryVersion";
-import puppeteer from "puppeteer";
+import * as puppeteer from 'puppeteer';
 
 class StageTest {
 
     node: NodeEnvironment = new NodeEnvironment();
     runner: TestRunner = new JsRunner();
     tests: NoArgsFunction[] = [];
 
-    checkerLibraryVersion: CheckerLibraryVersion = new CheckerLibraryVersion();
-
     constructor() {
-        // Perform the library version check upon class instantiation
-        this.checkerLibraryVersion.checkLibraryVersion().catch((error) => {
-            console.error("Error while checking library version:", error);
-        });
     }
 
     getPage(url: string, options: puppeteer.WaitForOptions = {}): Page {