This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 187a7ac0546 kie-issues#1353: New Test Scenario Editor: It's not
possible to remove the Last column of a GIVEN / EXPECT group (#2970)
187a7ac0546 is described below
commit 187a7ac05469de7e8805d767a49d61409e053076
Author: Yeser Amer <[email protected]>
AuthorDate: Fri Mar 7 22:49:49 2025 +0100
kie-issues#1353: New Test Scenario Editor: It's not possible to remove the
Last column of a GIVEN / EXPECT group (#2970)
Co-authored-by: Tiago Bento <[email protected]>
---
packages/scesim-editor/src/mutations/addColumn.ts | 184 +++++++++------------
.../scesim-editor/src/table/TestScenarioTable.tsx | 165 +++++++++++++++---
.../features/selection/contextMenu.spec.ts | 13 +-
.../backgroundTable/contextMenu.spec.ts | 4 +-
.../testScenarioTable/contextMenu.spec.ts | 20 +--
5 files changed, 243 insertions(+), 143 deletions(-)
diff --git a/packages/scesim-editor/src/mutations/addColumn.ts
b/packages/scesim-editor/src/mutations/addColumn.ts
index 4e850e4cb76..1791db1fe62 100644
--- a/packages/scesim-editor/src/mutations/addColumn.ts
+++ b/packages/scesim-editor/src/mutations/addColumn.ts
@@ -24,32 +24,78 @@ import {
SceSim__FactMappingType,
SceSim__FactMappingValuesTypes,
} from "@kie-tools/scesim-marshaller/dist/schemas/scesim-1_8/ts-gen/types";
-import { InsertRowColumnsDirection } from
"@kie-tools/boxed-expression-component/dist/api/BeeTable";
-export function addColumn({
- beforeIndex,
+/* To be called to create a new Column with a defined Instance and undefined
Property */
+export function addColumnWithEmptyProperty({
+ expressionElementsSteps,
+ expressionIdentifierType,
+ factAlias,
+ factIdentifierClassName,
+ factIdentifierName,
factMappings,
- factMappingValues,
- insertDirection,
- isInstance,
- selectedColumnFactMappingIndex,
+ factMappingValuesTypes,
+ targetColumnIndex,
}: {
- beforeIndex: number;
+ expressionElementsSteps: string[];
+ expressionIdentifierType: string;
+ factAlias: string;
+ factIdentifierClassName: string;
+ factIdentifierName: string;
factMappings: SceSim__FactMappingType[];
- factMappingValues: SceSim__FactMappingValuesTypes[];
- insertDirection: InsertRowColumnsDirection;
- isInstance: boolean;
- selectedColumnFactMappingIndex: number;
+ factMappingValuesTypes: SceSim__FactMappingValuesTypes[];
+ targetColumnIndex: number;
}) {
- const selectedColumnFactMapping =
factMappings[selectedColumnFactMappingIndex];
- const targetColumnIndex = determineNewColumnTargetIndex(
- factMappings,
- insertDirection,
- isInstance,
- selectedColumnFactMappingIndex,
- selectedColumnFactMapping
- );
+ addColumn({
+ expressionElementsSteps,
+ expressionIdentifierType,
+ factAlias,
+ factIdentifierClassName,
+ factIdentifierName,
+ factMappings: factMappings,
+ factMappingValuesTypes,
+ targetColumnIndex,
+ });
+}
+
+/* To be called to create a new undefined Column, i.e. with a undefined
Instance and undefined Property */
+export function addColumnWithEmptyInstanceAndProperty({
+ expressionIdentifierType,
+ factMappings,
+ factMappingValuesTypes,
+ targetColumnIndex,
+}: {
+ expressionIdentifierType: string;
+ factMappings: SceSim__FactMappingType[];
+ factMappingValuesTypes: SceSim__FactMappingValuesTypes[];
+ targetColumnIndex: number;
+}) {
+ addColumn({
+ expressionIdentifierType,
+ factMappings: factMappings,
+ factMappingValuesTypes,
+ targetColumnIndex,
+ });
+}
+function addColumn({
+ expressionElementsSteps,
+ expressionIdentifierType,
+ factAlias,
+ factIdentifierClassName,
+ factIdentifierName,
+ factMappings,
+ factMappingValuesTypes,
+ targetColumnIndex,
+}: {
+ expressionElementsSteps?: string[];
+ expressionIdentifierType: string;
+ factAlias?: string;
+ factIdentifierClassName?: string;
+ factIdentifierName?: string;
+ factMappings: SceSim__FactMappingType[];
+ factMappingValuesTypes: SceSim__FactMappingValuesTypes[];
+ targetColumnIndex: number;
+}) {
const instanceDefaultNames = factMappings
.filter((factMapping) =>
factMapping.factAlias!.__$$text.startsWith("INSTANCE-"))
.map((factMapping) => factMapping.factAlias!.__$$text);
@@ -58,40 +104,30 @@ export function addColumn({
.filter((factMapping) =>
factMapping.expressionAlias?.__$$text.startsWith("PROPERTY-"))
.map((factMapping) => factMapping.expressionAlias!.__$$text);
- const isNewInstance = isInstance ||
selectedColumnFactMapping.factIdentifier.className?.__$$text ===
"java.lang.Void";
-
const newFactMapping = {
className: { __$$text: "java.lang.Void" },
columnWidth: { __$$text: 150 },
expressionAlias: { __$$text:
getNextAvailablePrefixedName(propertyDefaultNames, "PROPERTY") },
- expressionElements: isNewInstance
- ? undefined
- : {
- ExpressionElement: [
- {
- step: {
- __$$text:
selectedColumnFactMapping.expressionElements!.ExpressionElement![0].step.__$$text,
- },
- },
- ],
- },
+ expressionElements: expressionElementsSteps
+ ? {
+ ExpressionElement: expressionElementsSteps.map((ee) => {
+ return { step: { __$$text: ee } };
+ }),
+ }
+ : undefined,
expressionIdentifier: {
name: { __$$text: `_${uuid()}`.toLocaleUpperCase() },
- type: { __$$text:
selectedColumnFactMapping.expressionIdentifier.type!.__$$text },
+ type: { __$$text: expressionIdentifierType },
},
factAlias: {
- __$$text: isNewInstance
- ? getNextAvailablePrefixedName(instanceDefaultNames, "INSTANCE")
- : selectedColumnFactMapping.factAlias.__$$text,
+ __$$text: factAlias ??
getNextAvailablePrefixedName(instanceDefaultNames, "INSTANCE"),
},
factIdentifier: {
name: {
- __$$text: isNewInstance
- ? getNextAvailablePrefixedName(instanceDefaultNames, "INSTANCE")
- : selectedColumnFactMapping.factIdentifier.name!.__$$text,
+ __$$text: factIdentifierName ??
getNextAvailablePrefixedName(instanceDefaultNames, "INSTANCE"),
},
className: {
- __$$text: isNewInstance ? "java.lang.Void" :
selectedColumnFactMapping.factIdentifier.className!.__$$text,
+ __$$text: factIdentifierClassName ?? "java.lang.Void",
},
},
factMappingValueType: { __$$text: "NOT_EXPRESSION" },
@@ -99,8 +135,8 @@ export function addColumn({
factMappings.splice(targetColumnIndex, 0, newFactMapping);
- factMappingValues.forEach((scenario) => {
- scenario.factMappingValues.FactMappingValue!.splice(beforeIndex + 1, 0, {
+ factMappingValuesTypes.forEach((fmvt) => {
+ fmvt.factMappingValues.FactMappingValue!.splice(targetColumnIndex, 0, {
expressionIdentifier: {
name: { __$$text: newFactMapping.expressionIdentifier.name.__$$text },
type: { __$$text: newFactMapping.expressionIdentifier.type.__$$text },
@@ -114,68 +150,6 @@ export function addColumn({
});
}
-/* It determines in which index position a column should be added. In case of
a field, the new column index is simply
- in the right or in the left of the selected column. In case of a new
instance, it's required to find the first column
- index outside the selected Instance group. */
-const determineNewColumnTargetIndex = (
- factMappings: SceSim__FactMappingType[],
- insertDirection: InsertRowColumnsDirection,
- isInstance: boolean,
- selectedColumnIndex: number,
- selectedFactMapping: SceSim__FactMappingType
-) => {
- const groupType = selectedFactMapping.expressionIdentifier.type!.__$$text;
- const instanceName = selectedFactMapping.factIdentifier.name!.__$$text;
- const instanceType = selectedFactMapping.factIdentifier.className!.__$$text;
-
- if (!isInstance) {
- if (insertDirection === InsertRowColumnsDirection.AboveOrRight) {
- return selectedColumnIndex + 1;
- } else {
- return selectedColumnIndex;
- }
- }
-
- let newColumnTargetColumn = -1;
-
- if (insertDirection === InsertRowColumnsDirection.AboveOrRight) {
- for (let i = selectedColumnIndex; i < factMappings.length; i++) {
- const currentFM = factMappings[i];
- if (
- currentFM.expressionIdentifier.type!.__$$text === groupType &&
- currentFM.factIdentifier.name?.__$$text === instanceName &&
- currentFM.factIdentifier.className?.__$$text === instanceType
- ) {
- if (i == factMappings.length - 1) {
- newColumnTargetColumn = i + 1;
- }
- } else {
- newColumnTargetColumn = i;
- break;
- }
- }
- } else {
- for (let i = selectedColumnIndex; i >= 0; i--) {
- const currentFM = factMappings[i];
-
- if (
- currentFM.expressionIdentifier.type!.__$$text === groupType &&
- currentFM.factIdentifier.name?.__$$text === instanceName &&
- currentFM.factIdentifier.className?.__$$text === instanceType
- ) {
- if (i == 0) {
- newColumnTargetColumn = 0;
- }
- } else {
- newColumnTargetColumn = i + 1;
- break;
- }
- }
- }
-
- return newColumnTargetColumn;
-};
-
const getNextAvailablePrefixedName = (
names: string[],
namePrefix: string,
diff --git a/packages/scesim-editor/src/table/TestScenarioTable.tsx
b/packages/scesim-editor/src/table/TestScenarioTable.tsx
index 414d9d7aa82..94aedda0309 100644
--- a/packages/scesim-editor/src/table/TestScenarioTable.tsx
+++ b/packages/scesim-editor/src/table/TestScenarioTable.tsx
@@ -47,7 +47,7 @@ import {
import { useTestScenarioEditorI18n } from "../i18n";
import { useTestScenarioEditorStore, useTestScenarioEditorStoreApi } from
"../store/TestScenarioStoreContext";
-import { addColumn } from "../mutations/addColumn";
+import { addColumnWithEmptyInstanceAndProperty, addColumnWithEmptyProperty }
from "../mutations/addColumn";
import { deleteColumn } from "../mutations/deleteColumn";
import "./TestScenarioTable.css";
@@ -334,23 +334,19 @@ function TestScenarioTable({
const isInstance =
conditions.column?.groupType ===
TestScenarioTableColumnInstanceGroup.EXPECT ||
conditions.column?.groupType ===
TestScenarioTableColumnInstanceGroup.GIVEN;
+ const isOther = conditions.column?.groupType ===
TestScenarioTableColumnFieldGroup.OTHER;
if (!conditions.selection.selectionStart ||
!conditions.selection.selectionEnd || isHeader) {
return [];
}
const columnIndex = conditions.selection.selectionStart.columnIndex;
- const groupType = conditions.column?.groupType;
-
- const atLeastTwoColumnsOfTheSameGroupType = groupType
- ? _.groupBy(conditions.columns, (column) =>
column?.groupType)[groupType].length > 1
- : true;
const columnCanBeDeleted =
+ !isOther &&
columnIndex > 0 &&
- atLeastTwoColumnsOfTheSameGroupType &&
((isBackground && (conditions.columns?.length ?? 0) > 1) ||
- (!isBackground && columnIndex > 0 && (conditions.columns?.length ??
0) > 4));
+ (!isBackground && columnIndex > 0 && (conditions.columns?.length ??
0) > 2));
const columnsWithNoOperations = isBackground ? [0] : [0, 1];
const columnOperations = (isInstance ? columnIndex in [0] : columnIndex
in columnsWithNoOperations)
@@ -377,14 +373,19 @@ function TestScenarioTable({
BeeTableOperation.RowInsertAbove,
BeeTableOperation.RowInsertBelow,
BeeTableOperation.RowInsertN,
- ...(tableRows.length > 1 ? [BeeTableOperation.RowDelete] : []),
+ BeeTableOperation.RowDelete,
BeeTableOperation.RowReset,
BeeTableOperation.RowDuplicate,
]
: []),
];
},
- [isBackground, TestScenarioTableColumnHeaderGroup,
TestScenarioTableColumnInstanceGroup, tableRows.length]
+ [
+ TestScenarioTableColumnHeaderGroup,
+ TestScenarioTableColumnInstanceGroup,
+ TestScenarioTableColumnFieldGroup,
+ isBackground,
+ ]
);
const generateOperationConfig = useCallback(
@@ -524,6 +525,68 @@ function TestScenarioTable({
[isBackground, tableColumns.instancesGroup]
);
+ /* It determines in which index position a column should be added. In case
of a field, the new column index is simply
+ in the right or in the left of the selected column. In case of a new
instance, it's required to find the first column
+ index outside the selected Instance group. */
+ const determineNewColumnTargetIndex = (
+ factMappings: SceSim__FactMappingType[],
+ insertDirection: InsertRowColumnsDirection,
+ isInstance: boolean,
+ selectedColumnIndex: number,
+ selectedFactMapping: SceSim__FactMappingType
+ ) => {
+ const groupType = selectedFactMapping.expressionIdentifier.type!.__$$text;
+ const instanceName = selectedFactMapping.factIdentifier.name!.__$$text;
+ const instanceType =
selectedFactMapping.factIdentifier.className!.__$$text;
+
+ if (!isInstance) {
+ if (insertDirection === InsertRowColumnsDirection.AboveOrRight) {
+ return selectedColumnIndex + 1;
+ } else {
+ return selectedColumnIndex;
+ }
+ }
+
+ let newColumnTargetColumn = -1;
+
+ if (insertDirection === InsertRowColumnsDirection.AboveOrRight) {
+ for (let i = selectedColumnIndex; i < factMappings.length; i++) {
+ const currentFM = factMappings[i];
+ if (
+ currentFM.expressionIdentifier.type!.__$$text === groupType &&
+ currentFM.factIdentifier.name?.__$$text === instanceName &&
+ currentFM.factIdentifier.className?.__$$text === instanceType
+ ) {
+ if (i == factMappings.length - 1) {
+ newColumnTargetColumn = i + 1;
+ }
+ } else {
+ newColumnTargetColumn = i;
+ break;
+ }
+ }
+ } else {
+ for (let i = selectedColumnIndex; i >= 0; i--) {
+ const currentFM = factMappings[i];
+
+ if (
+ currentFM.expressionIdentifier.type!.__$$text === groupType &&
+ currentFM.factIdentifier.name?.__$$text === instanceName &&
+ currentFM.factIdentifier.className?.__$$text === instanceType
+ ) {
+ if (i == 0) {
+ newColumnTargetColumn = 0;
+ }
+ } else {
+ newColumnTargetColumn = i + 1;
+ break;
+ }
+ }
+ }
+
+ return newColumnTargetColumn;
+ };
+
/**
* It adds a new FactMapping (Column) in the Model Descriptor structure and
adds the new column related FactMapping Value (Cell)
*/
@@ -555,16 +618,43 @@ function TestScenarioTable({
const factMappingValues = isBackground
?
state.scesim.model.ScenarioSimulationModel.background.scesimData.BackgroundData!
:
state.scesim.model.ScenarioSimulationModel.simulation.scesimData.Scenario!;
+ const selectedColumnFactMappingIndex = determineSelectedColumnIndex(
+ factMappings,
+ args.currentIndex,
+ isInstance
+ );
+
+ const selectedColumnFactMapping =
factMappings[selectedColumnFactMappingIndex];
+ const targetColumnIndex = determineNewColumnTargetIndex(
+ factMappings,
+ args.insertDirection,
+ isInstance,
+ selectedColumnFactMappingIndex,
+ selectedColumnFactMapping
+ );
+ const isNewInstance =
+ isInstance ||
selectedColumnFactMapping.factIdentifier.className?.__$$text ===
"java.lang.Void";
for (let columnIndex = 0; columnIndex < args.columnsCount;
columnIndex++) {
- addColumn({
- beforeIndex: args.beforeIndex,
- factMappings: factMappings,
- factMappingValues: factMappingValues,
- isInstance: isInstance,
- insertDirection: args.insertDirection,
- selectedColumnFactMappingIndex:
determineSelectedColumnIndex(factMappings, args.currentIndex, isInstance),
- });
+ isNewInstance
+ ? addColumnWithEmptyInstanceAndProperty({
+ expressionIdentifierType:
selectedColumnFactMapping.expressionIdentifier.type!.__$$text,
+ factMappings: factMappings,
+ factMappingValuesTypes: factMappingValues,
+ targetColumnIndex: targetColumnIndex + columnIndex,
+ })
+ : addColumnWithEmptyProperty({
+ expressionElementsSteps: [
+
selectedColumnFactMapping.expressionElements!.ExpressionElement![0].step.__$$text,
+ ],
+ expressionIdentifierType:
selectedColumnFactMapping.expressionIdentifier.type!.__$$text,
+ factAlias: selectedColumnFactMapping.factAlias.__$$text,
+ factIdentifierClassName:
selectedColumnFactMapping.factIdentifier.className!.__$$text,
+ factIdentifierName:
selectedColumnFactMapping.factIdentifier.name!.__$$text,
+ factMappings: factMappings,
+ factMappingValuesTypes: factMappingValues,
+ targetColumnIndex: targetColumnIndex + columnIndex,
+ });
}
});
},
@@ -595,6 +685,7 @@ function TestScenarioTable({
const isInstance =
args.groupType === TestScenarioTableColumnInstanceGroup.EXPECT ||
args.groupType === TestScenarioTableColumnInstanceGroup.GIVEN;
+
testScenarioEditorStoreApi.setState((state) => {
const factMappings = isBackground
?
state.scesim.model.ScenarioSimulationModel.background.scesimModelDescriptor.factMappings.FactMapping!
@@ -603,6 +694,8 @@ function TestScenarioTable({
?
state.scesim.model.ScenarioSimulationModel.background.scesimData.BackgroundData!
:
state.scesim.model.ScenarioSimulationModel.simulation.scesimData.Scenario!;
const factMappingIndexToRemove =
determineSelectedColumnIndex(factMappings, args.columnIndex + 1, isInstance);
+ const factMappingExpressionIdentifierTypeToRemove =
+
factMappings[factMappingIndexToRemove].expressionIdentifier.type!.__$$text;
const { deletedFactMappingIndexs } = deleteColumn({
factMappingIndexToRemove: factMappingIndexToRemove,
@@ -613,13 +706,32 @@ function TestScenarioTable({
selectedColumnIndex: args.columnIndex,
});
- /** Updating the selectedColumn. When deleting, BEETable automatically
shifts the selected cell in the left */
- const firstIndexOnTheLeft = Math.min(...deletedFactMappingIndexs);
- const selectedColumnIndex = firstIndexOnTheLeft > 0 ?
firstIndexOnTheLeft - 1 : 0;
+ /* If the last elements of factMappingGroup (i.e. "EXPECT" or "GIVEN")
has been removed,
+ a new empty Instance must be created */
+ const factMappingGroupElementsAfterRemoval = _.groupBy(
+ factMappings,
+ (factMapping) => factMapping.expressionIdentifier.type!.__$$text
+ )[factMappingExpressionIdentifierTypeToRemove];
+ const isAtLeastOneGroupElementPresent =
+ !!factMappingGroupElementsAfterRemoval &&
factMappingGroupElementsAfterRemoval.length > 0;
+
+ /* If all element of a group (i.e. "EXPECT" or "GIVEN") are deleted, a
new empty column is created for that group */
+ if (!isAtLeastOneGroupElementPresent) {
+ addColumnWithEmptyInstanceAndProperty({
+ expressionIdentifierType:
factMappingExpressionIdentifierTypeToRemove,
+ factMappings: factMappings,
+ factMappingValuesTypes: factMappingValues,
+ targetColumnIndex: Math.min(...deletedFactMappingIndexs),
+ });
+ }
+
+ /** Updating the selectedColumn. When deleting, BEETable automatically
shifts the selected cell in the left. */
+ const firstRemovedIndex = Math.min(...deletedFactMappingIndexs);
+ const selectedColumnIndex = Math.max(0, firstRemovedIndex - 1);
state.dispatch(state).table.updateSelectedColumn({
- factMapping:
JSON.parse(JSON.stringify(factMappings[selectedColumnIndex])),
- index: firstIndexOnTheLeft,
+ factMapping: _.cloneDeep(factMappings[selectedColumnIndex]),
+ index: selectedColumnIndex,
isBackground: isBackground,
});
});
@@ -667,6 +779,13 @@ function TestScenarioTable({
const factMappingValues =
state.scesim.model.ScenarioSimulationModel.simulation.scesimData.Scenario!;
deleteRow({ rowIndex: args.rowIndex, factMappingValues:
factMappingValues });
+
+ /* If all rows (i.e. factMappingValues) have been deleted, a new row
is added */
+ if (factMappingValues.length === 0) {
+ const factMappings =
+
state.scesim.model.ScenarioSimulationModel.simulation.scesimModelDescriptor.factMappings.FactMapping!;
+ addRow({ beforeIndex: args.rowIndex, factMappings: factMappings,
factMappingValues: factMappingValues });
+ }
});
},
[isBackground, testScenarioEditorStoreApi]
diff --git
a/packages/scesim-editor/tests-e2e/features/selection/contextMenu.spec.ts
b/packages/scesim-editor/tests-e2e/features/selection/contextMenu.spec.ts
index 0e7642b26fe..2ef819125ce 100644
--- a/packages/scesim-editor/tests-e2e/features/selection/contextMenu.spec.ts
+++ b/packages/scesim-editor/tests-e2e/features/selection/contextMenu.spec.ts
@@ -17,6 +17,7 @@
* under the License.
*/
+import { TestAnnotations } from "@kie-tools/playwright-base/annotations";
import { test, expect } from "../../__fixtures__/base";
import { MenuItem } from "../../__fixtures__/contextMenu";
import { AssetType } from "../../__fixtures__/editor";
@@ -38,7 +39,11 @@ test.describe("Selection", () => {
});
test("should use copy from selection context menu", async ({ clipboard,
contextMenu, table }) => {
- test.skip(true, "getCell() relies on an inconsistent API");
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
+ test.info().annotations.push({
+ type: TestAnnotations.REGRESSION,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
+ });
await contextMenu.openOnCell({ rowNumber: "1", columnNumber: 1 });
await contextMenu.clickMenuItem({ menuItem: MenuItem.COPY });
@@ -52,7 +57,11 @@ test.describe("Selection", () => {
});
test("should use cut from selection context menu", async ({ clipboard,
contextMenu, table }) => {
- test.skip(true, "getCell() relies on an inconsistent API");
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
+ test.info().annotations.push({
+ type: TestAnnotations.REGRESSION,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
+ });
await expect(table.getCell({ rowNumber: "1", columnNumber: 1
})).toContainText("test");
await contextMenu.openOnCell({ rowNumber: "1", columnNumber: 1 });
diff --git
a/packages/scesim-editor/tests-e2e/scesimEditor/backgroundTable/contextMenu.spec.ts
b/packages/scesim-editor/tests-e2e/scesimEditor/backgroundTable/contextMenu.spec.ts
index 503408d1078..63b33aed9b6 100644
---
a/packages/scesim-editor/tests-e2e/scesimEditor/backgroundTable/contextMenu.spec.ts
+++
b/packages/scesim-editor/tests-e2e/scesimEditor/backgroundTable/contextMenu.spec.ts
@@ -141,7 +141,6 @@ test.describe("Background table context menu", () => {
contextMenu,
table,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
@@ -161,7 +160,6 @@ test.describe("Background table context menu", () => {
contextMenu,
table,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
@@ -171,7 +169,7 @@ test.describe("Background table context menu", () => {
await contextMenu.clickMenuItem({ menuItem: MenuItem.DELETE_FIELD });
await expect(table.getColumnHeader({ name: "INSTANCE-1 (<Undefined>)"
})).not.toBeAttached();
await expect(table.getColumnHeader({ name: "INSTANCE-2 (<Undefined>)"
})).toBeAttached();
- await contextMenu.openOnColumnHeader({ name: "PROPERTY-1 (<Undefined>)",
columnNumber: 0 });
+ await contextMenu.openOnColumnHeader({ name: "PROPERTY-2 (<Undefined>)",
columnNumber: 0 });
await contextMenu.clickMenuItem({ menuItem: MenuItem.DELETE_FIELD });
await expect(table.getColumnHeader({ name: "INSTANCE-2 (<Undefined>)"
})).not.toBeAttached();
await expect(table.getColumnHeader({ name: "INSTANCE-1 (<Undefined>)"
})).toBeAttached();
diff --git
a/packages/scesim-editor/tests-e2e/scesimEditor/testScenarioTable/contextMenu.spec.ts
b/packages/scesim-editor/tests-e2e/scesimEditor/testScenarioTable/contextMenu.spec.ts
index 0f18691e096..dc361eeab3f 100644
---
a/packages/scesim-editor/tests-e2e/scesimEditor/testScenarioTable/contextMenu.spec.ts
+++
b/packages/scesim-editor/tests-e2e/scesimEditor/testScenarioTable/contextMenu.spec.ts
@@ -205,10 +205,10 @@ test.describe("Test scenario table context menu", () => {
contextMenu,
table,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
- description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
});
await expect(table.getCell({ rowNumber: "1", columnNumber: 1
})).toContainText("test");
@@ -221,10 +221,10 @@ test.describe("Test scenario table context menu", () => {
contextMenu,
table,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
- description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
});
await expect(table.getCell({ rowNumber: "1", columnNumber: 1
})).toContainText("test");
@@ -238,10 +238,10 @@ test.describe("Test scenario table context menu", () => {
table,
testScenarioTable,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
- description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
});
await testScenarioTable.fill({ content: "test", rowLocatorInfo: "1 test
test", columnNumber: 2 });
@@ -255,10 +255,10 @@ test.describe("Test scenario table context menu", () => {
table,
testScenarioTable,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
- description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
});
await testScenarioTable.fill({ content: "test", rowLocatorInfo: "1 test
test", columnNumber: 2 });
@@ -271,10 +271,10 @@ test.describe("Test scenario table context menu", () => {
contextMenu,
table,
}) => {
- test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1353";);
+ test.skip(true,
"https://github.com/apache/incubator-kie-issues/issues/1861";);
test.info().annotations.push({
type: TestAnnotations.REGRESSION,
- description:
"https://github.com/apache/incubator-kie-issues/issues/1353";,
+ description:
"https://github.com/apache/incubator-kie-issues/issues/1861";,
});
await expect(table.getCell({ rowNumber: "1", columnNumber: 1
})).toContainText("test");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
