Skip to content

Commit cf3af56

Browse files
rikukissarikukissa
committed
Merge branch 'release-v1.3.1'
2 parents 3e632cf + bca39d1 commit cf3af56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+177592
-456
lines changed

‎.github/workflows/deploy-prod.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
sleep 10
7979
done
8080
while true; do
81-
if docker manifest inspect opencrvs/ocrvs-farajaland:${{ github.event.inputs.countryconfig-image-tag }}; then
81+
if docker manifest inspect ${{ secrets.DOCKERHUB_ACCOUNT }}/${{ secrets.DOCKERHUB_REPO }}:${{ github.event.inputs.countryconfig-image-tag }}; then
8282
break
8383
fi
8484
sleep 10
@@ -110,6 +110,7 @@ jobs:
110110
INFOBIP_API_KEY: ${{ secrets.INFOBIP_API_KEY }}
111111
SENDER_EMAIL_ADDRESS: ${{ secrets.SENDER_EMAIL_ADDRESS }}
112112
SUPER_USER_PASSWORD: ${{ secrets.SUPER_USER_PASSWORD }}
113+
CONTENT_SECURITY_POLICY_WILDCARD: ${{ vars.CONTENT_SECURITY_POLICY_WILDCARD }}
113114
run: |
114115
cd ./${{ github.event.repository.name }}
115116
yarn deploy --clear_data=no --environment=${{ github.event.inputs.deploy-script-environment }} --host=${{ env.DOMAIN }} --version=${{ github.event.inputs.core-image-tag }} --country_config_version=${{ github.event.inputs.countryconfig-image-tag }} --country_config_path=../${{ github.event.repository.name }} --replicas=${{ env.REPLICAS }}

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,11 @@ jobs:
8181
sleep 10
8282
done
8383
while true; do
84-
if docker manifest inspect opencrvs/ocrvs-farajaland:${{ github.event.inputs.countryconfig-image-tag }}; then
84+
if docker manifest inspect ${{ secrets.DOCKERHUB_ACCOUNT }}/${{ secrets.DOCKERHUB_REPO }}:${{ github.event.inputs.countryconfig-image-tag }}; then
8585
break
8686
fi
8787
sleep 10
8888
done
89-
9089
9190
- name: Deploy to ${{ github.event.inputs.environment }}
9291
id: deploy
@@ -114,6 +113,7 @@ jobs:
114113
INFOBIP_API_KEY: ${{ secrets.INFOBIP_API_KEY }}
115114
SENDER_EMAIL_ADDRESS: ${{ secrets.SENDER_EMAIL_ADDRESS }}
116115
SUPER_USER_PASSWORD: ${{ secrets.SUPER_USER_PASSWORD }}
116+
CONTENT_SECURITY_POLICY_WILDCARD: ${{ vars.CONTENT_SECURITY_POLICY_WILDCARD }}
117117
run: |
118118
cd ./${{ github.event.repository.name }}
119119
yarn deploy --clear_data=${{ github.event.inputs.reset }} --environment=${{ github.event.inputs.environment }} --host=${{ env.DOMAIN }} --version=${{ github.event.inputs.core-image-tag }} --country_config_version=${{ github.event.inputs.countryconfig-image-tag }} --country_config_path=../${{ github.event.repository.name }} --replicas=${{ env.REPLICAS }}

‎cypress/integration/birth.spec.ts‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
1010
*/
1111

12-
import faker from "@faker-js/faker"
12+
import faker from '@faker-js/faker'
1313

