simplify e2e tests dealing with durationType date

ensdomains · Sep 3, 2024 · 43b68f0 · 43b68f0
1 parent bc5960b
commit 43b68f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 59 deletions.
diff --git a/e2e/specs/stateless/extendNames.spec.ts b/e2e/specs/stateless/extendNames.spec.ts
@@ -359,19 +359,10 @@ test('should be able to extend a name by a month', async ({
 
   await test.step('should set and render a date properly', async () => {
     const expiryTimestamp = await profilePage.getExpiryTimestamp()
-    const expiryTime = (await profilePage.getExpiryTimestamp()) / 1000
+    const expiryTime = expiryTimestamp / 1000
     const calendar = page.getByTestId('calendar')
     const monthLater = await page.evaluate((ts) => {
       const expiryDate = new Date(ts)
-      // Get the new month's last day
-      const getEndDayOfMonth = new Date(
-        expiryDate.getFullYear(),
-        (expiryDate.getMonth() + 2) % 12,
-        0,
-      ).getDate()
-      if (expiryDate.getDate() > getEndDayOfMonth) {
-        expiryDate.setDate(getEndDayOfMonth)
-      }
       expiryDate.setMonth(expiryDate.getMonth() + 1)
       return expiryDate
     }, expiryTimestamp)
@@ -386,7 +377,7 @@ test('should be able to extend a name by a month', async ({
     await expect(extendNamesModal.getInvoiceExtensionFee).toContainText('0.0003')
     await expect(extendNamesModal.getInvoiceTransactionFee).toContainText('0.0001')
     await expect(extendNamesModal.getInvoiceTotal).toContainText('0.0004')
-    await expect(page.getByText('1 month extension', { exact: true })).toBeVisible()
+    await expect(page.getByText(/1 month .* extension/)).toBeVisible()
   })
 
   await test.step('should extend', async () => {
@@ -518,15 +509,6 @@ test('should be able to extend a name in grace period by a month', async ({
     const calendar = page.getByTestId('calendar')
     const monthLater = await page.evaluate((ts) => {
       const expiryDate = new Date(ts)
-      // Get the new month's last day
-      const getEndDayOfMonth = new Date(
-        expiryDate.getFullYear(),
-        (expiryDate.getMonth() + 2) % 12,
-        0,
-      ).getDate()
-      if (expiryDate.getDate() > getEndDayOfMonth) {
-        expiryDate.setDate(getEndDayOfMonth)
-      }
       expiryDate.setMonth(expiryDate.getMonth() + 1)
       return expiryDate
     }, expiryTimestamp)
@@ -541,7 +523,7 @@ test('should be able to extend a name in grace period by a month', async ({
     await expect(extendNamesModal.getInvoiceExtensionFee).toContainText('0.0003')
     await expect(extendNamesModal.getInvoiceTransactionFee).toContainText('0.0001')
     await expect(extendNamesModal.getInvoiceTotal).toContainText('0.0004')
-    await expect(page.getByText('1 month extension', { exact: true })).toBeVisible()
+    await expect(page.getByText(/1 month .* extension/)).toBeVisible()
   })
 
   await test.step('should extend', async () => {

diff --git a/e2e/specs/stateless/registerName.spec.ts b/e2e/specs/stateless/registerName.spec.ts
@@ -311,15 +311,6 @@ test('should allow registering with a specific date', async ({ page, login, make
     const twoYearsAndHalfLater = await page.evaluate((timestamp) => {
       const _date = new Date(timestamp)
       _date.setFullYear(_date.getFullYear() + 2)
-      // Get the new month's last day
-      const getEndDayOfMonth = new Date(
-        _date.getFullYear(),
-        (_date.getMonth() + 7) % 12,
-        0,
-      ).getDate()
-      if (_date.getDate() > getEndDayOfMonth) {
-        _date.setDate(getEndDayOfMonth)
-      }
       _date.setMonth(_date.getMonth() + 6)
       return _date
     }, browserTime * 1000)
@@ -381,15 +372,6 @@ test('should allow registering a premium name with a specific date', async ({
     const twoYearsAndHalfLater = await page.evaluate((timestamp) => {
       const _date = new Date(timestamp)
       _date.setFullYear(_date.getFullYear() + 2)
-      // Get the new month's last day
-      const getEndDayOfMonth = new Date(
-        _date.getFullYear(),
-        (_date.getMonth() + 7) % 12,
-        0,
-      ).getDate()
-      if (_date.getDate() > getEndDayOfMonth) {
-        _date.setDate(getEndDayOfMonth)
-      }
       _date.setMonth(_date.getMonth() + 6)
       return _date
     }, browserTime * 1000)
@@ -460,15 +442,6 @@ test('should allow registering a premium name for two months', async ({
   await test.step('should set a date', async () => {
     const twoMonthsLater = await page.evaluate((timestamp) => {
       const _date = new Date(timestamp)
-      // Get the new month's last day
-      const getEndDayOfMonth = new Date(
-        _date.getFullYear(),
-        (_date.getMonth() + 3) % 12,
-        0,
-      ).getDate()
-      if (_date.getDate() > getEndDayOfMonth) {
-        _date.setDate(getEndDayOfMonth)
-      }
       _date.setMonth(_date.getMonth() + 2)
       return _date
     }, browserTime * 1000)
@@ -477,7 +450,7 @@ test('should allow registering a premium name for two months', async ({
 
     await expect(page.getByTestId('calendar-date')).toHaveValue(dateToDateInput(twoMonthsLater))
 
-    expect(page.getByText('2 months registration', { exact: true })).toBeVisible()
+    expect(page.getByText(/2 months .* registration/)).toBeVisible()
   })
 
   await page.getByTestId('payment-choice-ethereum').click()
@@ -620,23 +593,14 @@ test('should allow normal registration for a month', async ({
   await test.step('should set a date', async () => {
     const oneMonthLater = await page.evaluate((timestamp) => {
       const _date = new Date(timestamp)
-      // Get the new month's last day
-      const getEndDayOfMonth = new Date(
-        _date.getFullYear(),
-        (_date.getMonth() + 2) % 12,
-        0,
-      ).getDate()
-      if (_date.getDate() > getEndDayOfMonth) {
-        _date.setDate(getEndDayOfMonth)
-      }
       _date.setMonth(_date.getMonth() + 1)
       return _date
     }, browserTime * 1000)
 
     await calendar.fill(dateToDateInput(oneMonthLater))
 
     await expect(page.getByTestId('calendar-date')).toHaveValue(dateToDateInput(oneMonthLater))
-    await expect(page.getByText('1 month registration', { exact: true })).toBeVisible()
+    await expect(page.getByText(/1 month .* registration/)).toBeVisible()
   })
 
   // should have payment choice ethereum checked and show primary name setting as checked