Skip to content

Commit 6f6ab1f

Browse files
opensearch-trigger-bot[bot]wanglam
opensearch-trigger-bot[bot]
and
wanglam
authored
Update workspace description usecase tests (#1375) (#1380)
* Remove workspace invalid description cases Signed-off-by: Lin Wang <[email protected]> * Add workspace use case test cases Signed-off-by: Lin Wang <[email protected]> * Update create workspace page title Signed-off-by: Lin Wang <[email protected]> * Update copy to Enter Details Signed-off-by: Lin Wang <[email protected]> * Add special characters and move use case out Signed-off-by: Lin Wang <[email protected]> * Remove user & permissions button Signed-off-by: Lin Wang <[email protected]> * Update expected worksapce content Signed-off-by: Lin Wang <[email protected]> --------- Signed-off-by: Lin Wang <[email protected]> (cherry picked from commit c5ae8b4) Co-authored-by: Lin Wang <[email protected]>
1 parent ab6b9bd commit 6f6ab1f

File tree

4 files changed

+67
-66
lines changed

4 files changed

+67
-66
lines changed

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_create.spec.js‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
2424
});
2525

2626
it('should successfully load the page', () => {
27-
cy.contains('Create Workspace', { timeout: 60000 });
27+
cy.contains('Create a workspace', { timeout: 60000 });
2828
});
2929

3030
describe('Create a workspace successfully', () => {
@@ -34,14 +34,13 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
3434
).type(workspaceName);
3535
cy.getElementByTestId(
3636
'workspaceForm-workspaceDetails-descriptionInputText'
37-
).type('test_workspace_description');
37+
).type('test_workspace_description.+~!');
3838
cy.getElementByTestId(
3939
'euiColorPickerAnchor workspaceForm-workspaceDetails-colorPicker'
4040
).type('#000000');
41-
cy.getElementByTestId(
42-
'workspaceForm-workspaceFeatureVisibility-OpenSearch Dashboards'
43-
).check({ force: true });
44-
cy.get('[id$="discover"]').uncheck({ force: true });
41+
cy.getElementByTestId('workspaceUseCase-observability').check({
42+
force: true,
43+
});
4544
cy.getElementByTestId('workspaceForm-bottomBar-createButton').click({
4645
force: true,
4746
});
@@ -58,12 +57,11 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
5857

5958
const expectedWorkspace = {
6059
name: workspaceName,
61-
description: 'test_workspace_description',
60+
description: 'test_workspace_description.+~!',
6261
features: [
63-
'dashboards',
64-
'visualize',
6562
'workspace_update',
6663
'workspace_overview',
64+
'use-case-observability',
6765
],
6866
};
6967
cy.checkWorkspace(workspaceId, expectedWorkspace);
@@ -102,24 +100,24 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
102100
cy.getElementByTestId(
103101
'workspaceForm-workspaceDetails-descriptionInputText'
104102
).type('test_workspace_description');
103+
cy.getElementByTestId('workspaceUseCase-observability').check({
104+
force: true,
105+
});
105106
cy.getElementByTestId('workspaceForm-bottomBar-createButton').click({
106107
force: true,
107108
});
108109
cy.contains('workspace name has already been used').should('exist');
109110
});
111+
});
110112

