Release/sprint 57 -> test

.circleci/config.yml

@@ -125,7 +125,7 @@ jobs:
             DB_DOCKERFILE="Dockerfile-e2e" WORKER_DOCKERFILE="Worker_Dockerfile-e2e" API_DOCKERFILE="Dockerfile-e2e" FECFILE_TEST_DB_NAME="postgres"  DJANGO_SECRET_KEY=${E2E_DJANGO_SECRET_KEY} DATABASE_URL=${E2E_DATABASE_URL} FEC_API=${E2E_FEC_API} FEC_API_KEY=${E2E_FEC_API_KEY} MOCK_EFO="True" docker-compose up --build -d
             docker container run --network container:fecfile-api-proxy \
               docker.io/jwilder/dockerize \
-              -wait http://localhost:8080/api/v1/status/ \
+              -wait http://localhost:8080/devops/status/ \
               -wait-retry-interval 2s \
               -timeout 60s; \
           working_directory: ~/project/fecfile-web-api
@@ -172,7 +172,7 @@ jobs:
           command: |
             mkdir -p $HOME/bin
             export PATH=$HOME/bin:$PATH
-            curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary&version=7.3.0" | tar xzv -C $HOME/bin
+            curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary&version=7.8.0" | tar xzv -C $HOME/bin
 
       - run:
           name: run deploy script

deploy-config/front-end-nginx-config/nginx.conf

@@ -22,6 +22,7 @@ http {
     index index.html index.htm Default.htm;
     location = /index.html {
       add_header Cache-Control no-cache;
+      add_header Access-Control-Allow-Origin null;
       add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'nonce-$request_id'; style-src 'self' 'nonce-$request_id'; connect-src 'self' https://dev-api.fecfile.fec.gov https://stage-api.fecfile.fec.gov https://test-api.fecfile.fec.gov https://api.fecfile.fec.gov; frame-ancestors 'none'; object-src 'none'";
 
       sub_filter_once off;
@@ -30,6 +31,7 @@ http {
     }
     location / {
       try_files $uri $uri/ /index.html;
+      add_header Access-Control-Allow-Origin null;
     }
   }
 }

front-end/cypress/e2e/F3X/receipts.cy.ts

@@ -558,4 +558,59 @@ describe('Receipt Transactions', () => {
     );
     PageUtils.clickButton('Cancel');
   });
+
+  it('calculates the aggregate amount within a transaction form', () => {
+    F3XSetup();
+
+    // Create the first Individual Receipt
+    StartTransaction.Receipts().Individual().IndividualReceipt();
+
+    PageUtils.clickLink('Create a new contact');
+    const individualFormContactData = {
+      ...defaultContactFormData,
+      ...{ contact_type: 'Individual' },
+    };
+    ContactListPage.enterFormData(individualFormContactData, true);
+    PageUtils.clickButton('Save & continue');
+
+    const transactionOneData = {
+      ...formTransactionDataForSchedule,
+      ...{
+        purpose_description: '',
+        category_code: '',
+        date_received: new Date(currentYear, 3, 27),
+      },
+    };
+    TransactionDetailPage.enterScheduleFormData(transactionOneData, false, '', true, 'contribution_date');
+    PageUtils.clickButton('Save');
+    cy.contains('Confirm').should('exist');
+    PageUtils.clickButton('Continue', '', true);
+
+    cy.contains('Transactions in this report').should('exist');
+
+    // Create the second Individual Receipt
+    StartTransaction.Receipts().Individual().IndividualReceipt();
+    cy.get('[id="searchBox"]').type(defaultContactFormData['last_name'].slice(0, 1));
+    cy.contains(defaultContactFormData['last_name']).should('exist');
+    cy.contains(defaultContactFormData['last_name']).click({ force: true });
+
+    const transactionTwoData = {
+      ...formTransactionDataForSchedule,
+      ...{
+        purpose_description: '',
+        category_code: '',
+        date_received: new Date(currentYear, 3, 28),
+        amount: 25,
+      },
+    };
+    TransactionDetailPage.enterScheduleFormData(transactionTwoData, false, '', true, 'contribution_date');
+    cy.get('h1').click(); // clicking outside of fields to ensure that the amount field loses focus and updates
+
+    cy.get('[id=aggregate]').should('have.value', '$225.01');
+
+    TransactionDetailPage.enterDate('[data-cy="contribution_date"]', new Date(currentYear, 3, 26), '');
+    cy.get('h1').click(); // clicking outside of fields to ensure that the amount field loses focus and updates
+
+    cy.get('[id=aggregate]').should('have.value', '$25.00');
+  });
 });