tests: moved tests to newest 6 version of wdio

Author: Razzwan

Diff for: .eslintrc

@@ -15,7 +15,7 @@
     },
     "settings": {
       "react": {
-        "version": "detect", // React version. "detect" automatically picks the version you have installed.
+        "version": "detect" // React version. "detect" automatically picks the version you have installed.
       }
     },
     "rules": {
@@ -72,11 +72,12 @@
         "comma-dangle": ["error" ,"always-multiline"],
         "semi": ["error", "always"],
         "eol-last": "error",
-        "eqeqeq": "error",
+        "eqeqeq": "error"
     },
     "parser": "@typescript-eslint/parser",
     "plugins": ["@typescript-eslint", "react"],
     "parserOptions": {
       "project": "./tsconfig.eslint.json"
-    }
+    },
+    "ignorePatterns": ["test/**/*.conf.js"]
 }

Diff for: .gitignore

@@ -17,3 +17,6 @@ subgraph.yaml
 build/
 *.scss.d.ts
 *.ps1
+.idea
+
+test/integration/.dist

Diff for: CHANGELOG.md

@@ -1,6 +1,13 @@
-## 1.0.2
+## 1.0.3
   - Features Added
     - First loading speed improvement
+    - Pages loading process was split to several chunk which is improved UX
+
+  - Bugs Fixed
+    - Integration tests typescript supporting was added
+
+## 1.0.2
+  - Features Added
     - Support Multi-call Generic Scheme
     - Use subgraph v40_0 and arc.js 0.2.76
     - Added xGEN / GEN bridge

Diff for: package-lock.json

@@ -75,10 +75,11 @@
     "test": "wdio ./test/integration/wdio.conf.js",
     "test:integration": "wdio ./test/integration/wdio.conf.js --inspect",
     "test:integration:headless": "wdio ./test/integration/wdio-headless.conf.js",
