test: Fix frontend CI (#752)

pingcap · Nov 26, 2020 · b3b056d · b3b056d
1 parent 434f919
commit b3b056d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -46,23 +46,27 @@ jobs:
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
           source /home/runner/.profile
-          tiup update --nightly
-          tiup playground nightly --tiflash=0 &
+          tiup update playground
+          source /home/runner/.profile
+          tiup playground v4.0.6 --tiflash=0 &
       - name: Build UI
         run: |
           make ui
         env:
           NO_MINIMIZE: true
           CI: true
           REACT_APP_MIXPANEL_TOKEN: ""
+      - name: Wait TiUP Playground
+        run: |
+          chmod u+x scripts/wait_tiup_playground.sh
+          scripts/wait_tiup_playground.sh 15 20
       - name: Debug TiUP
         run: |
           source /home/runner/.profile
           tiup --version
           ls /home/runner/.tiup/components/playground/
           DATA_PATH=$(ls /home/runner/.tiup/data/)
           echo $DATA_PATH
-          tiup playground display
           echo "==== TiDB Log ===="
           head -n 3 /home/runner/.tiup/data/$DATA_PATH/tidb-0/tidb.log
           echo "==== TiKV Log ===="

diff --git a/scripts/wait_tiup_playground.sh b/scripts/wait_tiup_playground.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Wait unitl `tiup playground` command runs success
+
+INTERVAL=$1
+MAX_TIMES=$2
+
+if ([ -z "${INTERVAL}" ] || [ -z "${MAX_TIMES}" ]); then
+  echo "Usage: command <interval> <max_times>"
+  exit 1
+fi
+
+source /home/runner/.profile
+
+for ((i=0; i<${MAX_TIMES}; i++)); do
+  tiup playground display
+  if [ $? -eq 0 ]; then
+    exit 0
+  fi
+  sleep ${INTERVAL}
+done
+
+exit 1
diff --git a/ui/dashboardApp/layout/signin/index.tsx b/ui/dashboardApp/layout/signin/index.tsx
@@ -220,6 +220,7 @@ function TiDBSignInForm({ successRoute, onClickAlternative }) {
             <Input onInput={clearErrorMsg} prefix={<UserOutlined />} disabled />
           </Form.Item>
           <Form.Item
+            data-e2e="password"
             name="password"
             label={t('signin.form.password')}
             {...(errorMsg && {

diff --git a/ui/tests/e2e/login.test.ts b/ui/tests/e2e/login.test.ts
@@ -20,7 +20,13 @@ describe('Login', () => {
 
       await ppExpect(page).toFill('input#tidb_signin_password', 'any')
       await ppExpect(page).toClick('button#signin_btn')
-      await ppExpect(page).toMatch('TiDB authentication failed')
+
+      const failReason = await page.waitForSelector(
+        'form#tidb_signin div[data-e2e="password"] div:last-child'
+      )
+      const content = await failReason.evaluate((n) => n.innerText)
+      console.log('fail reason:', content)
+      expect(content).toContain('TiDB authentication failed')
     },
     10 * 1000
   )