Skip to content

Commit f199af4

Browse files
committed
WD-34911 - WIP fixing most of the tests
1 parent 23f7fb4 commit f199af4

16 files changed

Lines changed: 153 additions & 178 deletions

static/js/libs/channels.test.ts

Lines changed: 44 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -83,40 +83,24 @@ describe("createChannelTree", () => {
8383
expect(createChannelTree(channelList)).toEqual({
8484
latest: {
8585
name: "latest",
86-
risks: {
87-
stable: {
86+
risks: [
87+
{
8888
name: "stable",
89-
branches: {
90-
_base: {
91-
name: "_base",
92-
},
93-
},
89+
branches: ["_base"],
9490
},
95-
beta: {
91+
{
9692
name: "beta",
97-
branches: {
98-
_base: {
99-
name: "_base",
100-
},
101-
},
93+
branches: ["_base"],
10294
},
103-
candidate: {
95+
{
10496
name: "candidate",
105-
branches: {
106-
_base: {
107-
name: "_base",
108-
},
109-
},
97+
branches: ["_base"],
11098
},
111-
edge: {
99+
{
112100
name: "edge",
113-
branches: {
114-
_base: {
115-
name: "_base",
116-
},
117-
},
101+
branches: ["_base"],
118102
},
119-
},
103+
],
120104
},
121105
});
122106
});
@@ -132,37 +116,25 @@ describe("createChannelTree", () => {
132116
expect(createChannelTree(channelList)).toEqual({
133117
latest: {
134118
name: "latest",
135-
risks: {
136-
stable: {
119+
risks: [
120+
{
137121
name: "stable",
138-
branches: {
139-
_base: {
140-
name: "_base",
141-
},
142-
},
122+
branches: ["_base"],
143123
},
144-
edge: {
124+
{
145125
name: "edge",
146-
branches: {
147-
_base: {
148-
name: "_base",
149-
},
150-
},
126+
branches: ["_base"],
151127
},
152-
},
128+
],
153129
},
154130
test: {
155131
name: "test",
156-
risks: {
157-
candidate: {
132+
risks: [
133+
{
158134
name: "candidate",
159-
branches: {
160-
_base: {
161-
name: "_base",
162-
},
163-
},
135+
branches: ["_base"],
164136
},
165-
},
137+
],
166138
},
167139
});
168140
});
@@ -179,35 +151,20 @@ describe("createChannelTree", () => {
179151
expect(createChannelTree(channelList)).toEqual({
180152
latest: {
181153
name: "latest",
182-
risks: {
183-
stable: {
154+
risks: [
155+
{
184156
name: "stable",
185-
branches: {
186-
_base: {
187-
name: "_base",
188-
},
189-
},
157+
branches: ["_base"],
190158
},
191-
beta: {
159+
{
192160
name: "beta",
193-
branches: {
194-
test: {
195-
name: "test",
196-
},
197-
},
161+
branches: ["test"],
198162
},
199-
edge: {
163+
{
200164
name: "edge",
201-
branches: {
202-
hotfix: {
203-
name: "hotfix",
204-
},
205-
"1.0.1": {
206-
name: "1.0.1",
207-
},
208-
},
165+
branches: ["1.0.1", "hotfix"],
209166
},
210-
},
167+
],
211168
},
212169
});
213170
});
@@ -225,25 +182,12 @@ describe("createChannelTree", () => {
225182
expect(createChannelTree(channelList)).toEqual({
226183
latest: {
227184
name: "latest",
228-
risks: {
229-
stable: {
185+
risks: [
186+
{
230187
name: "stable",
231-
branches: {
232-
_base: {
233-
name: "_base",
234-
},
235-
test: {
236-
name: "test",
237-
},
238-
"1.0.1": {
239-
name: "1.0.1",
240-
},
241-
hotfix: {
242-
name: "hotfix",
243-
},
244-
},
188+
branches: ["_base", "test", "1.0.1", "hotfix"],
245189
},
246-
},
190+
],
247191
},
248192
});
249193
});
@@ -315,11 +259,7 @@ describe("sortChannels", () => {
315259
risks: [
316260
{
317261
name: "stable",
318-
branches: [
319-
{
320-
name: "_base",
321-
},
322-
],
262+
branches: ["_base"],
323263
},
324264
],
325265
},
@@ -328,11 +268,7 @@ describe("sortChannels", () => {
328268
risks: [
329269
{
330270
name: "edge",
331-
branches: [
332-
{
333-
name: "_base",
334-
},
335-
],
271+
branches: ["_base"],
336272
},
337273
],
338274
},
@@ -341,11 +277,7 @@ describe("sortChannels", () => {
341277
risks: [
342278
{
343279
name: "candidate",
344-
branches: [
345-
{
346-
name: "_base",
347-
},
348-
],
280+
branches: ["_base"],
349281
},
350282
],
351283
},
@@ -354,11 +286,7 @@ describe("sortChannels", () => {
354286
risks: [
355287
{
356288
name: "beta",
357-
branches: [
358-
{
359-
name: "_base",
360-
},
361-
],
289+
branches: ["_base"],
362290
},
363291
],
364292
},
@@ -376,11 +304,7 @@ describe("sortChannels", () => {
376304
risks: [
377305
{
378306
name: "stable",
379-
branches: [
380-
{
381-
name: "_base",
382-
},
383-
],
307+
branches: ["_base"],
384308
},
385309
],
386310
},
@@ -389,11 +313,7 @@ describe("sortChannels", () => {
389313
risks: [
390314
{
391315
name: "edge",
392-
branches: [
393-
{
394-
name: "_base",
395-
},
396-
],
316+
branches: ["_base"],
397317
},
398318
],
399319
},
@@ -402,19 +322,11 @@ describe("sortChannels", () => {
402322
risks: [
403323
{
404324
name: "candidate",
405-
branches: [
406-
{
407-
name: "_base",
408-
},
409-
],
325+
branches: ["_base"],
410326
},
411327
{
412328
name: "beta",
413-
branches: [
414-
{
415-
name: "_base",
416-
},
417-
],
329+
branches: ["_base"],
418330
},
419331
],
420332
},
@@ -439,11 +351,7 @@ describe("sortChannels", () => {
439351
risks: [
440352
{
441353
name: "stable",
442-
branches: [
443-
{
444-
name: "_base",
445-
},
446-
],
354+
branches: ["_base"],
447355
},
448356
],
449357
},
@@ -452,11 +360,7 @@ describe("sortChannels", () => {
452360
risks: [
453361
{
454362
name: "edge",
455-
branches: [
456-
{
457-
name: "_base",
458-
},
459-
],
363+
branches: ["_base"],
460364
},
461365
],
462366
},
@@ -465,22 +369,11 @@ describe("sortChannels", () => {
465369
risks: [
466370
{
467371
name: "candidate",
468-
branches: [
469-
{
470-
name: "_base",
471-
},
472-
],
372+
branches: ["_base"],
473373
},
474374
{
475375
name: "beta",
476-
branches: [
477-
{
478-
name: "hotfix",
479-
},
480-
{
481-
name: "1.0.1",
482-
},
483-
],
376+
branches: ["hotfix", "1.0.1"],
484377
},
485378
],
486379
},

0 commit comments

Comments
 (0)