Skip to content

Commit 010de5a

Browse files
committed
update e2e tests
1 parent 8f8b7b2 commit 010de5a

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

packages/compass-e2e-tests/helpers/selectors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ export const UpdateValidationButton =
11511151
'[data-testid="update-validation-button"]';
11521152
export const ValidationMatchingDocumentsPreview =
11531153
'[data-testid="validation-content"] [data-testid="matching-documents"] [data-testid="document-preview"]';
1154-
export const ValidationLoadMatchingDocumentsBtn = `${ValidationMatchingDocumentsPreview} [data-testid="load-sample-document"]`;
1154+
export const ValidationLoadSampleDocumentsBtn = `[data-testid="load-sample-documents"]`;
11551155
export const ValidationNotMatchingDocumentsPreview =
11561156
'[data-testid="validation-content"] [data-testid="notmatching-documents"] [data-testid="document-preview"]';
11571157
export const ValidationLoadNotMatchingDocumentsBtn = `${ValidationNotMatchingDocumentsPreview} [data-testid="load-sample-document"]`;

packages/compass-e2e-tests/tests/collection-validation-tab.test.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import * as Selectors from '../helpers/selectors';
1010
import { createNumbersCollection } from '../helpers/insert-data';
1111

1212
const NO_PREVIEW_DOCUMENTS = 'No Preview Documents';
13-
const LOAD_SAMPLE_DOCUMENT = 'Load document';
1413
const PASSING_VALIDATOR = '{ $jsonSchema: {} }';
1514
const FAILING_VALIDATOR =
1615
'{ $jsonSchema: { bsonType: "object", required: [ "phone" ] } }';
@@ -54,9 +53,11 @@ describe('Collection validation tab', function () {
5453
}
5554

5655
context('when the schema validation is set or modified', function () {
57-
it('provides users with a button to load sample documents', async function () {
56+
it('provides users with a single button to load sample documents', async function () {
5857
await addValidation(PASSING_VALIDATOR);
5958

59+
await browser.clickVisible(Selectors.ValidationLoadSampleDocumentsBtn);
60+
6061
await browser.waitUntil(async () => {
6162
const matchTextElement = browser.$(
6263
Selectors.ValidationMatchingDocumentsPreview
@@ -67,18 +68,15 @@ describe('Collection validation tab', function () {
6768
);
6869
const notMatchingText = await notMatchingTextElement.getText();
6970
return (
70-
matchText === LOAD_SAMPLE_DOCUMENT &&
71-
notMatchingText === LOAD_SAMPLE_DOCUMENT
71+
matchText.includes('ObjectId(') &&
72+
notMatchingText === NO_PREVIEW_DOCUMENTS
7273
);
7374
});
7475
});
7576

7677
it('supports rules in JSON schema', async function () {
7778
await addValidation(FAILING_VALIDATOR);
78-
await browser.clickVisible(Selectors.ValidationLoadMatchingDocumentsBtn);
79-
await browser.clickVisible(
80-
Selectors.ValidationLoadNotMatchingDocumentsBtn
81-
);
79+
await browser.clickVisible(Selectors.ValidationLoadSampleDocumentsBtn);
8280

8381
// nothing passed, everything failed
8482
await browser.waitUntil(async () => {
@@ -100,10 +98,7 @@ describe('Collection validation tab', function () {
10098

10199
// the automatic indentation and brackets makes multi-line values very fiddly here
102100
await browser.setValidation(PASSING_VALIDATOR);
103-
await browser.clickVisible(Selectors.ValidationLoadMatchingDocumentsBtn);
104-
await browser.clickVisible(
105-
Selectors.ValidationLoadNotMatchingDocumentsBtn
106-
);
101+
await browser.clickVisible(Selectors.ValidationLoadSampleDocumentsBtn);
107102

108103
// nothing failed, everything passed
109104
await browser.waitUntil(async () => {

packages/compass-schema-validation/src/components/sample-documents.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,11 @@ const InitialState: React.FC<{
159159
This section displays one document that passed validation and one that
160160
failed validation.
161161
</div>
162-
<Button onClick={onPreviewClick} variant={ButtonVariant.PrimaryOutline}>
162+
<Button
163+
onClick={onPreviewClick}
164+
variant={ButtonVariant.PrimaryOutline}
165+
data-testid="load-sample-documents"
166+
>
163167
Preview documents
164168
</Button>
165169
</div>

0 commit comments

Comments
 (0)