Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/sprint 17 #758

Merged
merged 164 commits into from
Dec 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
13babcd
The front end reads in memo_text and saves memo_text as a separate re…
Elaine-Krauss-TCG Oct 28, 2022
b81cd91
Polishes memo text and updates unit tests
Elaine-Krauss-TCG Oct 31, 2022
584a4c8
Corrects linting error
Elaine-Krauss-TCG Oct 31, 2022
f160285
Returns to any type because it's the only thing that will compile...
Elaine-Krauss-TCG Oct 31, 2022
26fb6ab
Updates unit tests for better code coverage
Elaine-Krauss-TCG Oct 31, 2022
a4034b6
Updates unit tests for better code coverage
Elaine-Krauss-TCG Oct 31, 2022
943dfe0
Merges in develop
Elaine-Krauss-TCG Nov 1, 2022
2e4d0b2
Updates placeholder values for a couple fields
Elaine-Krauss-TCG Nov 1, 2022
0725fc3
Updates transaction_id to transaction_uuid on the memo_text model for…
Elaine-Krauss-TCG Nov 1, 2022
c669916
No longer always submits a memo_text value
Elaine-Krauss-TCG Nov 2, 2022
9e2ccb7
filter report level memo
toddlees Nov 2, 2022
e943dc6
No longer determines Report Level Memos with hardcoded values
Elaine-Krauss-TCG Nov 2, 2022
96b19ee
Improves unit test coverage
Elaine-Krauss-TCG Nov 3, 2022
e5bb267
Adds a new unit test
Elaine-Krauss-TCG Nov 3, 2022
dbb0b8c
Expands unit test coverage
Elaine-Krauss-TCG Nov 3, 2022
3a04084
Expands unit test coverage
Elaine-Krauss-TCG Nov 3, 2022
23c2d9b
Removes an unused import
Elaine-Krauss-TCG Nov 3, 2022
d7b9fc9
PAC_RECOUNT_RECEIPT
toddlees Nov 4, 2022
9f98303
add pac recount receipt to transaction type utils
toddlees Nov 4, 2022
797b562
consolidate and improve constant memo_code
toddlees Nov 4, 2022
8cf39b4
Restores pre-existing tests to working condition
Elaine-Krauss-TCG Nov 4, 2022
394c0cd
Fixed compile time bug and form submit bug
mjtravers Nov 4, 2022
36b3579
remove back_reference_sched_name from transactions that shoudn't have it
toddlees Nov 4, 2022
58cf321
Fixes pre-existing tests and adds the Transfer receipt
Elaine-Krauss-TCG Nov 4, 2022
29dca22
Revert "Restores pre-existing tests to working condition"
Elaine-Krauss-TCG Nov 4, 2022
f4ec670
Updates validator hash
Elaine-Krauss-TCG Nov 4, 2022
6f427f6
Adds PAC Receipts and Party Receipts
Elaine-Krauss-TCG Nov 4, 2022
8f5e127
Updates package-lock
Elaine-Krauss-TCG Nov 4, 2022
6a983d2
Updates validator hash
Elaine-Krauss-TCG Nov 4, 2022
a60545c
handle memo code for ag group
toddlees Nov 4, 2022
330d0c6
Merge pull request #671 from fecgov/feature/530-pac-recount-receipt
mjtravers Nov 4, 2022
e0c7f8e
Corrected compile-time warning in group F template
mjtravers Nov 4, 2022
987fe87
WIP Adds 3 new memos
Elaine-Krauss-TCG Nov 4, 2022
13d4155
Disabled esling warning for any declaration
mjtravers Nov 4, 2022
c9420a3
Updates validator commit hash
Elaine-Krauss-TCG Nov 7, 2022
8ac3f54
Updates validator commit hash
Elaine-Krauss-TCG Nov 7, 2022
1d29459
Merge branch 'develop' into feature/662-e2e-sprint-16
Elaine-Krauss-TCG Nov 7, 2022
cb270b8
520 initial dev/local testing
dheitzer Nov 7, 2022
4d2a835
520 fixed package.json
dheitzer Nov 7, 2022
4a4c4dd
520 fix test
dheitzer Nov 7, 2022
5864b60
520 regen validate docs
dheitzer Nov 7, 2022
9e63286
TRIBAL_RECOUNT_RECEIPT
toddlees Nov 7, 2022
5d8a59d
WIP Trying to fix memo generation
Elaine-Krauss-TCG Nov 7, 2022
4476be2
529 initial dev/local testing
dheitzer Nov 8, 2022
0448f4e
Makes changes to processing child transactions in order to create chi…
Elaine-Krauss-TCG Nov 8, 2022
e0ad080
Updates test descriptions
Elaine-Krauss-TCG Nov 8, 2022
89d5fce
Updates aggregation testing to test that different aggregation groups…
Elaine-Krauss-TCG Nov 8, 2022
5fff310
newer validate hash
toddlees Nov 8, 2022
25f40bd
Merge branch 'defect/transfer-contribution-maximum' of https://github…
toddlees Nov 8, 2022
b3d3324
Merge branch 'develop' of https://github.com/fecgov/fecfile-web-app i…
toddlees Nov 8, 2022
60e348d
Merge pull request #672 from fecgov/defect/transfer-contribution-maximum
toddlees Nov 8, 2022
edb8edb
Updates aggregation testing to test that different aggregation groups…
Elaine-Krauss-TCG Nov 8, 2022
e94cfb7
update validate hash
toddlees Nov 10, 2022
86c6ed8
Merge branch 'develop' of https://github.com/fecgov/fecfile-web-app i…
toddlees Nov 10, 2022
b933cfa
Merge pull request #676 from fecgov/feature/529-party-recount-receipt
toddlees Nov 10, 2022
5b43710
Refactors transaction creation and entering; Reworks the Transaction …
Elaine-Krauss-TCG Nov 10, 2022
9c82c8f
Removes blocked out code
Elaine-Krauss-TCG Nov 10, 2022
acb6194
Transaction field testing brought in line with the new system:
Elaine-Krauss-TCG Nov 10, 2022
cce6311
Repairs a few broken tests
Elaine-Krauss-TCG Nov 10, 2022
31c1a81
Repairs a few broken tests
Elaine-Krauss-TCG Nov 10, 2022
9fb405a
WIP Repairing 15-472
Elaine-Krauss-TCG Nov 10, 2022
9d2833c
Transaction-entering can now make use of pre-existing contacts
Elaine-Krauss-TCG Nov 11, 2022
0e91d48
Repairs test 15-472
Elaine-Krauss-TCG Nov 11, 2022
22b8f61
Removes unnecessary code duplication
Elaine-Krauss-TCG Nov 11, 2022
8cfe93a
Transaction objects default to isNewContact=true and can be overriden
Elaine-Krauss-TCG Nov 11, 2022
203302e
All E2E Tests up and running! New test made for specifically looking…
Elaine-Krauss-TCG Nov 11, 2022
557e4bb
Merges in develop
Elaine-Krauss-TCG Nov 11, 2022
23346d3
Corrects an edge-case where creating an earmark receipt (with cypress…
Elaine-Krauss-TCG Nov 11, 2022
e3ebff1
Massive purge of unused imports
Elaine-Krauss-TCG Nov 11, 2022
4f04c82
Further linting updates
Elaine-Krauss-TCG Nov 11, 2022
cc7080d
Merge branch 'develop' into feature/403-Memo-Text-As-Separate-Record
Elaine-Krauss-TCG Nov 14, 2022
a67fcc6
retrieveMemoText() uses a passed-in value for transactionType instead
Elaine-Krauss-TCG Nov 14, 2022
98672a3
Repairs a broken unit test
Elaine-Krauss-TCG Nov 14, 2022
6f8d611
Merge branch 'develop' into feature/534-tribal-recount-receipt
mjtravers Nov 15, 2022
3f1fa09
Merge pull request #675 from fecgov/feature/534-tribal-recount-receipt
toddlees Nov 15, 2022
e023208
Renames memo_text_description to memo_text_input
Elaine-Krauss-TCG Nov 15, 2022
99026c0
Merge branch 'develop' into feature/662-e2e-sprint-16
mjtravers Nov 15, 2022
9c5b8af
Merge pull request #677 from fecgov/feature/662-e2e-sprint-16
mjtravers Nov 15, 2022
52c1d3e
Fixes unit tests
Elaine-Krauss-TCG Nov 15, 2022
cf3e15e
Corrects an issue with earmark memo creation
Elaine-Krauss-TCG Nov 15, 2022
139d903
Fixes a broken unit test
Elaine-Krauss-TCG Nov 15, 2022
04b57f0
remove parentTransaction from transactionType
toddlees Nov 15, 2022
bc64a5d
update memo specs
toddlees Nov 16, 2022
8fa0905
actually give transfer memos parents in spec
toddlees Nov 16, 2022
fd5c72f
Updates validator commit hash
Elaine-Krauss-TCG Nov 16, 2022
5f1bcc7
Updates validator commit hash again
Elaine-Krauss-TCG Nov 16, 2022
5ef5f91
Adds the JF_TRANSFER_NATIONAL_PARTY_RECOUNT_ACCOUNT transaction
Elaine-Krauss-TCG Nov 16, 2022
dea8d9a
497 initial dev/local testing
dheitzer Nov 16, 2022
8131db9
Updates validator hash again
Elaine-Krauss-TCG Nov 16, 2022
85c6947
Adds in the labels for the new transaction's sub transactions so that…
Elaine-Krauss-TCG Nov 16, 2022
efd5537
Updates unit test for new transaction
Elaine-Krauss-TCG Nov 16, 2022
48cc7fa
cypress/support/transaction_nav_trees.spec.ts
Elaine-Krauss-TCG Nov 16, 2022
64301b3
Updates a couple elements in the cypress transaction nav tree details…
Elaine-Krauss-TCG Nov 16, 2022
8c36c1c
696 initial dev/local testing
dheitzer Nov 16, 2022
e060273
Updates commit hash
Elaine-Krauss-TCG Nov 16, 2022
5591c15
Updates commit hash
Elaine-Krauss-TCG Nov 16, 2022
827e4e4
Adds in the new sub transaction types. Tribal NPR Memos aren't workin…
Elaine-Krauss-TCG Nov 16, 2022
f87fd77
Updates the list of sub-transactions to correct an error
Elaine-Krauss-TCG Nov 16, 2022
beb21a7
update validate hash
toddlees Nov 17, 2022
d114ca6
Updates commit hash
Elaine-Krauss-TCG Nov 17, 2022
7d451d8
Adds child transactions to the E2E testing
Elaine-Krauss-TCG Nov 17, 2022
2b88cad
Corrects unit tests for a transaction to actually cover the model it …
Elaine-Krauss-TCG Nov 17, 2022
0030af5
Updates commit hash
Elaine-Krauss-TCG Nov 17, 2022
e49bd04
Updates validator hash
Elaine-Krauss-TCG Nov 17, 2022
b382b98
Adds the BUSINESS_LABOR_NON_CONTRIBUTION_ACCOUNT transaction
Elaine-Krauss-TCG Nov 17, 2022
8f54c36
Adds E2E support
Elaine-Krauss-TCG Nov 17, 2022
5d360d6
Update validate hash
mjtravers Nov 17, 2022
e572283
Merge pull request #698 from fecgov/feature/463-National-Party-Recoun…
mjtravers Nov 18, 2022
7d71455
Merge branch 'develop' into feature/497-jf-tran-np-convention-account
mjtravers Nov 18, 2022
cb8fd13
Merge branch 'develop' into feature/National-Party-Recount-Sub-Transa…
mjtravers Nov 18, 2022
3cfc332
Merge pull request #749 from fecgov/feature/National-Party-Recount-Su…
mjtravers Nov 18, 2022
8aec265
Merge branch 'develop' into feature/533-business-organization-receipt
mjtravers Nov 18, 2022
f402972
Reverted value of non-contribution account database value
mjtravers Nov 18, 2022
1a3d5c9
Merge pull request #751 from fecgov/feature/533-business-organization…
mjtravers Nov 18, 2022
cffb84d
Merge pull request #750 from fecgov/feature/696-earmark-receipt-memo-…
mjtravers Nov 18, 2022
28fef03
Merge pull request #661 from fecgov/feature/403-Memo-Text-As-Separate…
mjtravers Nov 18, 2022
68abe08
Merge branch 'develop' into feature/497-jf-tran-np-convention-account
dheitzer Nov 18, 2022
09e5b88
add e2e
dheitzer Nov 18, 2022
dc5585f
Merge branch 'feature/497-jf-tran-np-convention-account' of https://g…
dheitzer Nov 18, 2022
a8c0795
497 fixed e2e
dheitzer Nov 18, 2022
39571de
fixed e2e
dheitzer Nov 18, 2022
e03337e
497 fix e2e code smell
dheitzer Nov 18, 2022
fc3d4c0
Merge pull request #697 from fecgov/feature/497-jf-tran-np-convention…
mjtravers Nov 18, 2022
3407531
cleanup of transaction and childTransactionType
toddlees Nov 18, 2022
33b5f0a
Update validate commit hash
mjtravers Nov 18, 2022
54cc199
Updates validator hash
Elaine-Krauss-TCG Nov 18, 2022
1bcb9a4
Merge branch 'develop' into feature/626
mjtravers Nov 18, 2022
06cd2b5
Adds the Individual Receipt Non Contribution Account transaction
Elaine-Krauss-TCG Nov 18, 2022
d8adea9
Adds E2E support
Elaine-Krauss-TCG Nov 18, 2022
1e492c8
Updated properties for new transaction type classes and fixed unit tests
mjtravers Nov 18, 2022
0f6a65f
Merge pull request #686 from fecgov/feature/626
mjtravers Nov 18, 2022
f7f04ed
National party convention jf transfer memos
toddlees Nov 21, 2022
b842748
more explicit constant names
toddlees Nov 21, 2022
0609a2e
e2e jf national party convention memos
toddlees Nov 21, 2022
9673a3f
correct groups
toddlees Nov 21, 2022
e950b1f
Updates validator hash
Elaine-Krauss-TCG Nov 21, 2022
be1afc8
update hash
toddlees Nov 21, 2022
03d4dff
Updates contribution purpose description
Elaine-Krauss-TCG Nov 21, 2022
165e103
didn't click save
toddlees Nov 21, 2022
fe4fd04
Updates validator hash
Elaine-Krauss-TCG Nov 21, 2022
da38c57
correct cpd
toddlees Nov 21, 2022
2c490f4
iset fields_to_validate for transaction children
toddlees Nov 21, 2022
1e43526
528 initial dev/local testing
dheitzer Nov 21, 2022
c29a94d
528 add e2e test
dheitzer Nov 21, 2022
3353e8c
Removed undefined declarations from model class.
mjtravers Nov 21, 2022
8d8df24
Merge branch 'develop' into feature/519-individual-non-contribution
mjtravers Nov 21, 2022
5558ffc
Corrects the expected field name from 'memo_text_description' to 'mem…
Elaine-Krauss-TCG Nov 21, 2022
bc65715
Update validate commit hash
mjtravers Nov 21, 2022
8c2f946
Merge branch 'feature/519-individual-non-contribution' of https://git…
mjtravers Nov 21, 2022
d424420
Merge pull request #752 from fecgov/feature/519-individual-non-contri…
mjtravers Nov 21, 2022
92453db
Merge branch 'develop' into feature/np-convention-memo
mjtravers Nov 21, 2022
bdd0df5
Merge pull request #753 from fecgov/feature/np-convention-memo
mjtravers Nov 21, 2022
d42ea40
Merge branch 'develop' into feature/528-other-committee-non-contribut…
mjtravers Nov 21, 2022
5a280e1
Merge pull request #755 from fecgov/cypress-fix-memo-input
mjtravers Nov 21, 2022
bd6da56
Merge pull request #754 from fecgov/feature/528-other-committee-non-c…
mjtravers Nov 21, 2022
cb9fc9b
Corrects an entity type in a transaction
Elaine-Krauss-TCG Nov 22, 2022
8a4563a
Makes datepicker interaction more resilient by adding "force:true"
Elaine-Krauss-TCG Nov 22, 2022
02a1d2c
Cypress config updated
Elaine-Krauss-TCG Nov 22, 2022
cd61725
Corrects more entity type errors
Elaine-Krauss-TCG Nov 22, 2022
8a91ad0
Reverts a change to contribution purpose description that was causing…
Elaine-Krauss-TCG Nov 22, 2022
518fcc7
Merge pull request #764 from fecgov/patch/cypress-other-committee-rec…
mjtravers Nov 23, 2022
cfd676c
correct name of jf transfer recount
toddlees Nov 29, 2022
5fa53f4
update labels of national party recount account types to avoid confusion
toddlees Nov 29, 2022
fbe5cdf
Merge pull request #772 from fecgov/patch/463-jf-transfer-recount-name
mjtravers Nov 29, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions front-end/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
import { defineConfig } from 'cypress'

export default defineConfig({
defaultCommandTimeout: 10000,
projectId: 'x5egpz',
videosFolder: 'cypress/videos',
screenshotsFolder: 'cypress/screenshots',
screenshotOnRunFailure: true,
fixturesFolder: 'cypress/fixtures',
trashAssetsBeforeRuns: false,
videoUploadOnPasses: false,
chromeWebSecurity: false,
retries: {
"runMode":2,
"openMode":2,
},
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
Expand Down
7 changes: 3 additions & 4 deletions front-end/cypress/e2e/sprint-10/sprint-10-test-125.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,10 @@ describe('QA Script 125 (Sprint 10)', () => {

const contact = generateContactIndividual({});
const transaction = generateTransactionObject({
'INDIVIDUALS/PERSONS': {
'Individual Receipt': {},
},
transaction_name: 'Individual Receipt',
contact: contact,
});
cy.createTransactionSchA(transaction, contact);
cy.createTransactionSchA(transaction);
cy.medWait();
}

Expand Down
16 changes: 6 additions & 10 deletions front-end/cypress/e2e/sprint-10/sprint-10-test-347.cy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { generateContactCommittee } from '../../support/generators/contacts.spec';
import { generateReportObject } from '../../support/generators/reports.spec';
import { generateTransactionObject } from '../../support/generators/transactions.spec';
import { createTransactionSchA } from '../../support/transactions.spec';
Expand Down Expand Up @@ -27,17 +26,14 @@ describe('QA Script 347 (Sprint 10)', () => {
cy.navigateToTransactionManagement();

//Tests the summary page for a report
const contactObject = generateContactCommittee({});
const transactionTree = generateTransactionObject({
TRANSFERS: {
'Joint Fundraising Transfer': {},
},
const transaction = generateTransactionObject({
transaction_name: 'Joint Fundraising Transfer',
});
createTransactionSchA(transactionTree, contactObject);

createTransactionSchA(transaction);
cy.medWait();
const parentTransaction = transactionTree['TRANSFERS']['Joint Fundraising Transfer'];
const childTransaction = parentTransaction['childTransactions'][0];
const contribution = childTransaction['contributionAmount'] as number;
const childTransaction = transaction.childTransactions[0];
const contribution = childTransaction.fields['contributionAmount'] as number;
const convContribution = Intl.NumberFormat('en-US').format(Math.floor(contribution));

cy.contains('tr', 'JOINT_FUNDRAISING_TRANSFER')
Expand Down
10 changes: 4 additions & 6 deletions front-end/cypress/e2e/sprint-13/sprint-13-test-439,445.cy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @ts-check

import { enterContact } from '../../support/contacts.spec';
import { generateContactToFit } from '../../support/generators/contacts.spec';
import { generateReportObject } from '../../support/generators/reports.spec';
import { generateTransactionObject } from '../../support/generators/transactions.spec';
import { createTransactionSchA } from '../../support/transactions.spec';
Expand Down Expand Up @@ -32,18 +31,17 @@ describe('QA Script 244 (Sprint 8)', () => {
cy.get("div[role='toolbar']").contains('Transactions').should('exist');

//Step 4: Create a Joint Fundraising Transfer MEMO transaction
const transaction = generateTransactionObject({ TRANSFERS: { 'Joint Fundraising Transfer': {} } });
const contact = generateContactToFit(transaction);
createTransactionSchA(transaction, contact, false);
const transaction = generateTransactionObject({ transaction_name: 'Joint Fundraising Transfer' });
createTransactionSchA(transaction, false);
cy.get('p-dropdown[formcontrolname="subTransaction"]').click();
cy.contains('li', 'PAC JF Transfer Memo').click();
cy.contains('li', 'PAC Joint Fundraising Transfer Memo').click();
cy.shortWait();
cy.get('.p-confirm-dialog-accept').click();
cy.longWait();

cy.contains('a', 'Create a new contact').click();
cy.longWait();
enterContact(contact, true, true);
enterContact(transaction.contact, true, true);
cy.medWait();

cy.contains('The dollar amount in a memo item is not incorporated into the total figure for the schedule').should(
Expand Down
46 changes: 15 additions & 31 deletions front-end/cypress/e2e/sprint-14/sprint-14-test-243,549.cy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// @ts-check

import * as _ from 'lodash';
import {
generateContactCommittee,
generateContactIndividual,
Expand All @@ -15,37 +14,22 @@ const contactOrganization = generateContactOrganization({});
const contactCommittee = generateContactCommittee({});

//Individual Transactions
const indvRecTree = {
'INDIVIDUALS/PERSONS': {
'Individual Receipt': {
contributionDate: new Date('12/12/2012'),
contributionAmount: _.random(10, 500, false),
},
},
};
const tTreeIndividualA = generateTransactionObject(indvRecTree);
const transactionIndividual = generateTransactionObject({
transaction_name: 'Individual Receipt',
contact: contactIndividual,
});

//Organization Transactions
const orgRecTree = {
'INDIVIDUALS/PERSONS': {
'Tribal Receipt': {
contributionDate: new Date('12/12/2012'),
contributionAmount: _.random(10, 500, false),
},
},
};
const tTreeOrganizationA = generateTransactionObject(orgRecTree);
const transactionOrganization = generateTransactionObject({
transaction_name: 'Tribal Receipt',
contact: contactOrganization,
});

//JF Transfer Transfers
const JFTransTree = {
TRANSFERS: {
'Joint Fundraising Transfer': {
contributionDate: new Date('12/12/2012'),
contributionAmount: _.random(10, 250, false),
},
},
};
const tTreeJFTransA = generateTransactionObject(JFTransTree);
const transactionCommittee = generateTransactionObject({
transaction_name: 'Party Receipt',
contact: contactCommittee,
});

describe('QA Script 244 (Sprint 8)', () => {
after(() => {
Expand Down Expand Up @@ -75,11 +59,11 @@ describe('QA Script 244 (Sprint 8)', () => {
cy.medWait();
cy.navigateToTransactionManagement();
cy.medWait();
cy.createTransactionSchA(tTreeIndividualA, contactIndividual);
cy.createTransactionSchA(transactionIndividual);
cy.medWait();
cy.createTransactionSchA(tTreeOrganizationA, contactOrganization);
cy.createTransactionSchA(transactionOrganization);
cy.medWait();
cy.createTransactionSchA(tTreeJFTransA, contactCommittee);
cy.createTransactionSchA(transactionCommittee);
cy.medWait();

cy.get('.p-menubar').find('.p-menuitem-link').contains('Contacts').click();
Expand Down
30 changes: 10 additions & 20 deletions front-end/cypress/e2e/sprint-15/sprint-15-test-159.cy.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
// @ts-check

import * as _ from 'lodash';
import { generateContactIndividual } from '../../support/generators/contacts.spec';
import { generateReportObject } from '../../support/generators/reports.spec';
import { generateTransactionObject } from '../../support/generators/transactions.spec';
import { enterTransactionSchA } from '../../support/transactions.spec';

const contactIndividual = generateContactIndividual({});
const indvRecTree = {
'INDIVIDUALS/PERSONS': {
'Individual Receipt': {
contributionDate: new Date('12/12/2012'),
contributionAmount: _.random(10, 500, false),
},
},
};
const tTreeIndividual = generateTransactionObject(indvRecTree);
const transactionIndv = tTreeIndividual['INDIVIDUALS/PERSONS']['Individual Receipt'];

describe('QA Script 244 (Sprint 8)', () => {
const transactionIndv = generateTransactionObject({
transaction_name: 'Individual Receipt',
contact: contactIndividual,
isNewContact: false,
});

describe('QA Script 159 (Sprint 15)', () => {
after(() => {
cy.login();
cy.visit('/dashboard');
Expand All @@ -27,7 +21,7 @@ describe('QA Script 244 (Sprint 8)', () => {
});

before('', () => {
//Step 1: Log in, navigate to the contacts page and create individual, organization, and committee contacts
//Step 1: Log in, navigate to the contacts page and creates the individual contact
cy.login();
cy.visit('/dashboard');
cy.url().should('contain', '/dashboard');
Expand Down Expand Up @@ -59,22 +53,18 @@ describe('QA Script 244 (Sprint 8)', () => {
cy.shortWait();
cy.navigateTransactionAccordion('INDIVIDUALS/PERSONS', 'Individual Receipt');

cy.get('p-autocomplete[formcontrolname="selectedContact"]').safeType(contactIndividual['name']);
cy.medWait();
cy.contains('li', 'In contacts').click({ force: true });
cy.medWait();
enterTransactionSchA(transactionIndv);
cy.shortWait();

cy.get('input[formControlName="contributor_city"]').overwrite('TESTOPOLIS');
cy.get('input[formControlName="contributor_suffix"]').overwrite('XI');
cy.shortWait();

cy.get('button[label="Save & view all transactions"]').click();
cy.contains('button', 'Save & view all transactions').click();
cy.shortWait();
cy.get('.p-confirm-dialog-reject').click();
cy.shortWait();
cy.get('button[label="Save & view all transactions"]').click();
cy.contains('button', 'Save & view all transactions').click();

cy.contains('.p-confirm-dialog-message', 'XI').should('exist');
cy.contains('.p-confirm-dialog-message', 'TESTOPOLIS').should('exist');
Expand Down
65 changes: 47 additions & 18 deletions front-end/cypress/e2e/sprint-15/sprint-15-test-172.cy.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,47 @@
// @ts-check

import { generateContactToFit } from '../../support/generators/contacts.spec';
import { Contact } from '../../support/generators/contacts.spec';
import { generateReportObject } from '../../support/generators/reports.spec';
import { generateTransactionObject, TransactionTree } from '../../support/generators/transactions.spec';
import { generateTransactionObject } from '../../support/generators/transactions.spec';

const transactions = [
generateTransactionObject({ 'INDIVIDUALS/PERSONS': { 'Individual Receipt': { contributionAmount: 199.99 } } }),
generateTransactionObject({ 'INDIVIDUALS/PERSONS': { 'Individual Receipt': { contributionAmount: 200.01 } } }),
generateTransactionObject({ 'INDIVIDUALS/PERSONS': { 'Tribal Receipt': { contributionAmount: 199.99 } } }),
generateTransactionObject({ 'INDIVIDUALS/PERSONS': { 'Tribal Receipt': { contributionAmount: 200.01 } } }),
generateTransactionObject({ OTHER: { 'Offsets to Operating Expenditures': { contributionAmount: 199.99 } } }),
generateTransactionObject({ OTHER: { 'Offsets to Operating Expenditures': { contributionAmount: 200.01 } } }),
generateTransactionObject({ OTHER: { 'Other Receipts': { contributionAmount: 199.99 } } }),
generateTransactionObject({ OTHER: { 'Other Receipts': { contributionAmount: 200.01 } } }),
generateTransactionObject({
transaction_name: 'Individual Receipt',
fields: { contributionAmount: 199.99 },
}),
generateTransactionObject({
transaction_name: 'Individual Receipt',
fields: { contributionAmount: 200.01 },
}),
generateTransactionObject({
transaction_name: 'Tribal Receipt',
fields: { contributionAmount: 199.99 },
}),
generateTransactionObject({
transaction_name: 'Tribal Receipt',
fields: { contributionAmount: 200.01 },
}),
generateTransactionObject({
transaction_name: 'Offsets to Operating Expenditures',
fields: { contributionAmount: 199.99 },
}),
generateTransactionObject({
transaction_name: 'Offsets to Operating Expenditures',
fields: { contributionAmount: 200.01 },
}),
generateTransactionObject({
transaction_name: 'Other Receipts',
fields: { contributionAmount: 199.99 },
}),
generateTransactionObject({
transaction_name: 'Other Receipts',
fields: { contributionAmount: 200.01 },
}),
generateTransactionObject({
transaction_name: 'Joint Fundraising Transfer',
fields: { contributionAmount: 100.0 },
childTransactions: [],
}),
];

function getName(contact: Contact): string {
Expand All @@ -26,19 +55,19 @@ function getName(contact: Contact): string {
}
}

function test_itemization(transaction: TransactionTree) {
const contact = generateContactToFit(transaction);
const accordion = Object.keys(transaction)[0];
const receipt = Object.keys(transaction[accordion])[0];
const contribution = transaction[accordion][receipt]['contributionAmount'];
const itemized = contribution > 200;
cy.createTransactionSchA(transaction, contact);
function test_itemization(transaction: Transaction) {
const contact = transaction.contact;
const contribution = transaction.fields['contributionAmount'];
let itemized = contribution > 200;
if (transaction.transaction_name === 'Joint Fundraising Transfer') itemized = true;

cy.createTransactionSchA(transaction);

if (!itemized) cy.contains('tr', getName(contact)).should('contain.text', 'Unitemized');
else cy.contains('tr', getName(contact)).should('not.contain.text', 'Unitemized');
}

describe('QA Script 244 (Sprint 8)', () => {
describe('QA Script 172 (Sprint 15)', () => {
after(() => {
cy.login();
cy.visit('/dashboard');
Expand Down
38 changes: 26 additions & 12 deletions front-end/cypress/e2e/sprint-15/sprint-15-test-276.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,40 @@

import { generateContactIndividual } from '../../support/generators/contacts.spec';
import { generateReportObject } from '../../support/generators/reports.spec';
import { generateTransactionObject, TransactionTree } from '../../support/generators/transactions.spec';
import { generateTransactionObject, Transaction } from '../../support/generators/transactions.spec';

const contact = generateContactIndividual({
employer: '',
occupation: '',
});
const transactions = [
generateTransactionObject({ 'INDIVIDUALS/PERSONS': { 'Individual Receipt': { contributionAmount: 199.99 } } }),
generateTransactionObject({ 'INDIVIDUALS/PERSONS': { 'Individual Receipt': { contributionAmount: 200.01 } } }),
generateTransactionObject({ OTHER: { 'Other Receipts': { contributionAmount: 199.99 } } }),
generateTransactionObject({ OTHER: { 'Other Receipts': { contributionAmount: 200.01 } } }),
generateTransactionObject({
transaction_name: 'Individual Receipt',
fields: { contributionAmount: 199.99 },
contact: contact,
}),
generateTransactionObject({
transaction_name: 'Individual Receipt',
fields: { contributionAmount: 200.01 },
contact: contact,
}),
generateTransactionObject({
transaction_name: 'Other Receipts',
fields: { contributionAmount: 199.99 },
contact: contact,
}),
generateTransactionObject({
transaction_name: 'Other Receipts',
fields: { contributionAmount: 200.01 },
contact: contact,
}),
];

function test_employer_fields(transaction: TransactionTree) {
const accordion = Object.keys(transaction)[0];
const receipt = Object.keys(transaction[accordion])[0];
const contribution = transaction[accordion][receipt]['contributionAmount'];
function test_employer_fields(transaction: Transaction) {
const contribution = transaction.fields['contributionAmount'] as number;
const required = contribution > 200;

cy.createTransactionSchA(transaction, contact, false);
cy.createTransactionSchA(transaction, false);
cy.shortWait();
cy.get('input[formControlName="contributor_employer"]').click();
cy.get('input[formControlName="contributor_occupation"]').click();
Expand All @@ -36,11 +50,11 @@ function test_employer_fields(transaction: TransactionTree) {
cy.get('input[formControlName="contributor_occupation"]').parent().find('.p-error').should('not.exist');
}

cy.get('button[label="Cancel"]').click();
cy.contains('button', 'Cancel').click();
cy.shortWait();
}

describe('QA Script 244 (Sprint 8)', () => {
describe('QA Script 276 (Sprint 15)', () => {
after(() => {
cy.login();
cy.visit('/dashboard');
Expand Down
Loading