Skip to content

Commit

Permalink
10391 - merge in staging and fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
codyseibert committed Sep 4, 2024
2 parents 5b6fb8b + bfab6eb commit f840688
Show file tree
Hide file tree
Showing 1,219 changed files with 23,061 additions and 20,901 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
orbs:
git-shallow-clone: guitarrapc/[email protected]

efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.7
efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.8

parameters:
run_build_and_deploy:
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: node-20.14.0-chrome-125.0.* is debian 12.5 (bookworm)

FROM cypress/browsers:node-20.16.0-chrome-127.0.6533.88-1-ff-128.0.3-edge-127.0.2651.74-1
FROM cypress/browsers:node-20.16.0-chrome-127.0.6533.119-1-ff-129.0.1-edge-127.0.2651.98-1

WORKDIR /home/app

Expand Down Expand Up @@ -37,12 +37,12 @@ RUN apt-get install -y build-essential
RUN apt-get install -y libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.30.zip" -o "awscliv2.zip" && \
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.17.36.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf awscliv2.zip

RUN wget -q -O terraform.zip https://releases.hashicorp.com/terraform/1.9.4/terraform_1.9.4_linux_amd64.zip && \
RUN wget -q -O terraform.zip https://releases.hashicorp.com/terraform/1.9.5/terraform_1.9.5_linux_amd64.zip && \
unzip -o terraform.zip terraform && \
rm terraform.zip && \
cp terraform /usr/local/bin/
Expand Down
18 changes: 14 additions & 4 deletions cypress-smoketests.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
deleteAllCypressTestAccounts,
deleteAllIrsCypressTestAccounts,
getIrsBearerToken,
getUserByEmail,
} from './cypress/helpers/cypressTasks/cognito/cognito-helpers';
import { defineConfig } from 'cypress';
import {
Expand Down Expand Up @@ -33,20 +34,26 @@ export default defineConfig({
return confirmUser({ email });
},
createAccount({
irsEnv,
isIrsEnv,
name,
password,
role,
userId,
userName,
}: {
irsEnv: boolean;
userName: string;
password: string;
role: string;
userName: string;
isIrsEnv: boolean;
name: string;
userId: string;
}) {
return createAccount({
isIrsEnv: irsEnv,
isIrsEnv,
name,
password,
role,
userId,
userName,
});
},
Expand Down Expand Up @@ -83,6 +90,9 @@ export default defineConfig({
getNewAccountVerificationCode({ email }) {
return getNewAccountVerificationCode({ email });
},
getUserByEmail(email: string) {
return getUserByEmail(email);
},
readAllItemsInBucket({
bucketName,
retries,
Expand Down
4 changes: 4 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
confirmUser,
deleteAllCypressTestAccounts,
getUserByEmail,
} from './cypress/helpers/cypressTasks/cognito/cognito-helpers';
import { defineConfig } from 'cypress';
import {
Expand Down Expand Up @@ -56,6 +57,9 @@ export default defineConfig({
getNewAccountVerificationCode({ email }) {
return getNewAccountVerificationCode({ email });
},
getUserByEmail(email: string) {
return getUserByEmail(email);
},
table(message) {
console.table(message);
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ import {
} from '../../../helpers/authentication/login-as-helpers';

describe('Advanced Search', () => {
beforeEach(() => {
Cypress.session.clearCurrentSessionData();
});

it('should find a served paper case when the user searches by party name or docket number', () => {
/** Arrange */
loginAsPetitionsClerk1();
createAndServePaperPetition().then(({ docketNumber, name }) => {
/** Act */
cy.get('[data-testid="search-link"]').click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,37 @@ describe('Petitioner Account Creation', () => {
});

describe('Create Petitioner Account and login', () => {
const TEST_EMAIL = `cypress_test_account+success_${GUID}@example.com`;
const TEST_NAME = 'Cypress Test';
const TEST_PASSWORD = generatePassword(VALID_PASSWORD_CONFIG);

it('should create an account and verify it using the verification link, then login and create an eletronic case', () => {
it('should prevent multiple submissions', () => {
const TEST_EMAIL = `cypress_test_account+no_multiple_submissions_${GUID}@example.com`;
cy.visit('/create-account/petitioner');
cy.get('[data-testid="petitioner-account-creation-email"]').type(
TEST_EMAIL,
);
cy.get('[data-testid="petitioner-account-creation-name"]').type(
TEST_NAME,
);
cy.get('[data-testid="petitioner-account-creation-password"]').type(
TEST_PASSWORD,
);
cy.get(
'[data-testid="petitioner-account-creation-confirm-password"]',
).type(TEST_PASSWORD);
cy.intercept('POST', '/auth/account/create').as('accountCreationRequest');

// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get('[data-testid="petitioner-account-creation-submit-button"]')
.click({ force: true })
.click({ force: true });

cy.wait('@accountCreationRequest');
cy.get('@accountCreationRequest.all').should('have.length', 1);
});

it('should create an account and verify it using the verification link, then login and create an electronic case', () => {
const TEST_EMAIL = `cypress_test_account+success_${GUID}@example.com`;
createAPetitioner({
email: TEST_EMAIL,
name: TEST_NAME,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ROLES } from '../../../../shared/src/business/entities/EntityConstants';
/* eslint-disable promise/no-nesting */
import { assertExists, retry } from '../../../helpers/retry';
import { goToCase } from '../../../helpers/caseDetail/go-to-case';
import {
Expand All @@ -10,29 +10,10 @@ import { petitionsClerkServesPetition } from '../../../helpers/documentQC/petiti
import { uploadFile } from '../../../helpers/file/upload-file';

describe('Document QC Complete', () => {
let CASE_SERVICE_SUPERVISOR_INFO: { userId: string; name: string } =
undefined as unknown as { userId: string; name: string };
let DOCKET_CLERK_INFO: { userId: string; name: string } =
undefined as unknown as { userId: string; name: string };

const docketSectionMessage = 'To CSS under Docket Section';
const petitionsSectionMessage = 'To CSS under Petitions Section';

before(() => {
cy.intercept('GET', '**/users', req => {
req.on('before:response', res => {
if (res.body.role === ROLES.caseServicesSupervisor) {
CASE_SERVICE_SUPERVISOR_INFO = res.body;
}
if (res.body.role === ROLES.docketClerk) {
DOCKET_CLERK_INFO = res.body;
}
});
});

cy.login('caseServicesSupervisor1');
cy.login('docketclerk1');

loginAsPetitioner();
petitionerCreatesElectronicCase().then(docketNumber => {
cy.wrap(docketNumber).as('DOCKET_NUMBER');
Expand All @@ -54,18 +35,22 @@ describe('Document QC Complete', () => {
cy.get<string>('@DOCKET_NUMBER').then(docketNumber => {
loginAsAdmissionsClerk();
goToCase(docketNumber);
cy.task<{ userId: string; name: string; email: string; role: string }>(
'getUserByEmail',
'[email protected]',
).then(caseServiceSupervisorInfo => {
sendMessages(
caseServiceSupervisorInfo.userId,
docketSectionMessage,
'docket',
);

sendMessages(
CASE_SERVICE_SUPERVISOR_INFO.userId,
docketSectionMessage,
'docket',
);

sendMessages(
CASE_SERVICE_SUPERVISOR_INFO.userId,
petitionsSectionMessage,
'petitions',
);
sendMessages(
caseServiceSupervisorInfo.userId,
petitionsSectionMessage,
'petitions',
);
});

retry(() => {
cy.login('caseServicesSupervisor1', '/messages/my/inbox');
Expand Down Expand Up @@ -125,42 +110,49 @@ describe('Document QC Complete', () => {
cy.get(`[data-testid="work-item-${docketNumber}"]`)
.find('[data-testid="checkbox-assign-work-item"]')
.click();

cy.get('[data-testid="dropdown-select-assignee"]').select(
DOCKET_CLERK_INFO.name,
);

retry(() => {
cy.login(
'caseServicesSupervisor1',
'/document-qc/section/inbox/selectedSection?section=docket',
cy.task<{ userId: string; name: string; email: string; role: string }>(
'getUserByEmail',
'[email protected]',
).then(docketClerkInfo => {
cy.get('[data-testid="dropdown-select-assignee"]').select(
docketClerkInfo.name,
);
cy.get('table.usa-table');
return cy.get('body').then(body => {
const workItem = body.find(
`[data-testid="work-item-${docketNumber}"]`,
);
const assigneeName = workItem.find(
'[data-testid="table-column-work-item-assigned-to"]',

retry(() => {
cy.login(
'caseServicesSupervisor1',
'/document-qc/section/inbox/selectedSection?section=docket',
);
const text = assigneeName.text();
return cy.wrap(text.includes(DOCKET_CLERK_INFO.name));
cy.get('table.usa-table');
return cy.get('body').then(body => {
const workItem = body.find(
`[data-testid="work-item-${docketNumber}"]`,
);
const assigneeName = workItem.find(
'[data-testid="table-column-work-item-assigned-to"]',
);
const text = assigneeName.text();
return cy.wrap(text.includes(docketClerkInfo.name));
});
});
});

cy.get(`[data-testid="work-item-${docketNumber}"]`)
.find('.message-document-title')
.find('a')
.click();
cy.get(`[data-testid="work-item-${docketNumber}"]`)
.find('.message-document-title')
.find('a')
.click();

cy.get('#save-and-finish').click();
cy.get('#save-and-finish').click();

cy.get('[data-testid="success-alert"]').should('contain', 'QC Completed');
cy.get('[data-testid="success-alert"]').should(
'contain',
'QC Completed',
);

cy.visit('/document-qc/my/outbox');
cy.get(`[data-testid="section-work-item-outbox-${docketNumber}"]`).should(
'exist',
);
cy.visit('/document-qc/my/outbox');
cy.get(
`[data-testid="section-work-item-outbox-${docketNumber}"]`,
).should('exist');
});
});
});

Expand All @@ -181,9 +173,14 @@ describe('Document QC Complete', () => {
.find('[data-testid="checkbox-assign-work-item"]')
.click();

cy.get('[data-testid="dropdown-select-assignee"]').select(
CASE_SERVICE_SUPERVISOR_INFO.name,
);
cy.task<{ userId: string; name: string; email: string; role: string }>(
'getUserByEmail',
'[email protected]',
).then(caseServiceSupervisorInfo => {
cy.get('[data-testid="dropdown-select-assignee"]').select(
caseServiceSupervisorInfo.name,
);
});

cy.visit('/document-qc/my/inbox');
cy.get(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { getCypressEnv } from '../../../helpers/env/cypressEnvironment';
import { loginAsPetitioner } from '../../../helpers/authentication/login-as-helpers';
import { petitionerCreatesElectronicCase } from '../../../helpers/fileAPetition/petitioner-creates-electronic-case';
import { petitionsClerkQcsAndServesElectronicCase } from '../../../helpers/documentQC/petitions-clerk-qcs-and-serves-electronic-case';
import { v4 } from 'uuid';

if (!Cypress.env('SMOKETESTS_LOCAL')) {
describe('irs superuser integration', () => {
Expand All @@ -20,9 +21,11 @@ if (!Cypress.env('SMOKETESTS_LOCAL')) {

it('should let an irs superuser view the reconciliation report and download a STIN', () => {
cy.task('createAccount', {
irsEnv: true,
isIrsEnv: true,
name: 'irsSuperUser CI/CD',
password,
role: ROLES.irsSuperuser,
userId: v4(),
userName,
});

Expand Down
Loading

0 comments on commit f840688

Please sign in to comment.