Skip to content

Commit 317f156

Browse files
ashwin-pcashwin-pc
authored
Adds linter rules for license and import. Fixes linting (opensearch-project#319)
Signed-off-by: Ashwin Pc <ashwinpc@amazon.com> Signed-off-by: Ashwin Pc <ashwinpc@amazon.com>
1 parent 4617754 commit 317f156

File tree

15 files changed

+689
-81
lines changed

15 files changed

+689
-81
lines changed

‎.eslintrc.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
{
22
"env": {
3-
"node": true
3+
"node": true
44
},
55
"extends": [
66
"eslint:recommended",
77
"plugin:cypress/recommended",
8+
"plugin:import/recommended",
89
"prettier"
910
],
1011
"plugins": [
1112
"cypress",
13+
"header",
14+
"import",
1215
"prettier"
1316
],
1417
"rules": {
1518
"prettier/prettier": "error",
19+
"header/header": [2, "block", ["", " * Copyright OpenSearch Contributors", " * SPDX-License-Identifier: Apache-2.0", " "]],
1620
// turn off no-unnecessary-waiting for now due to the issue: https://github.com/cypress-io/eslint-plugin-cypress/issues/43
1721
"cypress/no-unnecessary-waiting": "off"
18-
}
22+
},
23+
"ignorePatterns": ["**/*.d.ts"]
1924
}

