From 6a3d4449527fc0800bccacfe65699aa843b96f92 Mon Sep 17 00:00:00 2001 From: Joshua Kuestersteffen Date: Thu, 22 Aug 2024 12:08:56 -0500 Subject: [PATCH] feat(#6390): update phone widget to allow not checking for dupes (#9340) --- .../enketo/enketo-widgets.wdio-spec.js | 18 +- .../enketo/forms/enketo_widgets_test.xlsx | Bin 15865 -> 12297 bytes .../enketo/forms/enketo_widgets_test.xml | 95 ++++--- .../default/enketo/forms/phone_widget.xlsx | Bin 0 -> 9183 bytes .../e2e/default/enketo/forms/phone_widget.xml | 60 +++++ .../default/enketo/phone-widget.wdio-spec.js | 78 ++++++ .../default/enketo-widgets.wdio-spec.js | 16 -- .../default/forms/enketo_widgets_test.xml | 95 ++++--- .../cht-form/default/forms/phone_widget.xml | 60 +++++ .../default/phone_widget.wdio-spec.js | 99 ++++++++ .../default/contacts/contacts.wdio.page.js | 15 +- .../default/enketo/common-enketo.wdio.page.js | 19 ++ .../enketo/enketo-widgets.wdio.page.js | 10 - webapp/.eslintrc | 2 +- webapp/src/js/enketo/widgets/phone-widget.js | 93 +++---- .../js/enketo/widgets/phone-widget.spec.ts | 231 +++++++++++++++--- 16 files changed, 663 insertions(+), 228 deletions(-) create mode 100644 tests/e2e/default/enketo/forms/phone_widget.xlsx create mode 100644 tests/e2e/default/enketo/forms/phone_widget.xml create mode 100644 tests/e2e/default/enketo/phone-widget.wdio-spec.js create mode 100644 tests/integration/cht-form/default/forms/phone_widget.xml create mode 100644 tests/integration/cht-form/default/phone_widget.wdio-spec.js diff --git a/tests/e2e/default/enketo/enketo-widgets.wdio-spec.js b/tests/e2e/default/enketo/enketo-widgets.wdio-spec.js index f353b638633..2fb060253d4 100644 --- a/tests/e2e/default/enketo/enketo-widgets.wdio-spec.js +++ b/tests/e2e/default/enketo/enketo-widgets.wdio-spec.js @@ -47,7 +47,7 @@ describe('Enketo Widgets', () => { ); }; - const verifyReport = async (selectMultiple, selectOne, country, city, neighborhood, uuid, id, name, phoneNumber) => { + const verifyReport = async (selectMultiple, selectOne, country, city, neighborhood, uuid, id, name) => { const firstReport = await reportsPage.firstReport(); const firstReportInfo = await reportsPage.getListReportInfo(firstReport); @@ -73,7 +73,6 @@ describe('Enketo Widgets', () => { expect((await reportsPage.getDetailReportRowContent('patient_uuid')).rowValues[0]).to.equal(uuid); expect((await reportsPage.getDetailReportRowContent('patient_id')).rowValues[0]).to.equal(id); expect((await reportsPage.getDetailReportRowContent('patient_name')).rowValues[0]).to.equal(name); - expect((await reportsPage.getDetailReportRowContent('phone')).rowValues[0]).to.equal(phoneNumber); }; before(async () => { @@ -101,20 +100,6 @@ describe('Enketo Widgets', () => { expect(await enketoWidgetsPage.getDropdownValue(await enketoWidgetsPage.selectOneDropdown())) .to.equal('option d'); - // try to move to next page without filling the mandatory phone number field - await genericForm.nextPage(1, false); - expect(await enketoWidgetsPage.phoneFieldRequiredMessage().getAttribute('data-i18n')) - .to.equal('constraint.required'); - - // try to move to next page with an invalid phone number - await commonEnketoPage.setInputValue('Phone Number', '+4076'); - await genericForm.nextPage(1, false); - expect(await enketoWidgetsPage.phoneFieldConstraintMessage().getAttribute('data-itext-id')) - .to.equal('/enketo_widgets_test/enketo_test_select/phone:jr:constraintMsg'); - - // finally set a valid phone number and continue - await commonEnketoPage.setInputValue('Phone Number', phoneNumber); - await genericForm.nextPage(); await fillCascadingWidgetsSection('usa', 'nyc', 'bronx', 3, 2); await genericForm.submitForm(); @@ -149,7 +134,6 @@ describe('Enketo Widgets', () => { await enketoWidgetsPage.selectDropdownOptions(await enketoWidgetsPage.selectOneDropdown(), 'radio', 'a'); expect(await enketoWidgetsPage.getDropdownValue(await enketoWidgetsPage.selectOneDropdown())) .to.equal('option a'); - await commonEnketoPage.setInputValue('Phone Number', phoneNumber); await genericForm.nextPage(); await fillCascadingWidgetsSection('nl', 'dro', 'havendr', 3, 1); diff --git a/tests/e2e/default/enketo/forms/enketo_widgets_test.xlsx b/tests/e2e/default/enketo/forms/enketo_widgets_test.xlsx index 5c1afc9895af6591d042d9f5ec41224b7fa3f0a9..005078bb5cae982aad087c6eecca7e3a12966a81 100644 GIT binary patch literal 12297 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�DSZVDJem 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 O0Lc$kPv`n|_x}K~!%8y% diff --git a/tests/e2e/default/enketo/forms/enketo_widgets_test.xml b/tests/e2e/default/enketo/forms/enketo_widgets_test.xml index f0798563a5c..e3efad75a26 100644 --- a/tests/e2e/default/enketo/forms/enketo_widgets_test.xml +++ b/tests/e2e/default/enketo/forms/enketo_widgets_test.xml @@ -44,12 +44,6 @@ Cascading Select widgets - - Please enter a valid local number, or use the standard international format, which includes a plus sign (+) and country code. For example: +254712345678 - - - Phone Number - option a @@ -173,11 +167,10 @@ - + - @@ -217,6 +210,38 @@ + + + + static_instance-list-0 + a + + + static_instance-list-1 + b + + + static_instance-list-2 + c + + + static_instance-list-3 + d + + + + + + + static_instance-countries-0 + nl + + + static_instance-countries-1 + usa + + + @@ -251,99 +276,66 @@ - - - - static_instance-list-0 - a - - - static_instance-list-1 - b - - - static_instance-list-2 - c - - - static_instance-list-3 - d - - - static_instance-neighborhoods-0 usa - bronx nyc + bronx static_instance-neighborhoods-1 usa - harlem nyc + harlem static_instance-neighborhoods-2 usa - belair la + belair static_instance-neighborhoods-3 nl - wes ams + wes static_instance-neighborhoods-4 usa - parkhill den + parkhill static_instance-neighborhoods-5 nl - haven rot + haven static_instance-neighborhoods-6 nl - dam ams + dam static_instance-neighborhoods-7 nl - centrum rot + centrum static_instance-neighborhoods-8 nl - havendr dro - - - - - - - static_instance-countries-0 - nl - - - static_instance-countries-1 - usa + havendr - @@ -405,9 +397,6 @@ d - -