+    "test:i": "wdio ./test/integration/wdio-headless.conf.js",
     "test:unit": "jest"
   },
   "dependencies": {
-    "3box": "1.20.2",
+    "3box": "1.22.2",
     "@burner-wallet/burner-connect-provider": "^0.1.1",
     "@daostack/arc.js": "0.2.76",
     "@dorgtech/daocreator-ui": "^1.0.13",
@@ -150,14 +151,15 @@
     "@daostack/migration": "0.0.1-rc.47-v0",
     "@storybook/addon-info": "^5.0.10",
     "@storybook/react": "^5.0.10",
-    "@types/chai": "^4.1.7",
+    "@types/chai": "4.2.14",
     "@types/classnames": "^2.2.6",
     "@types/clone-deep": "^4.0.1",
     "@types/geopattern": "^1.2.3",
     "@types/graphql": "^14.0.4",
-    "@types/jest": "^24.0.22",
+    "@types/jest": "^24.9.1",
     "@types/jquery": "^3.3.31",
     "@types/mixpanel-browser": "^2.23.1",
+    "@types/mocha": "8.0.4",
     "@types/moment-timezone": "^0.5.12",
     "@types/node": "^12.6.8",
     "@types/object-hash": "^1.2.0",
@@ -180,16 +182,18 @@
     "@types/react-toggle": "^4.0.2",
     "@types/react-transition-group": "^2.0.15",
     "@types/storybook__react": "^4.0.1",
+    "@types/uuid": "3.4.9",
     "@types/web3": "1.2.2",
     "@types/webpack-env": "^1.13.0",
     "@typescript-eslint/eslint-plugin": "^2.3.0",
     "@typescript-eslint/parser": "^2.3.0",
-    "@wdio/cli": "^5.11.6",
-    "@wdio/dot-reporter": "^5.7.8",
-    "@wdio/local-runner": "^5.11.6",
-    "@wdio/mocha-framework": "^5.7.14",
-    "@wdio/selenium-standalone-service": "^5.7.8",
-    "@wdio/spec-reporter": "^5.11.6",
+    "@wdio/cli": "6.9.0",
+    "@wdio/dot-reporter": "6.8.1",
+    "@wdio/local-runner": "6.9.0",
+    "@wdio/mocha-framework": "6.8.0",
+    "@wdio/selenium-standalone-service": "6.9.0",
+    "@wdio/spec-reporter": "6.8.1",
+    "@wdio/sync": "6.9.0",
     "awesome-typescript-loader": "^5.2.1",
     "axios-mock-adapter": "^1.16.0",
     "babel-loader": "^8.0.6",
@@ -217,9 +221,10 @@
     "style-loader": "^0.23.1",
     "terser-webpack-plugin": "^2.3.1",
     "ts-jest": "^24.1.0",
-    "typescript": "^3.6.3",
+    "typescript": "^3.9.7",
     "typings-for-css-modules-loader": "^1.7.0",
     "uglifyjs-webpack-plugin": "^2.2.0",
+    "uuid": "3.4.0",
     "webdriverio": "6.8.0",
     "webpack": "4.43.0",
     "webpack-bundle-analyzer": "^3.6.1",

Diff for: package.json

@@ -1,13 +1,4 @@
-const chai = require("chai");
-
-global.expect = chai.expect;
-chai.Should();
-
 describe("All DAOs", () => {
-  before(() => {
-    chai.Should();
-  });
-
   it("Works", async () => {
     await browser.url("http://127.0.0.1:3000/daos");
     const title = await browser.getTitle();

Diff for: test/integration/daos.ts renamed to test/integration/daos.e2e.ts

@@ -1,15 +1,6 @@
 import { hideCookieAcceptWindow } from "./utils";
 
-const chai = require("chai");
-
-global.expect = chai.expect;
-chai.Should();
-
 describe("Home page feed", () => {
-  before(async () => {
-    chai.Should();
-  });
-
   it("Displays message and all DAOs when not logged in ", async () => {
     await browser.url("http://127.0.0.1:3000/feed");
     const title = await browser.getTitle();

Diff for: test/integration/feed.ts renamed to test/integration/feed.e2e.ts

@@ -1,12 +1,10 @@
-import * as chai from "chai";
 import { getContractAddresses, userAddresses } from "./utils";
 
 describe("Members page", () => {
-  let addresses: string[];
+  let addresses;
   let daoAddress: string;
 
   before(async () => {
-    chai.Should();
     addresses = getContractAddresses();
     daoAddress = addresses.dao.Avatar.toLowerCase();
   });

Diff for: test/integration/history.ts renamed to test/integration/history.e2e.ts

@@ -1,13 +1,11 @@
-import * as chai from "chai";
 import { getContractAddresses, userAddresses } from "./utils";
 
 describe("Profile page", () => {
   let addresses;
-  let daoAddress;
+  let daoAddress: string;
   const userAddress = userAddresses[0];
 
   before(async () => {
-    chai.Should();
     addresses = getContractAddresses();
     daoAddress = addresses.dao.Avatar.toLowerCase();
   });

Diff for: test/integration/members.ts renamed to test/integration/members.e2e.ts

@@ -1,8 +1,5 @@
-import * as chai from "chai";
 import { getContractAddresses, hideCookieAcceptWindow } from "./utils";
 
-chai.should();
-
 describe("Header redemptions button", () => {
   it("shouldn't be there if the user isn't logged in", async () => {
     await browser.url("http://127.0.0.1:3000");
@@ -36,7 +33,7 @@ describe("Header redemptions button", () => {
       // though we're already logged in.
       const connectButton = await $("[data-test-id=\"connectButton\"]");
       await connectButton.click();
-      await connectButton.waitForDisplayed(undefined, true);
+      await connectButton.waitForDisplayed(undefined);
 
       const redemptionsButton = await $("[data-test-id=\"redemptionsButton\"]");
       await redemptionsButton.click();
@@ -49,7 +46,7 @@ describe("Header redemptions button", () => {
 });
 
 describe("Redemptions page", () => {
-  let testAddresses;
+  let testAddresses: any;
 
   before(() => {
     testAddresses = getContractAddresses();

Diff for: test/integration/profile.ts renamed to test/integration/profile.e2e.ts

@@ -2,21 +2,32 @@
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
     "lib": ["es2015.promise", "es2016", "es2017", "dom", "esnext.asynciterable"],
-    "module":"commonjs",
+    "module": "commonjs",
     "moduleResolution": "node",
-    "declaration": true,
-    "declarationDir": "../dist/types",
+    "declaration": false,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "resolveJsonModule": true,
-    "sourceMap": true,
+    "sourceMap": false,
     "strict": true,
-    "target": "es5",
-    "typeRoots": [
-      "../node_modules/@types"
+    "target": "es6",
+    "outDir": "./.dist/",
+    "noImplicitAny": true,
+    "strictPropertyInitialization": true,
+    "strictNullChecks": true,
+
+    "types": [
+      "node",
+      "@wdio/mocha-framework",
+      "@wdio/sync",
+      "@types/chai",
+      "@types/mocha"
     ]
   },
   "include": [
-    "."
+    "./*.ts"
+  ],
+  "exclude": [
+    "./*.js"
   ]
 }

Diff for: test/integration/proposal-competition.ts renamed to test/integration/proposal-competition.e2e.ts

@@ -10,11 +10,6 @@ const settings = {
   txSenderServiceUrl: "https://tx-sender-service.herokuapp.com/send-tx",
 };
 
-const chai = require("chai");
-
-global.expect = chai.expect;
-chai.Should();
-
 export const LATEST_ARC_VERSION = "0.0.1-rc.19";
 // because we do not have a "real" dutchX test, we'll just choose one (older) version
 // not thtat the correct address (migration.private.base[VERSION_FOR_DUTCHX_TEST]. GEenericScheme)
@@ -66,7 +61,7 @@ export function getArc() {
  */
 export async function hideCookieAcceptWindow(): Promise<void> {
   const acceptCookiesButton = await $("*[data-test-id=\"acceptCookiesButton\"]");
-  if (!acceptCookiesButton.error && await acceptCookiesButton.isDisplayedInViewport()) {
+  if (!(acceptCookiesButton as any).error && await (acceptCookiesButton as any).isDisplayedInViewport()) {
     await acceptCookiesButton.click();
   }
 }