Skip to content

Commit

Permalink
migrated recordset add and edit specs (#2540)
Browse files Browse the repository at this point in the history
* migrated recordset add and edit specs
* update text truncation tests to be multiple different steps so each part that fails is more accurate
  • Loading branch information
jrchudy authored Sep 10, 2024
1 parent a6609cc commit b4c1b0c
Show file tree
Hide file tree
Showing 11 changed files with 219 additions and 361 deletions.
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ E2EDrecordRelatedTable=test/e2e/specs/all-features/record/related-table.config.t
E2EDrecordLinks=test/e2e/specs/default-config/record/links.config.ts
# Recordset tests
E2EDrecordset=test/e2e/specs/all-features-confirmation/recordset/presentation.config.ts
E2EDrecordsetEdit=test/e2e/specs/default-config/recordset/edit.conf.js
E2ErecordsetAdd=test/e2e/specs/default-config/recordset/add.conf.js
E2EDrecordsetEdit=test/e2e/specs/default-config/recordset/edit.config.ts
E2ErecordsetAdd=test/e2e/specs/default-config/recordset/add.config.ts
E2EDrecordsetIndFacet=test/e2e/specs/delete-prohibited/recordset/facet.config.ts
E2EDrecordsetHistFacet=test/e2e/specs/delete-prohibited/recordset/histogram-facet.config.ts
E2ErecordsetSavedQuery=test/e2e/specs/all-features/recordset/saved-query.config.ts
Expand All @@ -89,7 +89,6 @@ DefaultConfigParallel=test/e2e/specs/default-config/playwright.config.ts
Manualrecordset=test/manual/specs/recordset.conf.js

# protractor tests
RECORDSET_TESTS_PROTRACTOR=$(E2ErecordsetAdd) $(E2EDrecordsetEdit)
RECORDADD_TESTS_PROTRACTOR=$(E2EDIrecordMultiFormInput) $(E2EDIrecordImmutable)
RECORDEDIT_TESTS_PROTRACTOR=$(E2EDrecordEditSubmissionDisabled)
DEFAULT_CONFIG_PARALLEL_TESTS_PROTRACTOR=$(DefaultConfigParallel_PROTRACTOR)
Expand All @@ -99,7 +98,7 @@ ALL_TESTS_PROTRACTOR=$(RECORDSET_TESTS_PROTRACTOR) $(RECORDADD_TESTS_PROTRACTOR)
# playwright tests
NAVBAR_TESTS=$(E2Enavbar) $(E2EnavbarHeadTitle) $(E2EnavbarCatalogConfig)
RECORD_TESTS=$(E2EDrecord) $(E2ErecordNoDeleteBtn) $(E2EDrecordRelatedTable) $(E2EDrecordCopy) $(E2EDrecordLinks)
RECORDSET_TESTS=$(E2EDrecordset) $(E2ErecordsetSavedQuery) $(E2EDrecordsetIndFacet) $(E2EDrecordsetHistFacet)
RECORDSET_TESTS=$(E2EDrecordset) $(E2ErecordsetAdd) $(E2EDrecordsetEdit) $(E2ErecordsetSavedQuery) $(E2EDrecordsetIndFacet) $(E2EDrecordsetHistFacet)
RECORDADD_TESTS=$(E2EDIrecordAdd) $(E2EDIrecordMultiFormInput) $(E2ErecordEditForeignKeyDropdown) $(E2EDrecordEditCompositeKey)
RECORDEDIT_TESTS=$(E2EDIrecordEdit) $(E2EDrecordEditNullValues) $(E2ErecordEditInputIframe) $(E2EDrecordEditDomainFilter)
PERMISSIONS_TESTS=$(E2EmultiPermissionsVisibility)
Expand Down Expand Up @@ -170,9 +169,6 @@ testpermissions:test-PERMISSIONS_TESTS
.PHONY: testrecordset
testrecordset: test-RECORDSET_TESTS

.PHONY: testrecordset-protractor
testrecordset-protractor: test_protractor-RECORDSET_TESTS_PROTRACTOR

#Rule to run the default chaise configuration tests in parallel
.PHONY: testfooter
testfooter: test-FOOTER_TESTS
Expand Down
8 changes: 8 additions & 0 deletions test/e2e/locators/recordset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ export default class RecordsetLocators {
return this.getPageTitleElement(container).locator('.chaise-icon-for-tooltip');
}

static getPageTitleInlineComment(container: Page | Locator): Locator {
return this.getPageTitleElement(container).locator('.inline-tooltip');
};

static getPermalinkButton(container: Page | Locator): Locator {
return container.locator('#permalink');
}
Expand Down Expand Up @@ -269,6 +273,10 @@ export default class RecordsetLocators {
return RecordsetLocators.getRows(container).nth(rowIndex).locator('td').nth(0).locator('.select-action-button');
}

static getReadMore(container: Page | Locator): Locator {
return container.locator('.readmore');
}


// ---------------- facet panel selectors ------------------ //

Expand Down
15 changes: 0 additions & 15 deletions test/e2e/specs/default-config/recordset/add.conf.js

This file was deleted.

10 changes: 10 additions & 0 deletions test/e2e/specs/default-config/recordset/add.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import getConfig from '@isrd-isi-edu/chaise/test/e2e/setup/playwright.configuration';

export default getConfig({
testName: 'default-config/recordset/add',
configFileName: 'recordset/add.dev.json',
mainSpecName: 'default-config',
testMatch: [
'add.spec.ts'
]
});
188 changes: 0 additions & 188 deletions test/e2e/specs/default-config/recordset/add.spec.js

This file was deleted.

Loading

0 comments on commit b4c1b0c

Please sign in to comment.