Merge pull request #2130 from fecgov/release/sprint-46

Release/sprint 46
fecgov · Aug 20, 2024 · 8d5d15d · 8d5d15d
2 parents f91d542 + 4ef3614
commit 8d5d15d
Show file tree

Hide file tree

Showing 123 changed files with 3,173 additions and 1,493 deletions.
diff --git a/front-end/cypress/e2e/F3X/reattributions.cy.ts b/front-end/cypress/e2e/F3X/reattributions.cy.ts
@@ -96,7 +96,7 @@ describe('Reattributions', () => {
     CreateReceipt();
     ReportListPage.createF3X(reportFormDataJuly);
     ReportListPage.submitReport(APRIL_15);
-    ReportListPage.editReport(APRIL_15, 'Review report');
+    ReportListPage.editReport(APRIL_15, 'Review');
     PageUtils.clickSidebarSection('REVIEW TRANSACTIONS');
     cy.wait(500);
     Reattribute(true);

diff --git a/front-end/cypress/e2e/F3X/redesignations.cy.ts b/front-end/cypress/e2e/F3X/redesignations.cy.ts
@@ -79,7 +79,7 @@ describe('Redesignations', () => {
     CreateContribution();
     ReportListPage.createF3X(reportFormDataJuly);
     ReportListPage.submitReport(APRIL_15);
-    ReportListPage.editReport(APRIL_15, 'Review report');
+    ReportListPage.editReport(APRIL_15, 'Review');
     PageUtils.clickSidebarSection('REVIEW TRANSACTIONS');
     cy.wait(500);
     Redesignate(true);

diff --git a/front-end/cypress/e2e/pages/f3xCashOnHandPage.ts b/front-end/cypress/e2e/pages/f3xCashOnHandPage.ts
@@ -12,7 +12,7 @@ export const defaultFormData: F3xCashOnHandFormData = {
 
 export class F3xCashOnHandPage {
   static enterFormData(formData: F3xCashOnHandFormData) {
-    cy.get('p-inputnumber[formcontrolname="L6a_cash_on_hand_jan_1_ytd"]').safeType(formData['cashOnHand']);
+    cy.get('app-input-number[formcontrolname="L6a_cash_on_hand_jan_1_ytd"]').safeType(formData['cashOnHand']);
     PageUtils.calendarSetValue('p-calendar[formcontrolname="cash_on_hand_date"]', formData['date']);
   }
 }
diff --git a/front-end/cypress/e2e/pages/reportListPage.ts b/front-end/cypress/e2e/pages/reportListPage.ts
@@ -74,7 +74,7 @@ export class ReportListPage {
     cy.get('[data-cy="start-report"]').click();
   }
 
-  static editReport(reportName: string, fieldName = 'Edit report') {
+  static editReport(reportName: string, fieldName = 'Edit') {
     ReportListPage.goToPage();
     cy.wait(500);
     PageUtils.getKabob(reportName).contains(fieldName).first().click({ force: true });

diff --git a/front-end/cypress/e2e/pages/transactionDetailPage.ts b/front-end/cypress/e2e/pages/transactionDetailPage.ts
@@ -110,12 +110,16 @@ export class TransactionDetailPage {
     alias = PageUtils.getAlias(alias);
     cy.get(alias).find('#amount').safeType(formData.amount);
 
-    if (formData.date_incurred) {
-      this.enterDate('p-calendar[inputid="date_incurred"]', formData.date_incurred, alias);
+    // set interest dropdown and rate
+    if (formData.interest_rate_setting) {
+      PageUtils.dropdownSetValue('[inputid="interest_rate_setting"]', formData.interest_rate_setting, alias);
+      if (formData.interest_rate) {
+        cy.get(alias).find('#interest_rate').safeType(formData.interest_rate);
+      }
     }
 
-    if (formData.date_received) {
-      this.enterDate('p-calendar[inputid="date"]', formData.date_received, alias);
+    if (formData.secured) {
+      cy.get(alias).find('input[name="secured"]').first().click({ force: true });
     }
 
     // Set due date dropdown & date
@@ -126,16 +130,12 @@ export class TransactionDetailPage {
       }
     }
 
-    // set interest dropdown and rate
-    if (formData.interest_rate_setting) {
-      PageUtils.dropdownSetValue('[inputid="interest_rate_setting"]', formData.interest_rate_setting, alias);
-      if (formData.interest_rate) {
-        cy.get(alias).find('#interest_rate').safeType(formData.interest_rate);
-      }
+    if (formData.date_incurred) {
+      this.enterDate('p-calendar[inputid="date_incurred"]', formData.date_incurred, alias);
     }
 
-    if (formData.secured) {
-      cy.get(alias).find('input[name="secured"]').first().click({ force: true });
+    if (formData.date_received) {
+      this.enterDate('p-calendar[inputid="date"]', formData.date_received, alias);
     }
 
     this.enterCommon(formData, alias);