Skip to content

Commit

Permalink
fix bugs in test cases and update config value to be 'more' removed f…
Browse files Browse the repository at this point in the history
…rom catalog IDs used in github actions
  • Loading branch information
jrchudy committed Aug 14, 2024
1 parent a73de5f commit 5f63d11
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion test/e2e/specs/all-features-confirmation/chaise-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ const testParams: any = {
canEdit: true,
canCreate: false,
isInline: true,
isTableMode: false,
viewMore: {
displayname: 'accommodation_collections',
filter: 'AccommodationsSherathon Hotel'
Expand All @@ -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',
Expand Down Expand Up @@ -137,6 +139,7 @@ const testParams: any = {
canCreate: true,
canDelete: true, // NOTE: was canUnlink
isInline: true,
isTableMode: false,
viewMore: {
name: 'file',
displayname: 'file',
Expand Down Expand Up @@ -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(['*']);
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/all-features/record/related-table.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/utils/record-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down

0 comments on commit 5f63d11

Please sign in to comment.