Skip to content

Commit

Permalink
migrate edit, multi-edit, and delete specs
Browse files Browse the repository at this point in the history
  • Loading branch information
RFSH committed Sep 6, 2024
1 parent abb6c6e commit 7a04625
Show file tree
Hide file tree
Showing 20 changed files with 492 additions and 1,012 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
push:
branches:
- 'master'
- 'recordedit-add-pw'
pull_request:
branches:
- 'master'
Expand Down Expand Up @@ -168,12 +167,6 @@ jobs:
echo "Waiting for Sauce Connect..."
sleep 5;
done;
- name: Run all features confirmation test spec (protractor)
id: test-protractor-all-features-confirmation
continue-on-error: true
run: |
cd chaise
make testallfeaturesconfirmation-protractor
- name: Run default config test spec (protractor)
id: test-protractor-default-config
continue-on-error: true
Expand All @@ -192,9 +185,6 @@ jobs:
- name: Check on delete prohibited test spec
if: always() && steps.test-delete-prohibited.outcome != 'success'
run: exit 1
- name: Check on all features confirmation test spec (protractor)
if: always() && steps.test-protractor-all-features-confirmation.outcome != 'success'
run: exit 1
- name: Check on default config test spec (protractor)
if: always() && steps.test-protractor-default-config.outcome != 'success'
run: exit 1
Expand Down
14 changes: 4 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ MODULES=node_modules
E2EDIrecordAdd=test/e2e/specs/all-features-confirmation/recordedit/add.config.ts
E2EDIrecordEditMultiColTypes=test/e2e/specs/default-config/recordedit/multi-col-types.conf.js
E2EDIrecordImmutable=test/e2e/specs/default-config/recordedit/immutable-inputs.conf.js
E2EDIrecordEdit=test/e2e/specs/all-features-confirmation/recordedit/edit-delete.conf.js
E2EDIrecordEdit=test/e2e/specs/all-features-confirmation/recordedit/edit-delete.config.ts
# not part of the make recordedit command anymore
E2EDIrecordMultiFormInput=test/e2e/specs/default-config/multi-form-input/multi-form-input.config.ts
E2EDIrecordMultiEdit=test/e2e/specs/default-config/recordedit/multi-edit.conf.js
E2EDrecordEditCompositeKey=test/e2e/specs/default-config/recordedit/composite-key.config.ts
E2EDrecordEditDomainFilter=test/e2e/specs/default-config/recordedit/domain-filter.config.ts
E2EDrecordEditSubmissionDisabled=test/e2e/specs/default-config/recordedit/submission-disabled.conf.js
Expand Down Expand Up @@ -80,7 +79,6 @@ E2Efooter=test/e2e/specs/all-features-confirmation/footer/playwright.config.ts
# errors test
E2Eerrors=test/e2e/specs/all-features-confirmation/errors/errors.config.ts
## Parallel test scripts (protractor)
AllFeaturesConfirmationParallel_PROTRACTOR=test/e2e/specs/all-features-confirmation/protractor.conf.js
DefaultConfigParallel_PROTRACTOR=test/e2e/specs/default-config/protractor.conf.js
## Parallel test scripts
AllFeaturesParallel=test/e2e/specs/all-features/playwright.config.ts
Expand All @@ -93,18 +91,17 @@ Manualrecordset=test/manual/specs/recordset.conf.js
# protractor tests
RECORDSET_TESTS_PROTRACTOR=$(E2ErecordsetAdd) $(E2EDrecordsetEdit)
RECORDADD_TESTS_PROTRACTOR=$(E2EDIrecordMultiFormInput) $(E2EDIrecordImmutable)
RECORDEDIT_TESTS_PROTRACTOR=$(E2EDIrecordEdit) $(E2EDIrecordMultiEdit) $(E2EDrecordEditSubmissionDisabled) $(E2EDIrecordEditMultiColTypes)
RECORDEDIT_TESTS_PROTRACTOR=$(E2EDrecordEditSubmissionDisabled) $(E2EDIrecordEditMultiColTypes)
DEFAULT_CONFIG_PARALLEL_TESTS_PROTRACTOR=$(DefaultConfigParallel_PROTRACTOR)
ALL_FEATURES_CONFIRMATION_PARALLEL_TESTS_PROTRACTOR=$(AllFeaturesConfirmationParallel_PROTRACTOR)
PARALLEL_TESTS_PROTRACTOR=$(AllFeaturesConfirmationParallel_PROTRACTOR) $(DefaultConfigParallel_PROTRACTOR)
PARALLEL_TESTS_PROTRACTOR=$(DefaultConfigParallel_PROTRACTOR)
ALL_TESTS_PROTRACTOR=$(RECORDSET_TESTS_PROTRACTOR) $(RECORDADD_TESTS_PROTRACTOR) $(RECORDEDIT_TESTS_PROTRACTOR)

