Skip to content

Commit

Permalink
Merge pull request #1317 from fecgov/release/sprint-29
Browse files Browse the repository at this point in the history
Release/sprint 29
  • Loading branch information
mjtravers authored Aug 29, 2023
2 parents 7393805 + f9abf2c commit 7abbc81
Show file tree
Hide file tree
Showing 136 changed files with 6,682 additions and 3,517 deletions.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,20 @@ jobs:
rm -rf /tmp/cypress
mkdir -p /tmp/cypress/results
mkdir -p /tmp/cypress/lighthouse
mkdir -p /tmp/cypress/videos
docker cp fecfile-web-app-e2e:/root/fecfile-web-app/front-end/cypress/results/. /tmp/cypress/results
docker cp fecfile-web-app-e2e:/root/fecfile-web-app/front-end/cypress/lighthouse/. /tmp/cypress/lighthouse
docker cp fecfile-web-app-e2e:/root/fecfile-web-app/front-end/cypress/videos/. /tmp/cypress/videos
docker rm fecfile-web-app-e2e
- store_artifacts:
path: /tmp/cypress/results
destination: cypress/results
- store_artifacts:
path: /tmp/cypress/lighthouse
destination: cypress/lighthouse
- store_artifacts:
path: /tmp/cypress/videos
destination: cypress/videos
deploy:
docker:
- image: cimg/node:16.15-browsers
Expand Down
8 changes: 4 additions & 4 deletions front-end/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as fs from 'fs';
export default defineConfig({
defaultCommandTimeout: 10000,
projectId: 'x5egpz',
video: false,
video: true,
videosFolder: 'cypress/videos',
screenshotsFolder: 'cypress/screenshots',
screenshotOnRunFailure: true,
Expand All @@ -16,10 +16,10 @@ export default defineConfig({
reporter: 'mochawesome',
reporterOptions: {
reportDir: 'cypress/results',
reportFilename: "[status]_[datetime]-[name]",
reportFilename: '[status]_[datetime]-[name]',
overwrite: false,
html: true,
json: false
json: false,
},
lighthouse: {
options: ['--chrome-flags="--no-sandbox --headless --disable-gpu"'],
Expand All @@ -46,6 +46,6 @@ export default defineConfig({
});
return require('./cypress/plugins/index.ts')(on, config);
},
baseUrl: 'http://localhost:4200'
baseUrl: 'http://localhost:4200',
},
});
7 changes: 4 additions & 3 deletions front-end/cypress/e2e/reports-f3x-transactions.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ describe('Transactions', () => {
PageUtils.clickButton('Continue');

// Create memo transaction
cy.contains('a', 'Create a new contact').should('exist').wait(500); // Race condition with clicking 'Create a new contact' link being ready
cy.contains('h1', 'Partnership Attribution').should('exist');
PageUtils.clickLink('Create a new contact');
ContactListPage.enterFormData(defaultContactFormData, true);
PageUtils.clickButton('Save & continue');
Expand All @@ -172,6 +172,7 @@ describe('Transactions', () => {
PageUtils.clickButton('Continue');

// Create a second memo transaction so we can check the aggregate value
cy.contains('Transactions in this report').should('exist');
PageUtils.clickLink('Partnership Receipt');
PageUtils.dropdownSetValue('[data-test="navigation-control-dropdown"]', 'Partnership Attribution');
cy.contains('Partnership Attribution').wait(500);
Expand Down Expand Up @@ -541,7 +542,7 @@ describe('Transactions', () => {
PageUtils.clickButton('Continue');

// Create Partnership Receipt Joint Fundraising Transfer Memo
cy.contains('a', 'Create a new contact').should('exist').wait(500); // Race condition with clicking 'Create a new contact' link being ready
cy.contains('h1', 'Partnership Receipt Joint Fundraising Transfer Memo').should('exist');
PageUtils.clickLink('Create a new contact');
const organizationFormContactData = {
...defaultContactFormData,
Expand All @@ -559,7 +560,7 @@ describe('Transactions', () => {
PageUtils.clickButton('Continue');

// Create Partnership Individual Joint Fundraising Transfer Memo
cy.contains('a', 'Create a new contact').should('exist').wait(500); // Race condition with clicking 'Create a new contact' link being ready
cy.contains('h1', 'Individual Joint Fundraising Transfer Memo').should('exist');
PageUtils.clickLink('Create a new contact');
const individualFormContactData = {
...defaultContactFormData,
Expand Down
Loading

0 comments on commit 7abbc81

Please sign in to comment.