bobanetwork · sk-enya · Jul 16, 2024 · May 26, 2024 · May 26, 2024 · May 29, 2024
diff --git a/.env.example b/.env.example
@@ -10,19 +10,4 @@ REACT_APP_GATEWAY_DATA_BRANCH=
 ##### WebWallet #####
 #####################
 # to disable the walletConnect set below flat to 1.
-# REACT_APP_DISABLE_WALLETCONNECT=1
-
-######################
-#### Cypress Test ####
-######################
-
-#Debuging port for cypress as 3000 will be busy to run the application.
-CYPRESS_REMOTE_DEBUGGING_PORT=9222
-#Starting network for wallet.
-NETWORK_NAME=sepolia
-#Secret phrase to connect to metamask account.
-SECRET_WORDS= 
-#Transaction hash for account to validate history page.
-CYPRESS_TEST_TX_HASH=
-# To enable the video output of cypres test
-CYPRESS_ENABLE_VIDEO=
+# REACT_APP_DISABLE_WALLETCONNECT=1
diff --git a/.github/label-requires-reviews.yml b/.github/label-requires-reviews.yml
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,28 +1,10 @@
----
 2-reviewers:
-  - '.github/**/*'
-  - './*'
+- changed-files:
+  - any-glob-to-any-file: ./**
 
-M-ci:
-  - any: ['.github/**/*']
+E2E-Test:
+- changed-files:
+  - any-glob-to-any-file: ./e2e-tests/**
 
-M-l2geth:
-  - any: ['l2geth/**/*']
-
-M-integration:
-  - any: ['integration-tests/**/*']
-
-M-batch-submitter:
-  - any: ['packages/batch-submitter/**/*']
-
-M-contracts:
-  - any: ['packages/contracts/**/*']
-
-M-core-utils:
-  - any: ['packages/core-utils/**/*']
-
-M-dtl:
-  - any: ['packages/data-transport-layer/**/*']
-
-M-ops:
-  - any: ['ops/**/*']
+release:
+- base-branch: 'master'
diff --git a/.github/pull.yml b/.github/pull.yml
diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
@@ -1,65 +1,74 @@
-name: End2End test (non-headless)
-permissions: read-all
+name: Integration Test
 
-on:
+on: 
+  push: 
+    branches: ['main', 'master']
   pull_request:
 
 jobs:
-  End-to-End-Test:
-    name: Integration Test
+  e2e-test:
+    name: Playwright Test
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Node
+        uses: actions/checkout@v4
+      - name: Setup Node 16
         uses: actions/setup-node@v4
         with:
           node-version: 16.17.0
           cache: 'yarn'
-      - name: Setup Cache Node Modules, Cypress
-        id: cache-node-modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            /home/runner/.cache/Cypress
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-      # Install NPM dependencies, cache them correctly
-      # and run all Cypress tests
-      - name: Install dependencies
-        run: yarn
-      - uses: actions/cache/save@v3
-        if: ${{steps.cache-node-modules.outputs.cache-hit != 'true'}}
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-      - name: Install linux deps
+      - name: Install linux deps (xvfb / fluxbox)
         run: |
           sudo apt-get install --no-install-recommends -y \
           fluxbox \
           xvfb
-      - name: Run E2E Test (non-headless)
+      - name: Install yarn dependencies
+        run: yarn
+      - name: Build Gateway Project
         working-directory: ./
         run: |
-          Xvfb :0 -screen 0 1024x768x24 -listen tcp -ac &
-          fluxbox & yarn test:integration
+          yarn && yarn build:prod
         env:
           REACT_APP_POLL_INTERVAL: 15000
+          REACT_APP_GAS_POLL_INTERVAL: 30000
           SKIP_PREFLIGHT_CHECK: true
-          REACT_APP_WALLET_VERSION: 0.14.8
-          REACT_APP_ENV: prod
-          REACT_APP_STATUS: normal
-          CYPRESS_REMOTE_DEBUGGING_PORT: 9222
-          NETWORK_NAME: 'sepolia'
+          REACT_APP_WALLET_VERSION: 0.14.9
+          REACT_APP_ENV: local
+          REACT_APP_ENABLE_ANCHORAGE: true
+          REACT_APP_WC_PROJECT_ID: ${{secrets.WC_PROJECT_ID}}
+          REACT_APP_GA4_MEASUREMENT_ID: ${{secrets.GA4_MEASUREMENT_ID}}
+          REACT_APP_SENTRY_DSN: ${{secrets.SENTRY_DSN}}
+      - name: Setup Node 18
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: Install PNPM deps e2e-tests
+        working-directory: ./e2e-tests
+        run: |
+          npm install -g pnpm && pnpm install --frozen-lockfile  && npx playwright install
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps chromium
+      - name: Run e2e test (headful)
+        working-directory: ./e2e-tests
+        run: |
+          Xvfb :0 -screen 0 1024x768x24 -listen tcp -ac &
+          fluxbox &
+          pnpm start:server & 
+          pnpm test
+        env:
+          PASSWORD: ${{secrets.PASSWORD}}
+          NETWORK: 'sepolia'
           SECRET_WORDS: ${{secrets.SECRET_WORDS}}
+          METAMASK_VERSION: 10.25.0
           DISPLAY: :0.0
-          CYPRESS_ENABLE_VIDEO: true
       - name: Upload Archive e2e artifacts
         uses: actions/upload-artifact@v4
-        if: always()
+        if: ${{ !cancelled() }}
         with:
-          name: e2e-archive
+          name: e2e-reports
+          retention-days: 3
           path: |
-            ./cypress/videos/
-            ./cypress/screenshots/
+            ./e2e-tests/videos/
+            ./e2e-tests/playwright-report/
+            ./e2e-tests/test-results/
         continue-on-error: true
diff --git a/.github/workflows/label-requires-reviews.yml b/.github/workflows/label-requires-reviews.yml
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -1,4 +1,3 @@
----
 name: "Pull Request Labeler"
 on:
   - pull_request_target
@@ -10,4 +9,4 @@ jobs:
       - uses: actions/labeler@main
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          configuration-path: .github/labeler.yml
+          configuration-path: ../.github/labeler.yml
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,3 @@
-/cypress/videos
-/cypress/screenshots
-
 .DS_Store
 node_modules
 results

diff --git a/buildspec.yml b/buildspec.yml
@@ -10,7 +10,7 @@ phases:
 
   build:
     commands:
-        - REACT_APP_WALLET_VERSION=$(git rev-parse --short HEAD) yarn build:prod
+        - REACT_APP_WALLET_VERSION=$(git rev-parse --short HEAD) yarn build
 
 artifacts:
   # include all files required to run the application

diff --git a/cypress.config.ts b/cypress.config.ts
diff --git a/cypress/.gitignore b/cypress/.gitignore