Skip to content

Commit 7aba03b

Browse files
ananzhalchemist51
authored andcommitted
[WS-2021-0638][Security] bump mocha to 10.1.0 (opensearch-project#2711)
* [WS-2021-0638][Security] bump mocha to 10.1.0 In our current repo, most mocha tests have been changed to jest in this issue: opensearch-project#215 The fix for the above issue (mochajs/mocha@61b4b92) is only released in the latest version v10.1.0: https://github.com/mochajs/mocha/blob/5f96d511dbf913f135b92198aab721a27f6b44fe/lib/utils.js#L79 Since we are considering this change might break others, we will not backport to 2.x and release it in 3.0.0 Issue Resolved: opensearch-project#2269 Signed-off-by: Anan Zhuang <ananzh@amazon.com> Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
1 parent 7aec3f6 commit 7aba03b

File tree

5 files changed

+184
-278
lines changed

5 files changed

+184
-278
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
109109
- Resolve sub-dependent d3-color version and potential security issue ([#2454](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2454))
110110
- [CVE-2022-3517] Bumps minimatch from 3.0.4 to 3.0.5 and [IBM X-Force ID: 220063] unset-value from 1.0.1 to 2.0.1 ([#2640](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2640))
111111
- [CVE-2022-37601] Bump loader-utils to 2.0.3 ([#2689](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2689))
112+
- [WS-2021-0638][Security] bump mocha to 10.1.0 ([#2711](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2711))
112113

113114
### 📈 Features/Enhancements
114115

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
"load-grunt-config": "^4.0.1",
409409
"load-json-file": "^6.2.0",
410410
"markdown-it": "^12.3.2",
411-
"mocha": "^7.2.0",
411+
"mocha": "10.1.0",
412412
"mock-fs": "^4.12.0",
413413
"monaco-editor": "~0.17.0",
414414
"ms-chromium-edge-driver": "^0.4.3",

packages/osd-test/src/functional_test_runner/integration/failure_hooks.test.js

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ describe('failure hooks', function () {
5555
{
5656
flag: '$FAILING_TEST$',
5757
assert(lines) {
58+
expect(lines.shift()).to.match(/\$FAILING_TEST\$/);
5859
expect(lines.shift()).to.match(/global before each/);
5960
expect(lines.shift()).to.match(/info\s+testFailure\s+\$FAILING_TEST_ERROR\$/);
6061
expect(lines.shift()).to.match(/info\s+testFailureAfterDelay\s+\$FAILING_TEST_ERROR\$/);

packages/osd-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ it('only runs hooks of parents and tests in level1a', async () => {
111111
"suite: ",
112112
"suite: level 1",
113113
"suite: level 1 level 1a",
114-
"hook: \\"before each\\" hook: rootBeforeEach",
115-
"hook: level 1 \\"before each\\" hook: level1BeforeEach",
114+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 1a\\"",
115+
"hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1a\\"",
116116
"test: level 1 level 1a test 1a",
117117
]
118118
`);
@@ -130,8 +130,8 @@ it('only runs hooks of parents and tests in level1b', async () => {
130130
"suite: ",
131131
"suite: level 1",
132132
"suite: level 1 level 1b",
133-
"hook: \\"before each\\" hook: rootBeforeEach",
134-
"hook: level 1 \\"before each\\" hook: level1BeforeEach",
133+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 1b\\"",
134+
"hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1b\\"",
135135
"test: level 1 level 1b test 1b",
136136
]
137137
`);
@@ -149,12 +149,12 @@ it('only runs hooks of parents and tests in level1a and level1b', async () => {
149149
"suite: ",
150150
"suite: level 1",
151151
"suite: level 1 level 1a",
152-
"hook: \\"before each\\" hook: rootBeforeEach",
153-
"hook: level 1 \\"before each\\" hook: level1BeforeEach",
152+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 1a\\"",
153+
"hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1a\\"",
154154
"test: level 1 level 1a test 1a",
155155
"suite: level 1 level 1b",
156-
"hook: \\"before each\\" hook: rootBeforeEach",
157-
"hook: level 1 \\"before each\\" hook: level1BeforeEach",
156+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 1b\\"",
157+
"hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1b\\"",
158158
"test: level 1 level 1b test 1b",
159159
]
160160
`);
@@ -173,8 +173,8 @@ it('only runs level1a if including level1 and excluding level1b', async () => {
173173
"suite: ",
174174
"suite: level 1",
175175
"suite: level 1 level 1a",
176-
"hook: \\"before each\\" hook: rootBeforeEach",
177-
"hook: level 1 \\"before each\\" hook: level1BeforeEach",
176+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 1a\\"",
177+
"hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1a\\"",
178178
"test: level 1 level 1a test 1a",
179179
]
180180
`);
@@ -193,8 +193,8 @@ it('only runs level1b if including level1 and excluding level1a', async () => {
193193
"suite: ",
194194
"suite: level 1",
195195
"suite: level 1 level 1b",
196-
"hook: \\"before each\\" hook: rootBeforeEach",
197-
"hook: level 1 \\"before each\\" hook: level1BeforeEach",
196+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 1b\\"",
197+
"hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1b\\"",
198198
"test: level 1 level 1b test 1b",
199199
]
200200
`);
@@ -212,7 +212,7 @@ it('only runs level2 if excluding level1', async () => {
212212
"suite: ",
213213
"suite: level 2",
214214
"suite: level 2 level 2a",
215-
"hook: \\"before each\\" hook: rootBeforeEach",
215+
"hook: \\"before each\\" hook: rootBeforeEach for \\"test 2a\\"",
216216
"test: level 2 level 2a test 2a",
217217
]
218218
`);

0 commit comments

Comments
 (0)