Skip to content

Commit

Permalink
Merge pull request #1547 from fecgov/release/sprint-34
Browse files Browse the repository at this point in the history
Release/sprint 34
  • Loading branch information
mjtravers authored Dec 11, 2023
2 parents b940b42 + 6df26cb commit c3acdb4
Show file tree
Hide file tree
Showing 152 changed files with 2,687 additions and 1,818 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ jobs:
command: mkdir -p /tmp/cache/scanner
- restore_cache:
keys:
- v1-sonarcloud-scanner-4.6.2.2472
- v1-sonarcloud-scanner-5.0.1.3006
- run:
name: SonarCloud
command: |
set -e
VERSION=4.6.2.2472
VERSION=5.0.1.3006
if [ -z "$SONAR_TOKEN" ]; then
echo "You must set SONAR_TOKEN environemnt variable"
exit 1
Expand All @@ -92,7 +92,7 @@ jobs:
environment:
SONARQUBE_SCANNER_PARAMS: '{"sonar.host.url":"https://sonarcloud.io"}'
- save_cache:
key: v1-sonarcloud-scanner-4.6.2.2472
key: v1-sonarcloud-scanner-5.0.1.3006
paths:
- /tmp/cache/scanner

Expand All @@ -113,7 +113,7 @@ jobs:
command: |
git checkout ${E2E_BRANCH_NAME}
docker-compose down
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} docker-compose up --build -d
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} docker-compose up --build -d
docker container run --network container:fecfile-api \
docker.io/jwilder/dockerize \
-wait http://localhost:8080/api/v1/user/login/authenticate \
Expand Down
6 changes: 5 additions & 1 deletion front-end/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"src/assets"
],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.css",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/primeng.min.css",
"node_modules/primeflex/primeflex.css",
Expand All @@ -45,7 +46,10 @@
"src/assets/styles/theme.css",
"src/styles.scss"
],
"scripts": []
"scripts": [
"node_modules/@popperjs/core/dist/umd/popper.min.js",
"node_modules/bootstrap/dist/js/bootstrap.js"
]
},
"configurations": {
"cloud.gov.prod": {
Expand Down
136 changes: 68 additions & 68 deletions front-end/cypress/e2e/models/ContactFormModel.ts
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
import { PageUtils } from "../pages/pageUtils";

export class ContactFormData {
contact_type: string;
last_name: string;
first_name: string;
middle_name: string;
prefix: string;
suffix: string;
country: string;
street_1: string;
street_2: string;
city: string;
state: string;
zip: string;
phone: string;
employer: string;
occupation: string;
candidate_id: string;
candidate_office: string;
candidate_state: string;
candidate_district: string;
committee_id: string;
name: string;
contact_type: string;
last_name: string;
first_name: string;
middle_name: string;
prefix: string;
suffix: string;
country: string;
street_1: string;
street_2: string;
city: string;
state: string;
zip: string;
phone: string;
employer: string;
occupation: string;
candidate_id: string;
candidate_office: string;
candidate_state: string;
candidate_district: string;
committee_id: string;
name: string;

constructor(formData: ContactFormData) {
this.contact_type = formData.contact_type;
this.last_name = formData.last_name;
this.first_name = formData.first_name;
this.middle_name = formData.middle_name;
this.prefix = formData.prefix;
this.suffix = formData.suffix;
this.country = formData.country;
this.street_1 = formData.street_1;
this.street_2 = formData.street_2;
this.city = formData.city;
this.state = formData.state;
this.zip = formData.zip;
this.phone = formData.phone;
this.employer = formData.employer;
this.occupation = formData.occupation;
this.name = formData.name;
this.committee_id = formData.committee_id;
this.candidate_district = formData.candidate_district;
this.candidate_id = formData.candidate_id;
this.candidate_office = formData.candidate_office;
this.candidate_state = formData.candidate_state;
}
};
constructor(formData: ContactFormData) {
this.contact_type = formData.contact_type;
this.last_name = formData.last_name;
this.first_name = formData.first_name;
this.middle_name = formData.middle_name;
this.prefix = formData.prefix;
this.suffix = formData.suffix;
this.country = formData.country;
this.street_1 = formData.street_1;
this.street_2 = formData.street_2;
this.city = formData.city;
this.state = formData.state;
this.zip = formData.zip;
this.phone = formData.phone;
this.employer = formData.employer;
this.occupation = formData.occupation;
this.name = formData.name;
this.committee_id = formData.committee_id;
this.candidate_district = formData.candidate_district;
this.candidate_id = formData.candidate_id;
this.candidate_office = formData.candidate_office;
this.candidate_state = formData.candidate_state;
}
}

export const defaultFormData: ContactFormData = {
contact_type: 'Individual',
last_name: PageUtils.randomString(10),
first_name: PageUtils.randomString(10),
middle_name: PageUtils.randomString(10),
prefix: PageUtils.randomString(5),
suffix: PageUtils.randomString(5),
country: 'United States of America',
street_1: PageUtils.randomString(10),
street_2: PageUtils.randomString(10),
city: PageUtils.randomString(10),
state: 'District of Columbia',
zip: PageUtils.randomString(5),
phone: PageUtils.randomString(10, 'numeric'),
employer: PageUtils.randomString(20),
occupation: PageUtils.randomString(20),
candidate_id: 'H2AZ12345',
candidate_office: 'House',
candidate_state: 'Virginia',
candidate_district: '01',
committee_id: 'C' + PageUtils.randomString(8, 'numeric'),
name: PageUtils.randomString(10),
};
export const defaultFormData: ContactFormData = {
contact_type: 'Individual',
last_name: PageUtils.randomString(10),
first_name: PageUtils.randomString(10),
middle_name: PageUtils.randomString(10),
prefix: PageUtils.randomString(5),
suffix: PageUtils.randomString(5),
country: 'United States of America',
street_1: PageUtils.randomString(10),
street_2: PageUtils.randomString(10),
city: PageUtils.randomString(10),
state: 'District of Columbia',
zip: PageUtils.randomString(5),
phone: PageUtils.randomString(10, 'numeric'),
employer: PageUtils.randomString(20),
occupation: PageUtils.randomString(20),
candidate_id: 'H2AZ12345',
candidate_office: 'House',
candidate_state: 'Virginia',
candidate_district: '01',
committee_id: 'C' + PageUtils.randomString(8, 'numeric'),
name: PageUtils.randomString(10),
};

32 changes: 0 additions & 32 deletions front-end/cypress/e2e/models/ReportFormModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,3 @@ export const defaultFormData: F3xCreateReportFormData = {
date_of_election: new Date(currentYear, 11 - 1, 4),
state_of_election: 'California',
};

export const loanEnums = {
new: 'New',
save: 'Save',
cancel: 'Cancel',
saveBoth: 'Save both transactions',
saveMultiple: 'Save transactions',
saveAndCont: 'Save and continue',
saveAndAddGuarantor: 'Save & add loan guarantor',
addGuarantorUrl: '/C2_LOAN_GUARANTOR',
createSubTransaction: 'create-sub-transaction',
addLoansAndDebts: 'Add loans and debts',
loans: 'LOANS',
loanByCommittee: 'Loan By Committee',
loanFromBank: 'Loan Received from Bank',
loanMade: 'Loan Made',
loanPaymentRecieved: 'Loan Repayment Received',
loanPaymentRecievedUrl: 'LOAN_REPAYMENT_RECEIVED',
makeLoanPayment: 'Make loan repayment',
makeLoanPaymentUrl: 'LOAN_REPAYMENT_MADE',
madeLoanPayment: 'Loan Repayment Made',
recieveLoanPayment: 'Receive loan repayment',
buttonLoansAndDebts: 'loans-and-debts-button',
reviewLoan: 'Review loan agreement',
debts: 'DEBTS',
debtOwedByCommittee: 'Debt Owed By Committee',
debtOwedToCommittee: 'Debt Owed To Committee',
addDisbursement: 'Add a disbursement',
federalElectionActivityExpenditures: 'FEDERAL ELECTION ACTIVITY EXPENDITURES',
percentFedElectionActivity: '100% Federal Election Activity Payment',
lookup: 'LOOKUP',
};
Loading

0 comments on commit c3acdb4

Please sign in to comment.