# playwright tests
NAVBAR_TESTS=$(E2Enavbar) $(E2EnavbarHeadTitle) $(E2EnavbarCatalogConfig)
RECORD_TESTS=$(E2EDrecord) $(E2ErecordNoDeleteBtn) $(E2EDrecordRelatedTable) $(E2EDrecordCopy) $(E2EDrecordLinks)
RECORDSET_TESTS=$(E2EDrecordset) $(E2ErecordsetSavedQuery) $(E2EDrecordsetIndFacet) $(E2EDrecordsetHistFacet)
RECORDADD_TESTS=$(E2EDIrecordAdd) $(E2EDIrecordMultiFormInput) $(E2ErecordEditForeignKeyDropdown) $(E2EDrecordEditCompositeKey)
RECORDEDIT_TESTS=$(E2ErecordEditInputIframe) $(E2EDrecordEditDomainFilter)
RECORDEDIT_TESTS=$(E2EDIrecordEdit) $(E2ErecordEditInputIframe) $(E2EDrecordEditDomainFilter)
PERMISSIONS_TESTS=$(E2EmultiPermissionsVisibility)
FOOTER_TESTS=$(E2Efooter)
ERRORS_TESTS=$(E2Eerrors)
Expand Down Expand Up @@ -200,9 +197,6 @@ testallfeatures: test-ALL_FEATURES_PARALLEL_TESTS
.PHONY: testallfeaturesconfirmation
testallfeaturesconfirmation: test-ALL_FEATURES_CONFIRMATION_PARALLEL_TESTS

.PHONY: testallfeaturesconfirmation-protractor
testallfeaturesconfirmation-protractor: test_protractor-ALL_FEATURES_CONFIRMATION_PARALLEL_TESTS_PROTRACTOR

#Rule to run the delete prohibited chaise configuration tests in parallel
.PHONY: testdeleteprohibited
testdeleteprohibited: test-DELETE_PROHIBITED_PARALLEL_TESTS
Expand Down
15 changes: 0 additions & 15 deletions test/e2e/data_setup/config/recordedit/edit-multi.config.json

This file was deleted.

9 changes: 0 additions & 9 deletions test/e2e/data_setup/config/recordedit/edit-multi.dev.json

This file was deleted.

6 changes: 4 additions & 2 deletions test/e2e/data_setup/data/multi-form-input/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
"id": 9001,
"markdown_col": "markdown value 9001",
"text_col": "text value 9001",
"int_col": 9001
"int_col": 9001,
"fk_col": "1"
},
{
"id": 9002,
"markdown_col": "markdown value 9002",
"int_col": 9002,
"date_col": "2023-11-11"
"date_col": "2023-11-11",
"fk_col": "2"
}
]
17 changes: 16 additions & 1 deletion test/e2e/data_setup/data/product/accommodation.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
"json_col_with_markdown": "delivered",
"date_col": "12/9/2008",
"luxurious": true,
"text_array": ["val1"],
"boolean_array": [false, false],
"int4_array": [1, 2, 3, 4, 5],
"float4_array": [-5.2],
"date_array": null,
"timestamp_array": null,
"timestamptz_array": null,
"color_rgb_hex_column": "#223456"
},
{
Expand Down Expand Up @@ -75,6 +82,13 @@
"luxurious": false,
"nullable_assoc_key2": "value",
"fk_col_outbound1": "o1_2",
"text_array": ["val2"],
"boolean_array": [false, false, true],
"int4_array": [1, 2, 3],
"float4_array": [1.1, -5],
"date_array": null,
"timestamp_array": null,
"timestamptz_array": ["2022-02-02T02:02:02-08:00", "2024-04-04T04:04:04-08:00"],
"color_rgb_hex_column": "#423456"
},
{
Expand Down Expand Up @@ -117,4 +131,5 @@
"timestamp_array": ["2003-03-03T03:03:03"],
"timestamptz_array": ["2002-02-02T02:02:02-08:00"],
"color_rgb_hex_column": "#623456"
}]
}
]
Loading

0 comments on commit 7a04625

Please sign in to comment.