From 9d440432a021c73b675ab0907c16bc792a4ed97f Mon Sep 17 00:00:00 2001
From: Dylan Jeffers <dylan@audius.co>
Date: Fri, 13 Oct 2023 17:14:13 -0700
Subject: [PATCH] [C-3185] Fix web e2e tests (#6328)

---
 packages/probers/cypress/e2e/signIn.cy.ts     |  5 +-
 packages/probers/cypress/e2e/signUp.cy.ts     |  2 +-
 .../probers/cypress/e2e/smoke/upload.cy.ts    |  2 +-
 packages/probers/cypress/e2e/uilts.ts         |  6 +--
 .../probers/cypress/e2e/uploadTrack.cy.ts     | 52 ++++++++-----------
 .../web/src/pages/sign-in-page/SignInPage.tsx |  8 +--
 .../pages/sign-up-page/pages/SignUpPage.tsx   | 34 +++++++-----
 .../pages/upload-page/pages/FinishPage.tsx    |  2 +-
 8 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/packages/probers/cypress/e2e/signIn.cy.ts b/packages/probers/cypress/e2e/signIn.cy.ts
index 99dce66a1de..509e2ccd5bf 100644
--- a/packages/probers/cypress/e2e/signIn.cy.ts
+++ b/packages/probers/cypress/e2e/signIn.cy.ts
@@ -23,9 +23,10 @@ describe('Sign In', () => {
     assertOnSignInPage()
   })
 
-  it('can navigate to sign-in from sign-up', () => {
+  it.only('can navigate to sign-in from sign-up', () => {
     cy.visit('signup')
-    cy.findByRole('button', { name: /have an account\? sign in/i }).click()
+    cy.findByText(/already have an account?/i)
+    cy.findByRole('link', { name: /Sign In/ }).click()
     assertOnSignInPage()
   })
 
diff --git a/packages/probers/cypress/e2e/signUp.cy.ts b/packages/probers/cypress/e2e/signUp.cy.ts
index a1e38a39184..f7a4a40f57b 100644
--- a/packages/probers/cypress/e2e/signUp.cy.ts
+++ b/packages/probers/cypress/e2e/signUp.cy.ts
@@ -54,7 +54,7 @@ describe('Sign Up', () => {
       assertOnSignUpPage()
     })
 
-    it('can navigate to sign-up from sign-in', () => {
+    it.only('can navigate to sign-up from sign-in', () => {
       cy.visit('signin')
       cy.findByRole('link', { name: /create an account/i }).click()
 
diff --git a/packages/probers/cypress/e2e/smoke/upload.cy.ts b/packages/probers/cypress/e2e/smoke/upload.cy.ts
index 3c740184f44..dd76364932e 100644
--- a/packages/probers/cypress/e2e/smoke/upload.cy.ts
+++ b/packages/probers/cypress/e2e/smoke/upload.cy.ts
@@ -13,7 +13,7 @@ describe('Smoke test -- upload page', () => {
 
     cy.visit('upload')
 
-    cy.findByRole('heading', { name: /upload tracks/i, level: 1 }).should(
+    cy.findByRole('heading', { name: /upload your music/i, level: 1 }).should(
       'exist'
     )
   })
diff --git a/packages/probers/cypress/e2e/uilts.ts b/packages/probers/cypress/e2e/uilts.ts
index acbee2faf6e..0d3433de167 100644
--- a/packages/probers/cypress/e2e/uilts.ts
+++ b/packages/probers/cypress/e2e/uilts.ts
@@ -14,9 +14,9 @@ export const waitForTransaction = (transactionNumber: number) => {
 }
 
 const waitForBlockConfirmation = (routeAlias, retries = 3) => {
-  cy.wait(routeAlias).then((xhr) => {
-    const { block_found, block_passed } = xhr.response.body.data
-    if (block_found && block_passed) {
+  cy.wait(routeAlias, { timeout: 10000 }).then((xhr) => {
+    const { block_passed } = xhr.response.body.data
+    if (block_passed) {
     } else if (retries > 0) waitForBlockConfirmation(routeAlias, retries - 1)
     // wait for the next response
     else throw new Error('All requests returned non-200 response')
diff --git a/packages/probers/cypress/e2e/uploadTrack.cy.ts b/packages/probers/cypress/e2e/uploadTrack.cy.ts
index ab5a1c8c312..47957cbe03f 100644
--- a/packages/probers/cypress/e2e/uploadTrack.cy.ts
+++ b/packages/probers/cypress/e2e/uploadTrack.cy.ts
@@ -163,35 +163,29 @@ describe('Upload', () => {
         '0'
       )
 
-      cy.waitUntil(() => {
-        return cy
-          .findByRole('progressbar', { name: /upload in progress/i })
-          .then((progressbar) => {
-            return Number(progressbar.attr('aria-valuenow')) > 0
-          })
-      })
-
-      cy.waitUntil(
-        () => {
-          return cy
-            .findByRole('progressbar', { name: /upload in progress/i })
-            .then((progressbar) => {
-              return Number(progressbar.attr('aria-valuenow')) > 50
-            })
-        },
-        { timeout: 40000, interval: 1000 }
-      )
-
-      cy.waitUntil(
-        () => {
-          return cy
-            .findByRole('progressbar', { name: /upload in progress/i })
-            .then((progressbar) => {
-              return Number(progressbar.attr('aria-valuenow')) === 100
-            })
-        },
-        { timeout: 40000, interval: 1000 }
-      )
+      const assertProgress = (progress: number) => {
+        cy.waitUntil(
+          () => {
+            return cy
+              .findByRole('progressbar', { name: /upload in progress/i })
+              .then((progressbar) => {
+                return Number(progressbar.attr('aria-valuenow')) > progress
+              })
+          },
+          { timeout: 100000, interval: 5000 }
+        )
+      }
+
+      assertProgress(0)
+      assertProgress(10)
+      assertProgress(20)
+      assertProgress(30)
+      assertProgress(40)
+      assertProgress(50)
+      assertProgress(60)
+      assertProgress(70)
+      assertProgress(80)
+      assertProgress(90)
     })
 
     cy.findByText(/finalizing upload/i).should('exist')
diff --git a/packages/web/src/pages/sign-in-page/SignInPage.tsx b/packages/web/src/pages/sign-in-page/SignInPage.tsx
index 9b5afdd9758..6162250fec6 100644
--- a/packages/web/src/pages/sign-in-page/SignInPage.tsx
+++ b/packages/web/src/pages/sign-in-page/SignInPage.tsx
@@ -1,6 +1,7 @@
 import { useCallback } from 'react'
 
-import { Button, ButtonType } from '@audius/harmony'
+import { Button } from '@audius/harmony'
+import { Button as ButtonTmp } from '@audius/stems'
 import { Form, Formik } from 'formik'
 import { useDispatch } from 'react-redux'
 import { Link } from 'react-router-dom'
@@ -47,12 +48,11 @@ export const SignInPage = () => {
           <Button text={messages.signIn} type='submit' />
         </Form>
       </Formik>
-      <Button
+      <ButtonTmp
         // @ts-ignore
         as={Link}
         to={SIGN_UP_PAGE}
-        variant={ButtonType.SECONDARY}
-        title={messages.createAccount}
+        text={messages.createAccount}
       />
     </div>
   )
diff --git a/packages/web/src/pages/sign-up-page/pages/SignUpPage.tsx b/packages/web/src/pages/sign-up-page/pages/SignUpPage.tsx
index dc4c8e472f7..c4eaf05e280 100644
--- a/packages/web/src/pages/sign-up-page/pages/SignUpPage.tsx
+++ b/packages/web/src/pages/sign-up-page/pages/SignUpPage.tsx
@@ -1,16 +1,20 @@
 import { useCallback } from 'react'
 
-import { Button, ButtonType } from '@audius/harmony'
+import { Button, ButtonType, Text } from '@audius/harmony'
 import { Form, Formik } from 'formik'
 
 import { TextField } from 'components/form-fields'
+import { Link } from 'components/link'
+import { SIGN_IN_PAGE } from 'utils/route'
 
 import { CreatePasswordState } from './CreatePasswordPage'
 
 const messages = {
   header: 'Sign Up For Audius',
   emailLabel: 'Email',
-  signUp: 'Sign Up Free'
+  signUp: 'Sign Up Free',
+  haveAccount: 'Already have an account?',
+  signIn: 'Sign In'
 }
 
 export type SignUpState = {
@@ -42,16 +46,20 @@ export const SignUpPage = (props: SignUpPageProps) => {
   )
 
   return (
-    <Formik initialValues={initialValues} onSubmit={handleSubmit}>
-      <Form>
-        <h1>{messages.header}</h1>
-        <TextField name='email' label={messages.emailLabel} />
-        <Button
-          variant={ButtonType.PRIMARY}
-          text={messages.signUp}
-          type='submit'
-        />
-      </Form>
-    </Formik>
+    <>
+      <Formik initialValues={initialValues} onSubmit={handleSubmit}>
+        <Form>
+          <h1>{messages.header}</h1>
+          <TextField name='email' label={messages.emailLabel} />
+          <Button
+            variant={ButtonType.PRIMARY}
+            text={messages.signUp}
+            type='submit'
+          />
+        </Form>
+      </Formik>
+      <Text>{messages.haveAccount}</Text>
+      <Link to={SIGN_IN_PAGE}>{messages.signIn}</Link>
+    </>
   )
 }
diff --git a/packages/web/src/pages/upload-page/pages/FinishPage.tsx b/packages/web/src/pages/upload-page/pages/FinishPage.tsx
index 6c7161ad354..dc81bd17424 100644
--- a/packages/web/src/pages/upload-page/pages/FinishPage.tsx
+++ b/packages/web/src/pages/upload-page/pages/FinishPage.tsx
@@ -202,7 +202,7 @@ export const FinishPage = (props: FinishPageProps) => {
                 : messages.uploadInProgress}
             </Text>
             <div className={styles.headerProgressInfo}>
-              <Text variant='label' size='small'>
+              <Text variant='label' as='p' size='small'>
                 {uploadComplete
                   ? '100%'
                   : fullUploadPercent === 100 && !uploadComplete