diff --git a/Makefile b/Makefile index 1516cd2e9..47cf3c07f 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ RECORDEDIT_TESTS_PROTRACTOR=$(E2EDIrecordEdit) $(E2EDIrecordMultiEdit) $(E2EDrec DEFAULT_CONFIG_PARALLEL_TESTS_PROTRACTOR=$(DefaultConfigParallel_PROTRACTOR) ALL_FEATURES_CONFIRMATION_PARALLEL_TESTS_PROTRACTOR=$(AllFeaturesConfirmationParallel_PROTRACTOR) PARALLEL_TESTS_PROTRACTOR=$(AllFeaturesConfirmationParallel_PROTRACTOR) $(DefaultConfigParallel_PROTRACTOR) -ALL_TESTS_PROTRACTOR=$(RECORD_TESTS_PROTRACTOR) $(RECORDSET_TESTS_PROTRACTOR) $(RECORDADD_TESTS_PROTRACTOR) $(RECORDEDIT_TESTS_PROTRACTOR) +ALL_TESTS_PROTRACTOR=$(RECORDSET_TESTS_PROTRACTOR) $(RECORDADD_TESTS_PROTRACTOR) $(RECORDEDIT_TESTS_PROTRACTOR) # playwright tests NAVBAR_TESTS=$(E2Enavbar) $(E2EnavbarHeadTitle) $(E2EnavbarCatalogConfig) diff --git a/test/e2e/specs/all-features-confirmation/chaise-config.js b/test/e2e/specs/all-features-confirmation/chaise-config.js index 8d8366748..9f30100dc 100644 --- a/test/e2e/specs/all-features-confirmation/chaise-config.js +++ b/test/e2e/specs/all-features-confirmation/chaise-config.js @@ -10,7 +10,9 @@ var chaiseConfig = { // TODO: make sure this is working properly in spec maxRecordsetRowHeight: false, // triggers (ignores) some logic in ellipsis.js. Tests view buttons having proper links allowErrorDismissal : true, - resolverImplicitCatalog: 2, // in parallel config mode, this config is used first with catalog Id + // in parallel config mode, this config is used second with catalog Id 2 + // We want to ensure this value is NOT the same as the catalog used when testing + resolverImplicitCatalog: 100, systemcolumnsdisplaycompact: ['RCB', 'RMT'], //testing case-insensitive properties SystemColumnsDisplayDetailed: true, //testing case-insensitive properties systemColumnsDisplayENTRY: ['RCB', 'RMB', 'RMT'], //testing case-insensitive properties diff --git a/test/e2e/specs/all-features-confirmation/record/presentation.spec.ts b/test/e2e/specs/all-features-confirmation/record/presentation.spec.ts index 6ce5fee5a..cae469f01 100644 --- a/test/e2e/specs/all-features-confirmation/record/presentation.spec.ts +++ b/test/e2e/specs/all-features-confirmation/record/presentation.spec.ts @@ -88,6 +88,7 @@ const testParams: any = { canEdit: true, canCreate: false, isInline: true, + isTableMode: false, viewMore: { displayname: 'accommodation_collections', filter: 'AccommodationsSherathon Hotel' @@ -110,6 +111,7 @@ const testParams: any = { canEdit: true, canCreate: false, // it has filter in source, so create is disabled isInline: true, + isTableMode: false, viewMore: { name: 'table_w_aggregates', displayname: 'table_w_aggregates', @@ -137,6 +139,7 @@ const testParams: any = { canCreate: true, canDelete: true, // NOTE: was canUnlink isInline: true, + isTableMode: false, viewMore: { name: 'file', displayname: 'file', @@ -196,7 +199,7 @@ test.describe('View existing record', () => { await test.step('should load document title defined in chaise-config.js and have deleteRecord=true, resolverImplicitCatalog=2, and shareCite defined', async () => { expect.soft(cc.deleteRecord).toBeTruthy(); - expect.soft(cc.resolverImplicitCatalog).toBe(2); + expect.soft(cc.resolverImplicitCatalog).toBe(100); expect.soft(cc.shareCite).toBeDefined(); expect.soft(cc.shareCite.acls.show).toEqual(['*']); diff --git a/test/e2e/specs/all-features/record/related-table.spec.ts b/test/e2e/specs/all-features/record/related-table.spec.ts index 0f3f0e69c..07406a995 100644 --- a/test/e2e/specs/all-features/record/related-table.spec.ts +++ b/test/e2e/specs/all-features/record/related-table.spec.ts @@ -512,7 +512,7 @@ test.describe('Related tables', () => { schemaName: 'product-unordered-related-tables-links', displayname: 'association_table_markdown', tableName: 'association_table_markdown', - entityMarkdownName: '1:Television', + entityMarkdownName: ' 1:Television', // space added in markdown name since this is only tested in tooltips and some other tooltips don't have the space associationLeafTableName: 'related_table', baseTableName: 'Accommodations', isAssociation: true, diff --git a/test/e2e/utils/record-utils.ts b/test/e2e/utils/record-utils.ts index a7de35cba..a95fb92ea 100644 --- a/test/e2e/utils/record-utils.ts +++ b/test/e2e/utils/record-utils.ts @@ -388,7 +388,7 @@ export const testRelatedTablePresentation = async (page: Page, testInfo: TestInf }); await test.step('row level', async () => { - if (!params.isTableMode) { + if (params.isTableMode === false) { await test.step('make sure tabular mode is displayed', async () => { const text = await markdownToggleLink.innerText(); if (text === 'Edit mode') {