Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions packages/compass-e2e-tests/tests/data-modeling-tab.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,23 @@ async function setupDiagram(
await dataModelEditor.waitForDisplayed();
}

async function getDiagramNodes(browser: CompassBrowser): Promise<Node[]> {
const nodes = await browser.execute(function (selector) {
const node = document.querySelector(selector);
if (!node) {
throw new Error(`Element with selector ${selector} not found`);
}
return (
node as Element & { _diagram: DiagramInstance }
)._diagram.getNodes();
}, Selectors.DataModelEditor);
async function getDiagramNodes(
browser: CompassBrowser,
expectedCount: number
): Promise<Node[]> {
let nodes: Node[] = [];
await browser.waitUntil(async () => {
nodes = await browser.execute(function (selector) {
const node = document.querySelector(selector);
if (!node) {
throw new Error(`Element with selector ${selector} not found`);
}
return (
node as Element & { _diagram: DiagramInstance }
)._diagram.getNodes();
}, Selectors.DataModelEditor);
return nodes.length === expectedCount;
});
return nodes;
}

Expand Down Expand Up @@ -172,7 +179,7 @@ describe('Data Modeling tab', function () {
const dataModelEditor = browser.$(Selectors.DataModelEditor);
await dataModelEditor.waitForDisplayed();

const nodes = await getDiagramNodes(browser);
const nodes = await getDiagramNodes(browser, 2);
expect(nodes).to.have.lengthOf(2);
expect(nodes[0].id).to.equal('test.testCollection-one');
expect(nodes[1].id).to.equal('test.testCollection-two');
Expand Down Expand Up @@ -215,7 +222,7 @@ describe('Data Modeling tab', function () {
await browser.$(Selectors.DataModelEditor).waitForDisplayed();

// TODO: Verify that the diagram has the latest changes COMPASS-9479
const savedNodes = await getDiagramNodes(browser);
const savedNodes = await getDiagramNodes(browser, 2);
expect(savedNodes).to.have.lengthOf(2);

// Open a new tab
Expand Down Expand Up @@ -437,7 +444,7 @@ describe('Data Modeling tab', function () {

await browser.selectFile(Selectors.ImportDataModelInput, filePath);
await browser.$(Selectors.DataModelEditor).waitForDisplayed();
const savedNodes = await getDiagramNodes(browser);
const savedNodes = await getDiagramNodes(browser, 2);

expect(savedNodes).to.have.lengthOf(2);
expect(savedNodes[0].id).to.equal('test.testCollection-one');
Expand Down
Loading