111-
it('workspace description is not valid', () => {
112-
cy.getElementByTestId(
113-
'workspaceForm-workspaceDetails-nameInputText'
114-
).type(workspaceName);
115-
cy.getElementByTestId(
116-
'workspaceForm-workspaceDetails-descriptionInputText'
117-
).type('./+');
118-
cy.getElementByTestId('workspaceForm-bottomBar-createButton').click({
119-
force: true,
120-
});
121-
cy.contains('Invalid workspace description').should('exist');
113+
it('workspace use case is required', () => {
114+
cy.getElementByTestId(
115+
'workspaceForm-workspaceDetails-nameInputText'
116+
).type(workspaceName);
117+
cy.getElementByTestId('workspaceForm-bottomBar-createButton').click({
118+
force: true,
122119
});
120+
cy.contains('Use case is required. Select a use case.').should('exist');
123121
});
124122

125123
if (
@@ -141,11 +139,9 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
141139
cy.getElementByTestId(
142140
'euiColorPickerAnchor workspaceForm-workspaceDetails-colorPicker'
143141
).type('#000000');
144-
cy.getElementByTestId(
145-
'workspaceForm-workspaceFeatureVisibility-OpenSearch Dashboards'
146-
).check({ force: true });
147-
cy.get('[id$="discover"]').uncheck({ force: true });
148-
cy.get('button').contains('Users & Permissions').click();
142+
cy.getElementByTestId('workspaceUseCase-observability').check({
143+
force: true,
144+
});
149145
cy.getElementByTestId(
150146
'workspaceForm-permissionSettingPanel-user-addNew'
151147
).click();
@@ -168,10 +164,9 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
168164
name: workspaceName,
169165
description: 'test_workspace_description',
170166
features: [
171-
'dashboards',
172-
'visualize',
173167
'workspace_update',
174168
'workspace_overview',
169+
'use-case-observability',
175170
],
176171
permissions: {
177172
read: {

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_dropdown_menu.spec.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
2020
cy.deleteAllWorkspaces();
2121

2222
for (const workspaceName of workspaceNames) {
23-
cy.createWorkspace({ name: workspaceName }).then((workspaceId) => {
23+
cy.createWorkspace({
24+
name: workspaceName,
25+
features: [
26+
'workspace_overview',
27+
'workspace_update',
28+
'use-case-observability',
29+
],
30+
}).then((workspaceId) => {
2431
workspaceNameIdMapping[workspaceName] = workspaceId;
2532
});
2633
}
@@ -98,7 +105,14 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
98105

99106
// Create 3 more workspaces so that there are more than 5 workspaces in the system
100107
for (const workspaceName of newWorkspaceNames) {
101-
cy.createWorkspace({ name: workspaceName });
108+
cy.createWorkspace({
109+
name: workspaceName,
110+
features: [
111+
'workspace_overview',
112+
'workspace_update',
113+
'use-case-observability',
114+
],
115+
});
102116
}
103117

104118
cy.wait(1000);

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_overview.spec.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
1919
name: workspaceName,
2020
description: workspaceDescription,
2121
features: [
22-
'management',
23-
'discover',
2422
'workspace_overview',
2523
'workspace_update',
26-
'dashboards',
27-
'visualize',
24+
'use-case-observability',
2825
],
2926
}).then((id) => {
3027
workspaceId = id;
@@ -103,7 +100,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
103100
it('should show wokrspace update when click on settings tab', () => {
104101
// click on settings tab
105102
cy.getElementByTestId('workspaceTabs').find('#settings').click();
106-
cy.contains('Workspace Details').should('be.visible');
103+
cy.contains('Enter Details').should('be.visible');
107104

108105
cy.getElementByTestId('workspaceForm-workspaceDetails-nameInputText')
109106
.clear()

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_update.spec.js‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
1212
describe('Update workspace', () => {
1313
before(() => {
1414
cy.deleteWorkspaceByName(workspaceName);
15-
cy.createWorkspace({ name: workspaceName }).then(
16-
(value) => (workspaceId = value)
17-
);
15+
cy.createWorkspace({
16+
name: workspaceName,
17+
features: [
18+
'workspace_overview',
19+
'workspace_update',
20+
'use-case-observability',
21+
],
22+
}).then((value) => (workspaceId = value));
1823
});
1924

2025
beforeEach(() => {
@@ -77,21 +82,16 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
7782
});
7883
cy.contains('Invalid workspace name').should('exist');
7984
});
85+
});
8086

81-
it('workspace description is not valid', () => {
82-
cy.getElementByTestId(
83-
'workspaceForm-workspaceDetails-descriptionInputText'
84-
).clear({
85-
force: true,
86-
});
87-
cy.getElementByTestId(
88-
'workspaceForm-workspaceDetails-descriptionInputText'
89-
).type('./+');
90-
cy.getElementByTestId('workspaceForm-bottomBar-updateButton').click({
91-
force: true,
92-
});
93-
cy.contains('Invalid workspace description').should('exist');
87+
it('workspace use case is required', () => {
88+
cy.getElementByTestId('workspaceUseCase-observability').uncheck({
89+
force: true,
90+
});
91+
cy.getElementByTestId('workspaceForm-bottomBar-updateButton').click({
92+
force: true,
9493
});
94+
cy.contains('Use case is required. Select a use case.').should('exist');
9595
});
9696

9797
describe('Update a workspace successfully', () => {
@@ -111,13 +111,13 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
111111
).type(workspaceName);
112112
cy.getElementByTestId(
113113
'workspaceForm-workspaceDetails-descriptionInputText'
114-
).type('test_workspace_description');
114+
).type('test_workspace_description.+~!');
115115
cy.getElementByTestId(
116116
'euiColorPickerAnchor workspaceForm-workspaceDetails-colorPicker'
117117
).type('#D36086');
118-
cy.getElementByTestId(
119-
'workspaceForm-workspaceFeatureVisibility-OpenSearch Dashboards'
120-
).check({ force: true });
118+
cy.getElementByTestId('workspaceUseCase-observability').check({
119+
force: true,
120+
});
121121
cy.getElementByTestId('workspaceForm-bottomBar-updateButton').click({
122122
force: true,
123123
});
@@ -130,13 +130,11 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
130130
);
131131
const expectedWorkspace = {
132132
name: workspaceName,
133-
description: 'test_workspace_description',
133+
description: 'test_workspace_description.+~!',
134134
features: [
135-
'dashboards',
136-
'visualize',
137-
'discover',
138135
'workspace_update',
139136
'workspace_overview',
137+
'use-case-observability',
140138
],
141139
};
142140
cy.checkWorkspace(workspaceId, expectedWorkspace);
@@ -148,7 +146,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
148146
Cypress.env('SECURITY_ENABLED')
149147
) {
150148
describe('Update a workspace with permissions successfully', () => {
151-
it.only('should successfully update a workspace with permissions', () => {
149+
it('should successfully update a workspace with permissions', () => {
152150
cy.getElementByTestId(
153151
'workspaceForm-workspaceDetails-nameInputText'
154152
).clear({
@@ -168,11 +166,9 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
168166
cy.getElementByTestId(
169167
'euiColorPickerAnchor workspaceForm-workspaceDetails-colorPicker'
170168
).type('#000000');
171-
cy.getElementByTestId(
172-
'workspaceForm-workspaceFeatureVisibility-OpenSearch Dashboards'
173-
).check({ force: true });
174-
cy.get('[id$="discover"]').uncheck({ force: true });
175-
cy.get('button').contains('Users & Permissions').click();
169+
cy.getElementByTestId('workspaceUseCase-observability').check({
170+
force: true,
171+
});
176172
cy.getElementByTestId(
177173
'workspaceForm-permissionSettingPanel-user-addNew'
178174
).click();
@@ -193,10 +189,9 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
193189
name: workspaceName,
194190
description: 'test_workspace_description',
195191
features: [
196-
'dashboards',
197-
'visualize',
198192
'workspace_update',
199193
'workspace_overview',
194+
'use-case-observability',
200195
],
201196
permissions: {
202197
read: {

0 commit comments

Comments
 (0)