1414
context('Birth Integration Test', () => {
1515
beforeEach(() => {
@@ -30,7 +30,18 @@ context('Birth Integration Test', () => {
3030
cy.login('fieldWorker')
3131
cy.createPin()
3232
cy.verifyLandingPageVisible()
33-
cy.enterMaximumInput({ informantType, motherDoB, motherFirstNames, motherFamilyName, fatherDoB, fatherFirstNames, fatherFamilyName, informantFirstNames, informantFamilyName, informantDoB })
33+
cy.enterMaximumInput({
34+
informantType,
35+
motherDoB,
36+
motherFirstNames,
37+
motherFamilyName,
38+
fatherDoB,
39+
fatherFirstNames,
40+
fatherFamilyName,
41+
informantFirstNames,
42+
informantFamilyName,
43+
informantDoB
44+
})
3445
cy.submitDeclaration()
3546
cy.logout()
3647
})
@@ -81,7 +92,18 @@ context('Birth Integration Test', () => {
8192
cy.login('registrar')
8293
cy.createPin()
8394
cy.verifyLandingPageVisible()
84-
cy.enterMaximumInput({ informantType, motherDoB, motherFirstNames, motherFamilyName, fatherDoB, fatherFirstNames, fatherFamilyName, informantFirstNames, informantFamilyName, informantDoB })
95+
cy.enterMaximumInput({
96+
informantType,
97+
motherDoB,
98+
motherFirstNames,
99+
motherFamilyName,
100+
fatherDoB,
101+
fatherFirstNames,
102+
fatherFamilyName,
103+
informantFirstNames,
104+
informantFamilyName,
105+
informantDoB
106+
})
85107
//register declaration
86108
cy.get('#registerDeclarationBtn').click()
87109
cy.get('#submit_confirm').click()

‎cypress/support/commands.ts‎

Lines changed: 76 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,14 @@ Cypress.Commands.add('declareDeclarationWithMinimumInput', () => {
306306
)
307307
cy.get('#childBirthDate-yyyy').type('2018')
308308
cy.selectOption('#placeOfBirth', 'Private_Home', 'Residential address')
309-
cy.selectOption('#country', 'Farajaland', 'Farajaland')
310-
cy.selectOption('#state', 'Pualula', 'Pualula')
311-
cy.selectOption('#district', 'Embe', 'Embe')
309+
cy.selectOption('#countryPlaceofbirth', 'Farajaland', 'Farajaland')
310+
cy.selectOption('#statePlaceofbirth', 'Pualula', 'Pualula')
311+
cy.selectOption('#districtPlaceofbirth', 'Embe', 'Embe')
312312
cy.goToNextFormSection()
313313

314314
// SELECT INFORMANT
315315
cy.selectOption('#informantType', 'Mother', 'Mother')
316+
cy.wait(500)
316317
cy.get('#registrationPhone').type('07' + getRandomNumbers(8))
317318
cy.goToNextFormSection()
318319

@@ -323,9 +324,9 @@ Cypress.Commands.add('declareDeclarationWithMinimumInput', () => {
323324
cy.get('#motherBirthDate-dd').type('23')
324325
cy.get('#motherBirthDate-mm').type('10')
325326
cy.get('#motherBirthDate-yyyy').type('1969')
326-
cy.selectOption('#countryPrimary-form-input', 'Farajaland', 'Farajaland')
327-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
328-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
327+
cy.selectOption('#countryPrimaryMother', 'Farajaland', 'Farajaland')
328+
cy.selectOption('#statePrimaryMother', 'Pualula', 'Pualula')
329+
cy.selectOption('#districtPrimaryMother', 'Embe', 'Embe')
329330
cy.goToNextFormSection()
330331

331332
// FATHER DETAILS
@@ -474,21 +475,21 @@ Cypress.Commands.add('enterMaximumInput', (options) => {
474475
cy.selectOption('#birthType', 'Single', 'Single')
475476
cy.get('#weightAtBirth').type('1.5')
476477
cy.selectOption('#placeOfBirth', 'Private_Home', 'Residential address')
477-
cy.selectOption('#country', 'Farajaland', 'Farajaland')
478+
cy.selectOption('#countryPlaceofbirth', 'Farajaland', 'Farajaland')
478479
cy.selectOption(
479-
'#state',
480+
'#statePlaceofbirth',
480481
options?.eventLocationLevel1 || 'Pualula',
481482
options?.eventLocationLevel1 || 'Pualula'
482483
)
483484
cy.selectOption(
484-
'#district',
485+
'#districtPlaceofbirth',
485486
options?.eventLocationLevel2 || 'Embe',
486487
options?.eventLocationLevel2 || 'Embe'
487488
)
488-
cy.get('#cityUrbanOption').type('My city')
489-
cy.get('#addressLine3UrbanOption').type('My residential area')
490-
cy.get('#addressLine2UrbanOption').type('My street')
491-
cy.get('#numberUrbanOption').type('40')
489+
cy.get('#cityPlaceofbirth').type('My city')
490+
cy.get('#addressLine1UrbanOptionPlaceofbirth').type('My residential area')
491+
cy.get('#addressLine2UrbanOptionPlaceofbirth').type('My street')
492+
cy.get('#addressLine3UrbanOptionPlaceofbirth').type('40')
492493
cy.goToNextFormSection()
493494

494495
// SELECT INFORMANT
@@ -497,6 +498,7 @@ Cypress.Commands.add('enterMaximumInput', (options) => {
497498
options?.informantType || 'Grandfather',
498499
options?.informantType || 'Grandfather'
499500
)
501+
cy.wait(500)
500502
cy.get('#registrationPhone').type('07' + getRandomNumbers(8))
501503
cy.get('#registrationEmail').type('[email protected]')
502504

@@ -510,12 +512,11 @@ Cypress.Commands.add('enterMaximumInput', (options) => {
510512
cy.get('#informantBirthDate-yyyy').type(informantDoBSplit.yyyy || '1975')
511513
cy.selectOption('#nationality', 'Farajaland', 'Farajaland')
512514
cy.get('#informantID').type(getRandomNumbers(10))
513-
cy.selectOption('#countryPrimary-form-input', 'Farajaland', 'Farajaland')
514-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
515-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
516-
cy.goToNextFormSection()
515+
cy.selectOption('#countryPrimaryInformant', 'Farajaland', 'Farajaland')
516+
cy.selectOption('#statePrimaryInformant', 'Pualula', 'Pualula')
517+
cy.selectOption('#districtPrimaryInformant', 'Embe', 'Embe')
517518
}
518-
519+
cy.goToNextFormSection()
519520
// MOTHER DETAILS
520521
cy.get('#iD').type(getRandomNumbers(10))
521522
cy.get('#motherBirthDate-dd').type(motherDoBSplit?.dd || '23')
@@ -530,14 +531,14 @@ Cypress.Commands.add('enterMaximumInput', (options) => {
530531
cy.get('#multipleBirth').type('2')
531532
cy.get('#occupation').type('Lawyer')
532533
cy.selectOption('#educationalAttainment', 'PRIMARY_ISCED_1', 'Primary')
533-
cy.selectOption('#countryPrimary-form-input', 'Farajaland', 'Farajaland')
534-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
535-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
536-
cy.get('#cityUrbanOptionPrimary').type('My town')
537-
cy.get('#addressLine3UrbanOptionPrimary').type('My residental area')
538-
539-
cy.get('#addressLine2UrbanOptionPrimary').type('My street')
540-
cy.get('#numberUrbanOptionPrimary').type('40')
534+
cy.selectOption('#countryPrimaryMother', 'Farajaland', 'Farajaland')
535+
cy.selectOption('#statePrimaryMother', 'Pualula', 'Pualula')
536+
cy.selectOption('#districtPrimaryMother', 'Embe', 'Embe')
537+
cy.get('#cityPrimaryMother').type('My town')
538+
cy.get('#addressLine1UrbanOptionPrimaryMother').type('My residental area')
539+
540+
cy.get('#addressLine2UrbanOptionPrimaryMother').type('My street')
541+
cy.get('#addressLine3UrbanOptionPrimaryMother').type('40')
541542
cy.goToNextFormSection()
542543

543544
// FATHER DETAILS
@@ -552,13 +553,13 @@ Cypress.Commands.add('enterMaximumInput', (options) => {
552553
cy.get('#occupation').type('Lawyer')
553554
cy.selectOption('#educationalAttainment', 'PRIMARY_ISCED_1', 'Primary')
554555
cy.get('#primaryAddressSameAsOtherPrimary_false').click()
555-
cy.selectOption('#countryPrimary', 'Farajaland', 'Farajaland')
556-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
557-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
558-
cy.get('#cityUrbanOptionPrimary').type('My town')
559-
cy.get('#addressLine3UrbanOptionPrimary').type('My residential area')
560-
cy.get('#addressLine2UrbanOptionPrimary').type('My street')
561-
cy.get('#numberUrbanOptionPrimary').type('40')
556+
cy.selectOption('#countryPrimaryFather', 'Farajaland', 'Farajaland')
557+
cy.selectOption('#statePrimaryFather', 'Pualula', 'Pualula')
558+
cy.selectOption('#districtPrimaryFather', 'Embe', 'Embe')
559+
cy.get('#cityPrimaryFather').type('My town')
560+
cy.get('#addressLine1UrbanOptionPrimaryFather').type('My residential area')
561+
cy.get('#addressLine2UrbanOptionPrimaryFather').type('My street')
562+
cy.get('#addressLine2UrbanOptionPrimaryFather').type('40')
562563
cy.goToNextFormSection()
563564

564565
// DOCUMENTS
@@ -611,9 +612,9 @@ Cypress.Commands.add('declareDeathDeclarationWithMinimumInput', (options) => {
611612
cy.get('#deceasedBirthDate-mm').type('06')
612613
cy.get('#deceasedBirthDate-yyyy').type('1988')
613614
cy.selectOption('#gender', 'Male', 'Male')
614-
cy.selectOption('#countryPrimary', 'Farajaland', 'Farajaland')
615-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
616-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
615+
cy.selectOption('#countryPrimaryDeceased', 'Farajaland', 'Farajaland')
616+
cy.selectOption('#statePrimaryDeceased', 'Pualula', 'Pualula')
617+
cy.selectOption('#districtPrimaryDeceased', 'Embe', 'Embe')
617618
cy.goToNextFormSection()
618619
// EVENT DETAILS
619620

@@ -624,6 +625,7 @@ Cypress.Commands.add('declareDeathDeclarationWithMinimumInput', (options) => {
624625
// MANNER OF DEATH
625626
cy.selectOption('#mannerOfDeath', '', 'Natural causes')
626627
cy.get('#causeOfDeathEstablished').click()
628+
cy.wait(500)
627629
cy.selectOption('#causeOfDeathMethod', '', 'Physician')
628630
cy.selectOption('#placeOfDeath', '', "Deceased's usual place of residence")
629631

@@ -634,6 +636,7 @@ Cypress.Commands.add('declareDeathDeclarationWithMinimumInput', (options) => {
634636
options?.informantType || 'Spouse',
635637
options?.informantType || 'Spouse'
636638
)
639+
cy.wait(500)
637640
cy.get('#informantID').type('9123456781')
638641
cy.get('#informantBirthDate-dd').type('16')
639642
cy.get('#informantBirthDate-mm').type('06')
@@ -708,14 +711,14 @@ Cypress.Commands.add('enterDeathMaximumInput', (options) => {
708711
options?.deceasedGender || 'Male',
709712
options?.deceasedGender || 'Male'
710713
)
711-
cy.selectOption('#countryPrimary', 'Farajaland', 'Farajaland')
712-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
713-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
714-
cy.get('#cityUrbanOptionPrimary').type('My town')
715-
cy.get('#addressLine3UrbanOptionPrimary').type('My residential area')
716-
cy.get('#addressLine2UrbanOptionPrimary').type('My street')
717-
cy.get('#numberUrbanOptionPrimary').type('40')
718-
cy.get('#postcodePrimary').type('9000')
714+
cy.selectOption('#countryPrimaryDeceased', 'Farajaland', 'Farajaland')
715+
cy.selectOption('#statePrimaryDeceased', 'Pualula', 'Pualula')
716+
cy.selectOption('#districtPrimaryDeceased', 'Embe', 'Embe')
717+
cy.get('#cityPrimaryDeceased').type('My town')
718+
cy.get('#addressLine1UrbanOptionPrimaryDeceased').type('My residential area')
719+
cy.get('#addressLine2UrbanOptionPrimaryDeceased').type('My street')
720+
cy.get('#addressLine3UrbanOptionPrimaryDeceased').type('40')
721+
cy.get('#postalCodePrimaryDeceased').type('9000')
719722
cy.goToNextFormSection()
720723
// EVENT DETAILS
721724
cy.get('#deathDate-dd').type('18')
@@ -725,25 +728,26 @@ Cypress.Commands.add('enterDeathMaximumInput', (options) => {
725728
// CAUSE OF DEATH DETAILS
726729
cy.selectOption('#mannerOfDeath', '', 'Homicide')
727730
cy.get('#causeOfDeathEstablished').click()
731+
cy.wait(500)
728732
cy.selectOption('#causeOfDeathMethod', '', 'Physician')
729733
cy.selectOption('#placeOfDeath', '', 'Other')
730734

731-
cy.selectOption('#country', 'Farajaland', 'Farajaland')
735+
cy.selectOption('#countryPlaceofdeath', 'Farajaland', 'Farajaland')
732736
cy.selectOption(
733-
'#state',
737+
'#statePlaceofdeath',
734738
options?.eventLocationLevel1 || 'Pualula',
735739
options?.eventLocationLevel1 || 'Pualula'
736740
)
737741
cy.selectOption(
738-
'#district',
742+
'#districtPlaceofdeath',
739743
options?.eventLocationLevel2 || 'Embe',
740744
options?.eventLocationLevel2 || 'Embe'
741745
)
742-
cy.get('#cityUrbanOption').type('My city')
743-
cy.get('#addressLine3UrbanOption').type('My residential area')
744-
cy.get('#addressLine2UrbanOption').type('My street')
745-
cy.get('#numberUrbanOption').type('40')
746-
cy.get('#postalCode').type('9000')
746+
cy.get('#cityPlaceofdeath').type('My city')
747+
cy.get('#addressLine1UrbanOptionPlaceofdeath').type('My residential area')
748+
cy.get('#addressLine2UrbanOptionPlaceofdeath').type('My street')
749+
cy.get('#addressLine3UrbanOptionPlaceofdeath').type('40')
750+
cy.get('#postalCodePlaceofdeath').type('9000')
747751

748752
cy.goToNextFormSection()
749753
// INFORMANT DETAILS
@@ -752,6 +756,7 @@ Cypress.Commands.add('enterDeathMaximumInput', (options) => {
752756
options?.informantType || 'Spouse',
753757
options?.informantType || 'Spouse'
754758
)
759+
cy.wait(500)
755760
cy.get('#registrationPhone').type('07' + getRandomNumbers(8))
756761
cy.get('#registrationEmail').type('[email protected]')
757762
cy.get('#firstNamesEng').type(options?.informantFirstNames || 'Alom')
@@ -762,11 +767,11 @@ Cypress.Commands.add('enterDeathMaximumInput', (options) => {
762767
cy.selectOption('#nationality', 'Farajaland', 'Farajaland')
763768
cy.get('#informantID').type(getRandomNumbers(10))
764769
cy.get('#primaryAddressSameAsOtherPrimary_false').click()
765-
cy.selectOption('#countryPrimary-form-input', 'Farajaland', 'Farajaland')
766-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
767-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
768-
cy.get('#cityUrbanOptionPrimary').type('My town')
769-
cy.get('#postcodePrimary').type('9000')
770+
cy.selectOption('#countryPrimaryInformant', 'Farajaland', 'Farajaland')
771+
cy.selectOption('#statePrimaryInformant', 'Pualula', 'Pualula')
772+
cy.selectOption('#districtPrimaryInformant', 'Embe', 'Embe')
773+
cy.get('#cityPrimaryInformant').type('My town')
774+
cy.get('#postalCodePrimaryInformant').type('9000')
770775
cy.goToNextFormSection()
771776
cy.goToNextFormSection()
772777
})
@@ -792,17 +797,18 @@ Cypress.Commands.add('someoneElseJourney', () => {
792797
cy.selectOption('#birthType', 'Single', 'Single')
793798
cy.get('#weightAtBirth').type('1.5')
794799
cy.selectOption('#placeOfBirth', 'Private_Home', 'Residential address')
795-
cy.selectOption('#country', 'Farajaland', 'Farajaland')
796-
cy.selectOption('#state', 'Pualula', 'Pualula')
797-
cy.selectOption('#district', 'Embe', 'Embe')
798-
cy.get('#cityUrbanOption').type('My city')
799-
cy.get('#addressLine3UrbanOption').type('My residential area')
800-
cy.get('#addressLine2UrbanOption').type('My street')
801-
cy.get('#numberUrbanOption').type('40')
800+
cy.selectOption('#countryPlaceofbirth', 'Farajaland', 'Farajaland')
801+
cy.selectOption('#statePlaceofbirth', 'Pualula', 'Pualula')
802+
cy.selectOption('#districtPlaceofbirth', 'Embe', 'Embe')
803+
cy.get('#cityPlaceofbirth').type('My city')
804+
cy.get('#addressLine1UrbanOptionPlaceofbirth').type('My residential area')
805+
cy.get('#addressLine2UrbanOptionPlaceofbirth').type('My street')
806+
cy.get('#addressLine3UrbanOptionPlaceofbirth').type('40')
802807
cy.goToNextFormSection()
803808

804809
// SELECT INFORMANT
805810
cy.selectOption('#informantType', 'Someone else', 'Someone else')
811+
cy.wait(500)
806812
cy.get('#otherInformantType').type('Someone else')
807813
cy.get('#registrationPhone').type('07' + getRandomNumbers(8))
808814
cy.get('#registrationEmail').type('[email protected]')
@@ -815,9 +821,9 @@ Cypress.Commands.add('someoneElseJourney', () => {
815821
cy.get('#informantBirthDate-yyyy').type('1975')
816822
cy.selectOption('#nationality', 'Farajaland', 'Farajaland')
817823
cy.get('#informantID').type('1234567111')
818-
cy.selectOption('#countryPrimary-form-input', 'Farajaland', 'Farajaland')
819-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
820-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
824+
cy.selectOption('#countryPrimaryInformant', 'Farajaland', 'Farajaland')
825+
cy.selectOption('#statePrimaryInformant', 'Pualula', 'Pualula')
826+
cy.selectOption('#districtPrimaryInformant', 'Embe', 'Embe')
821827
cy.goToNextFormSection()
822828

823829
// MOTHER DETAILS
@@ -828,9 +834,9 @@ Cypress.Commands.add('someoneElseJourney', () => {
828834
cy.get('#motherBirthDate-yyyy').type('1975')
829835
cy.get('#firstNamesEng').type('Agnes')
830836
cy.get('#familyNameEng').type('Aktar')
831-
cy.selectOption('#countryPrimary-form-input', 'Farajaland', 'Farajaland')
832-
cy.selectOption('#statePrimary', 'Pualula', 'Pualula')
833-
cy.selectOption('#districtPrimary', 'Embe', 'Embe')
837+
cy.selectOption('#countryPrimaryMother', 'Farajaland', 'Farajaland')
838+
cy.selectOption('#statePrimaryMother', 'Pualula', 'Pualula')
839+
cy.selectOption('#districtPrimaryMother', 'Embe', 'Embe')
834840
cy.goToNextFormSection()
835841

836842
// FATHER DETAILS

0 commit comments

Comments
 (0)