‎cypress/integration/common/dashboard_sample_data_spec.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
import {
27
CommonUI,
38
MiscUtils,

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/dashboard_sanity_test_spec.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
import { dashboardSanityTests } from '../../common/dashboard_sample_data_spec.js';
27

38
dashboardSanityTests();

‎cypress/integration/core-opensearch-dashboards/vanilla-opensearch-dashboards/dashboard_filtering_spec.js

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
import {
27
TestFixtureHandler,
38
CommonUI,

‎cypress/integration/plugins/notifications-dashboards/1_email_senders_and_groups.spec.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
/// <reference types="cypress" />
77

88
import {
9-
delay,
9+
BASE_PATH,
10+
NOTIFICATIONS_DELAY,
1011
NOTIFICATIONS_PLUGIN_NAME,
11-
} from '../../../utils/plugins/notifications-dashboards/constants';
12-
import { BASE_PATH } from '../../../utils/base_constants';
12+
} from '../../../utils/constants';
1313

1414
describe('Test create email senders', () => {
1515
beforeEach(() => {
1616
cy.visit(`${BASE_PATH}/app/${NOTIFICATIONS_PLUGIN_NAME}#email-senders`);
17-
cy.wait(delay * 3);
17+
cy.wait(NOTIFICATIONS_DELAY * 3);
1818
});
1919

2020
it('creates ssl sender', () => {
@@ -56,9 +56,9 @@ describe('Test create email senders', () => {
5656
cy.get('[data-test-subj="create-sender-form-encryption-input"]').click({
5757
force: true,
5858
});
59-
cy.wait(delay);
59+
cy.wait(NOTIFICATIONS_DELAY);
6060
cy.get('.euiContextMenuItem__text').contains('TLS').click({ force: true });
61-
cy.wait(delay);
61+
cy.wait(NOTIFICATIONS_DELAY);
6262

6363
cy.get('.euiButton__text').contains('Create').click({ force: true });
6464
cy.contains('successfully created.').should('exist');
@@ -91,7 +91,7 @@ describe('Test create email senders', () => {
9191
describe('Test edit senders', () => {
9292
beforeEach(() => {
9393
cy.visit(`${BASE_PATH}/app/${NOTIFICATIONS_PLUGIN_NAME}#email-senders`);
94-
cy.wait(delay * 3);
94+
cy.wait(NOTIFICATIONS_DELAY * 3);
9595
});
9696

9797
it('edits sender email address', () => {
@@ -100,7 +100,7 @@ describe('Test edit senders', () => {
100100
cy.get('[data-test-subj="create-sender-form-email-input"]').type(
101101
'{selectall}{backspace}edited.test@email.com'
102102
);
103-
cy.wait(delay);
103+
cy.wait(NOTIFICATIONS_DELAY);
104104

105105
cy.get('.euiButton__text').contains('Save').click({ force: true });
106106
cy.contains('successfully updated.').should('exist');
@@ -112,7 +112,7 @@ describe('Test edit senders', () => {
112112
cy.get('[data-test-subj="create-ses-sender-form-aws-region-input"]').type(
113113
'{selectall}{backspace}us-west-2'
114114
);
115-
cy.wait(delay);
115+
cy.wait(NOTIFICATIONS_DELAY);
116116

117117
cy.get('.euiButton__text').contains('Save').click({ force: true });
118118
cy.contains('successfully updated.').should('exist');
@@ -122,14 +122,14 @@ describe('Test edit senders', () => {
122122
describe('Test delete senders', () => {
123123
beforeEach(() => {
124124
cy.visit(`${BASE_PATH}/app/${NOTIFICATIONS_PLUGIN_NAME}#email-senders`);
125-
cy.wait(delay * 3);
125+
cy.wait(NOTIFICATIONS_DELAY * 3);
126126
});
127127

128128
it('deletes smtp senders', () => {
129129
cy.get('.euiCheckbox__input[aria-label="Select this row"]').eq(0).click(); // ssl sender
130130
cy.get('[data-test-subj="senders-table-delete-button"]').click();
131131
cy.get('input[placeholder="delete"]').type('delete');
132-
cy.wait(delay);
132+
cy.wait(NOTIFICATIONS_DELAY);
133133
cy.get('[data-test-subj="delete-sender-modal-delete-button"]').click();
134134
cy.contains('successfully deleted.').should('exist');
135135
});
@@ -138,7 +138,7 @@ describe('Test delete senders', () => {
138138
cy.get('.euiCheckbox__input[aria-label="Select this row"]').last().click(); // ses sender
139139
cy.get('[data-test-subj="ses-senders-table-delete-button"]').click();
140140
cy.get('input[placeholder="delete"]').type('delete');
141-
cy.wait(delay);
141+
cy.wait(NOTIFICATIONS_DELAY);
142142
cy.get('[data-test-subj="delete-sender-modal-delete-button"]').click();
143143
cy.contains('successfully deleted.').should('exist');
144144

@@ -151,7 +151,7 @@ describe('Test create, edit and delete recipient group', () => {
151151
cy.visit(
152152
`${BASE_PATH}/app/${NOTIFICATIONS_PLUGIN_NAME}#email-recipient-groups`
153153
);
154-
cy.wait(delay * 3);
154+
cy.wait(NOTIFICATIONS_DELAY * 3);
155155
});
156156

157157
it('creates recipient group', () => {
@@ -185,12 +185,12 @@ describe('Test create, edit and delete recipient group', () => {
185185
cy.get('[data-test-subj="comboBoxInput"]').type(
186186
'custom.email.6@test.com{enter}'
187187
);
188-
cy.wait(delay);
188+
cy.wait(NOTIFICATIONS_DELAY);
189189

190190
cy.get('.euiButton__text').contains('Create').click({ force: true });
191191
cy.contains('successfully created.').should('exist');
192192
cy.contains('Test recipient group').should('exist');
193-
cy.wait(delay);
193+
cy.wait(NOTIFICATIONS_DELAY);
194194
});
195195

196196
it('edits recipient group description', () => {
@@ -203,7 +203,7 @@ describe('Test create, edit and delete recipient group', () => {
203203
cy.get(
204204
'[data-test-subj="create-recipient-group-form-description-input"]'
205205
).type('{selectall}{backspace}Updated group description');
206-
cy.wait(delay);
206+
cy.wait(NOTIFICATIONS_DELAY);
207207

208208
cy.get('.euiButton__text').contains('Save').click({ force: true });
209209
cy.contains('successfully updated.').should('exist');
@@ -218,7 +218,7 @@ describe('Test create, edit and delete recipient group', () => {
218218
cy.get('[data-test-subj="checkboxSelectAll"]').last().click();
219219
cy.get('[data-test-subj="recipient-groups-table-delete-button"]').click();
220220
cy.get('input[placeholder="delete"]').type('delete');
221-
cy.wait(delay);
221+
cy.wait(NOTIFICATIONS_DELAY);
222222
cy.get(
223223
'[data-test-subj="delete-recipient-group-modal-delete-button"]'
224224
).click({ force: true });

‎cypress/integration/plugins/notifications-dashboards/2_channels.spec.js

+27-27
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
/// <reference types="cypress" />
77

88
import {
9-
delay,
9+
BASE_PATH,
10+
NOTIFICATIONS_DELAY,
1011
NOTIFICATIONS_PLUGIN_NAME,
11-
} from '../../../utils/plugins/notifications-dashboards/constants';
12-
import { BASE_PATH } from '../../../utils/base_constants';
12+
} from '../../../utils/constants';
1313

1414
describe('Test create channels', () => {
1515
beforeEach(() => {
1616
cy.visit(`${BASE_PATH}/app/${NOTIFICATIONS_PLUGIN_NAME}#create-channel`);
17-
cy.wait(delay * 3);
17+
cy.wait(NOTIFICATIONS_DELAY * 3);
1818
});
1919

2020
it('creates a slack channel and send test message', () => {
@@ -25,11 +25,11 @@ describe('Test create channels', () => {
2525
cy.get('[data-test-subj="create-channel-slack-webhook-input"]').type(
2626
'https://sample-slack-webhook'
2727
);
28-
cy.wait(delay);
28+
cy.wait(NOTIFICATIONS_DELAY);
2929
cy.get('[data-test-subj="create-channel-send-test-message-button"]').click({
3030
force: true,
3131
});
32-
cy.wait(delay);
32+
cy.wait(NOTIFICATIONS_DELAY);
3333
// This needs some time to appear as it will wait for backend call to timeout
3434
cy.contains('test message.').should('exist');
3535

@@ -43,16 +43,16 @@ describe('Test create channels', () => {
4343
cy.get('[placeholder="Enter channel name"]').type('Test chime channel');
4444

4545
cy.get('.euiSuperSelectControl').contains('Slack').click({ force: true });
46-
cy.wait(delay);
46+
cy.wait(NOTIFICATIONS_DELAY);
4747
cy.get('.euiContextMenuItem__text')
4848
.contains('Chime')
4949
.click({ force: true });
50-
cy.wait(delay);
50+
cy.wait(NOTIFICATIONS_DELAY);
5151

5252
cy.get('[data-test-subj="create-channel-chime-webhook-input"]').type(
5353
'https://sample-chime-webhook'
5454
);
55-
cy.wait(delay);
55+
cy.wait(NOTIFICATIONS_DELAY);
5656

5757
cy.get('[data-test-subj="create-channel-create-button"]').click();
5858
cy.contains('successfully created.').should('exist');
@@ -62,11 +62,11 @@ describe('Test create channels', () => {
6262
cy.get('[placeholder="Enter channel name"]').type('Test email channel');
6363

6464
cy.get('.euiSuperSelectControl').contains('Slack').click({ force: true });
65-
cy.wait(delay);
65+
cy.wait(NOTIFICATIONS_DELAY);
6666
cy.get('.euiContextMenuItem__text')
6767
.contains('Email')
6868
.click({ force: true });
69-
cy.wait(delay);
69+
cy.wait(NOTIFICATIONS_DELAY);
7070

7171
// custom data-test-subj does not work on combo box
7272
cy.get('[data-test-subj="comboBoxInput"]').eq(0).click({ force: true });
@@ -84,7 +84,7 @@ describe('Test create channels', () => {
8484
cy.get('[data-test-subj="comboBoxInput"]')
8585
.last()
8686
.type('custom.email@test.com{enter}');
87-
cy.wait(delay);
87+
cy.wait(NOTIFICATIONS_DELAY);
8888
cy.get(
8989
'[data-test-subj="create-recipient-group-modal-create-button"]'
9090
).click();
@@ -100,14 +100,14 @@ describe('Test create channels', () => {
100100
);
101101

102102
cy.get('.euiSuperSelectControl').contains('Slack').click({ force: true });
103-
cy.wait(delay);
103+
cy.wait(NOTIFICATIONS_DELAY);
104104
cy.get('.euiContextMenuItem__text')
105105
.contains('Email')
106106
.click({ force: true });
107-
cy.wait(delay);
107+
cy.wait(NOTIFICATIONS_DELAY);
108108

109109
cy.get('input.euiRadio__input#ses_account').click({ force: true });
110-
cy.wait(delay);
110+
cy.wait(NOTIFICATIONS_DELAY);
111111

112112
cy.get('.euiButton__text')
113113
.contains('Create SES sender')
@@ -130,7 +130,7 @@ describe('Test create channels', () => {
130130
// custom data-test-subj does not work on combo box
131131
cy.get('[data-test-subj="comboBoxInput"]').eq(1).click({ force: true });
132132
cy.contains('Test recipient group').click();
133-
cy.wait(delay);
133+
cy.wait(NOTIFICATIONS_DELAY);
134134

135135
cy.get('[data-test-subj="create-channel-create-button"]').click();
136136
cy.contains('successfully created.').should('exist');
@@ -140,11 +140,11 @@ describe('Test create channels', () => {
140140
cy.get('[placeholder="Enter channel name"]').type('Test webhook channel');
141141

142142
cy.get('.euiSuperSelectControl').contains('Slack').click({ force: true });
143-
cy.wait(delay);
143+
cy.wait(NOTIFICATIONS_DELAY);
144144
cy.get('.euiContextMenuItem__text')
145145
.contains('Custom webhook')
146146
.click({ force: true });
147-
cy.wait(delay);
147+
cy.wait(NOTIFICATIONS_DELAY);
148148

149149
cy.get('[data-test-subj="custom-webhook-url-input"]').type(
150150
'https://custom-webhook-test-url.com:8888/test-path?params1=value1&params2=value2&params3=value3&params4=value4&params5=values5&params6=values6&params7=values7'
@@ -158,11 +158,11 @@ describe('Test create channels', () => {
158158
cy.get('[placeholder="Enter channel name"]').type('test-sns-channel');
159159

160160
cy.get('.euiSuperSelectControl').contains('Slack').click({ force: true });
161-
cy.wait(delay);
161+
cy.wait(NOTIFICATIONS_DELAY);
162162
cy.get('.euiContextMenuItem__text')
163163
.contains('Amazon SNS')
164164
.click({ force: true });
165-
cy.wait(delay);
165+
cy.wait(NOTIFICATIONS_DELAY);
166166

167167
cy.get('[data-test-subj="sns-settings-topic-arn-input"]').type(
168168
'arn:aws:sns:us-west-2:123456789012:notifications-test'
@@ -179,7 +179,7 @@ describe('Test create channels', () => {
179179
describe('Test channels table', () => {
180180
beforeEach(() => {
181181
cy.visit(`${BASE_PATH}/app/${NOTIFICATIONS_PLUGIN_NAME}#channels`);
182-
cy.wait(delay * 3);
182+
cy.wait(NOTIFICATIONS_DELAY * 3);
183183
});
184184

185185
it('displays channels', () => {
@@ -192,13 +192,13 @@ describe('Test channels table', () => {
192192
it('mutes channels', () => {
193193
cy.get('.euiCheckbox__input[aria-label="Select this row"]').eq(0).click(); // chime channel
194194
cy.get('.euiButton__text').contains('Actions').click({ force: true });
195-
cy.wait(delay);
195+
cy.wait(NOTIFICATIONS_DELAY);
196196
cy.get('.euiContextMenuItem__text').contains('Mute').click({ force: true });
197-
cy.wait(delay);
197+
cy.wait(NOTIFICATIONS_DELAY);
198198
cy.get('[data-test-subj="mute-channel-modal-mute-button"]').click({
199199
force: true,
200200
});
201-
cy.wait(delay);
201+
cy.wait(NOTIFICATIONS_DELAY);
202202
cy.contains('successfully muted.').should('exist');
203203
cy.contains('Muted').should('exist');
204204
});
@@ -207,7 +207,7 @@ describe('Test channels table', () => {
207207
cy.get('input[placeholder="Search"]')
208208
.type('chime{enter}')
209209
.trigger('search');
210-
cy.wait(delay);
210+
cy.wait(NOTIFICATIONS_DELAY);
211211
cy.contains('Test chime channel').should('exist');
212212
cy.contains('Test slack channel').should('not.exist');
213213
cy.contains('Test email channel').should('not.exist');
@@ -216,7 +216,7 @@ describe('Test channels table', () => {
216216
cy.get('input[placeholder="Search"]')
217217
.type('Source{enter}')
218218
.trigger('search');
219-
cy.wait(delay);
219+
cy.wait(NOTIFICATIONS_DELAY);
220220
cy.contains('No channels to display').should('exist');
221221
});
222222
});
@@ -261,7 +261,7 @@ describe('Test channel details', () => {
261261
cy.get('.euiTextArea').type(
262262
'{selectall}{backspace}Updated custom webhook description'
263263
);
264-
cy.wait(delay);
264+
cy.wait(NOTIFICATIONS_DELAY);
265265
cy.contains('Save').click({ force: true });
266266

267267
cy.contains('successfully updated.').should('exist');

0 commit comments

Comments
 (0)