Skip to content

Commit a4f283e

Browse files
NetacciNetacci
committed
resolve merge conflict
1 parent 4f06c4d commit a4f283e

File tree

6 files changed

+324
-141
lines changed

6 files changed

+324
-141
lines changed

‎src/__tests__/Search/__snapshots__/CompareOverTime.test.tsx.snap‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ exports[`Compare Over Time renders correctly in Search View: Initial state for t
244244
class="MuiFormControl-root MuiTextField-root search-text-field new css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
245245
>
246246
<div
247-
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary Mui-error MuiInputBase-formControl MuiInputBase-adornedStart css-193b4t-MuiInputBase-root-MuiOutlinedInput-root"
247+
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedStart css-193b4t-MuiInputBase-root-MuiOutlinedInput-root"
248248
>
249249
<div
250250
class="MuiInputAdornment-root MuiInputAdornment-positionEnd MuiInputAdornment-outlined MuiInputAdornment-sizeMedium css-1laqsz7-MuiInputAdornment-root"
@@ -262,8 +262,7 @@ exports[`Compare Over Time renders correctly in Search View: Initial state for t
262262
</svg>
263263
</div>
264264
<input
265-
aria-describedby="search-new-input-helper-text"
266-
aria-invalid="true"
265+
aria-invalid="false"
267266
aria-label="Search revision by ID number, author email or bug number"
268267
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedStart css-1rgu65m-MuiInputBase-input-MuiOutlinedInput-input"
269268
id="search-new-input"
@@ -286,12 +285,6 @@ exports[`Compare Over Time renders correctly in Search View: Initial state for t
286285
</legend>
287286
</fieldset>
288287
</div>
289-
<p
290-
class="MuiFormHelperText-root Mui-error MuiFormHelperText-sizeMedium MuiFormHelperText-contained css-1ut8mn8-MuiFormHelperText-root"
291-
id="search-new-input-helper-text"
292-
>
293-
Error when requesting treeherder: (404) Not Found
294-
</p>
295288
</div>
296289
</div>
297290
</div>
@@ -1178,10 +1171,10 @@ exports[`Compare Over Time should have an edit mode in Results View: After click
11781171
</div>
11791172
<input
11801173
aria-invalid="false"
1181-
aria-label="Search revision by ID number or author email"
1174+
aria-label="Search revision by ID number, author email or bug number"
11821175
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
11831176
id="search-new-input"
1184-
placeholder="Search revision by ID number or author email"
1177+
placeholder="Search revision by ID number, author email or bug number"
11851178
type="text"
11861179
value=""
11871180
/>
@@ -2856,10 +2849,10 @@ exports[`Compare Over Time should update base repo, revisions and time-range aft
28562849
</div>
28572850
<input
28582851
aria-invalid="false"
2859-
aria-label="Search revision by ID number or author email"
2852+
aria-label="Search revision by ID number, author email or bug number"
28602853
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
28612854
id="search-new-input"
2862-
placeholder="Search revision by ID number or author email"
2855+
placeholder="Search revision by ID number, author email or bug number"
28632856
type="text"
28642857
value=""
28652858
/>

‎src/__tests__/Search/__snapshots__/CompareWithBase.test.tsx.snap‎

Lines changed: 162 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ exports[`Compare With Base renders correctly when there are no results: Initial
136136
</div>
137137
<input
138138
aria-invalid="false"
139-
aria-label="Search base by ID number or author email"
139+
aria-label="Search base by ID number, author email or bug number"
140140
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
141141
id="search-base-input"
142-
placeholder="Search base by ID number or author email"
142+
placeholder="Search base by ID number, author email or bug number"
143143
type="text"
144144
value=""
145145
/>
@@ -446,10 +446,10 @@ exports[`Compare With Base renders correctly when there are no results: Initial
446446
</div>
447447
<input
448448
aria-invalid="false"
449-
aria-label="Search revision by ID number or author email"
449+
aria-label="Search revision by ID number, author email or bug number"
450450
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
451451
id="search-new-input"
452-
placeholder="Search revision by ID number or author email"
452+
placeholder="Search revision by ID number, author email or bug number"
453453
type="text"
454454
value=""
455455
/>
@@ -951,10 +951,10 @@ exports[`Compare With Base should have an edit mode in Results View: After click
951951
</div>
952952
<input
953953
aria-invalid="false"
954-
aria-label="Search base by ID number or author email"
954+
aria-label="Search base by ID number, author email or bug number"
955955
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
956956
id="search-base-input"
957-
placeholder="Search base by ID number or author email"
957+
placeholder="Search base by ID number, author email or bug number"
958958
type="text"
959959
value=""
960960
/>
@@ -1261,10 +1261,10 @@ exports[`Compare With Base should have an edit mode in Results View: After click
12611261
</div>
12621262
<input
12631263
aria-invalid="false"
1264-
aria-label="Search revision by ID number or author email"
1264+
aria-label="Search revision by ID number, author email or bug number"
12651265
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
12661266
id="search-new-input"
1267-
placeholder="Search revision by ID number or author email"
1267+
placeholder="Search revision by ID number, author email or bug number"
12681268
type="text"
12691269
value=""
12701270
/>
@@ -1454,10 +1454,10 @@ exports[`Compare With Base should have an edit mode in Results View: After click
14541454
</div>
14551455
<input
14561456
aria-invalid="false"
1457-
aria-label="Search base by ID number or author email"
1457+
aria-label="Search base by ID number, author email or bug number"
14581458
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
14591459
id="search-base-input"
1460-
placeholder="Search base by ID number or author email"
1460+
placeholder="Search base by ID number, author email or bug number"
14611461
type="text"
14621462
value=""
14631463
/>
@@ -1764,10 +1764,10 @@ exports[`Compare With Base should have an edit mode in Results View: After click
17641764
</div>
17651765
<input
17661766
aria-invalid="false"
1767-
aria-label="Search revision by ID number or author email"
1767+
aria-label="Search revision by ID number, author email or bug number"
17681768
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
17691769
id="search-new-input"
1770-
placeholder="Search revision by ID number or author email"
1770+
placeholder="Search revision by ID number, author email or bug number"
17711771
type="text"
17721772
value=""
17731773
/>
@@ -2144,10 +2144,10 @@ exports[`Compare With Base should have an edit mode in Results View: Initial sta
21442144
</div>
21452145
<input
21462146
aria-invalid="false"
2147-
aria-label="Search base by ID number or author email"
2147+
aria-label="Search base by ID number, author email or bug number"
21482148
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
21492149
id="search-base-input"
2150-
placeholder="Search base by ID number or author email"
2150+
placeholder="Search base by ID number, author email or bug number"
21512151
type="text"
21522152
value=""
21532153
/>
@@ -2454,10 +2454,10 @@ exports[`Compare With Base should have an edit mode in Results View: Initial sta
24542454
</div>
24552455
<input
24562456
aria-invalid="false"
2457-
aria-label="Search revision by ID number or author email"
2457+
aria-label="Search revision by ID number, author email or bug number"
24582458
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
24592459
id="search-new-input"
2460-
placeholder="Search revision by ID number or author email"
2460+
placeholder="Search revision by ID number, author email or bug number"
24612461
type="text"
24622462
value=""
24632463
/>
@@ -2821,10 +2821,10 @@ exports[`Compare With Base should have an edit mode in Results View: after remov
28212821
</div>
28222822
<input
28232823
aria-invalid="false"
2824-
aria-label="Search base by ID number or author email"
2824+
aria-label="Search base by ID number, author email or bug number"
28252825
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
28262826
id="search-base-input"
2827-
placeholder="Search base by ID number or author email"
2827+
placeholder="Search base by ID number, author email or bug number"
28282828
type="text"
28292829
value=""
28302830
/>
@@ -2965,10 +2965,10 @@ exports[`Compare With Base should have an edit mode in Results View: after remov
29652965
</div>
29662966
<input
29672967
aria-invalid="false"
2968-
aria-label="Search revision by ID number or author email"
2968+
aria-label="Search revision by ID number, author email or bug number"
29692969
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
29702970
id="search-new-input"
2971-
placeholder="Search revision by ID number or author email"
2971+
placeholder="Search revision by ID number, author email or bug number"
29722972
type="text"
29732973
value=""
29742974
/>
@@ -3370,10 +3370,10 @@ exports[`Compare With Base should have an edit mode in Results View: after remov
33703370
</div>
33713371
<input
33723372
aria-invalid="false"
3373-
aria-label="Search base by ID number or author email"
3373+
aria-label="Search base by ID number, author email or bug number"
33743374
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
33753375
id="search-base-input"
3376-
placeholder="Search base by ID number or author email"
3376+
placeholder="Search base by ID number, author email or bug number"
33773377
type="text"
33783378
value=""
33793379
/>
@@ -3680,10 +3680,10 @@ exports[`Compare With Base should have an edit mode in Results View: after remov
36803680
</div>
36813681
<input
36823682
aria-invalid="false"
3683-
aria-label="Search revision by ID number or author email"
3683+
aria-label="Search revision by ID number, author email or bug number"
36843684
class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall MuiInputBase-inputAdornedStart css-jrmsot-MuiInputBase-input-MuiOutlinedInput-input"
36853685
id="search-new-input"
3686-
placeholder="Search revision by ID number or author email"
3686+
placeholder="Search revision by ID number, author email or bug number"
36873687
type="text"
36883688
value=""
36893689
/>
@@ -4688,3 +4688,141 @@ exports[`Compare With Base should remove the checked revision once X button is c
46884688
</div>
46894689
</body>
46904690
`;
4691+
4692+
exports[`Compare With Base updates the framework and url when a new one is selected: after awsy is selected 1`] = `
4693+
<ul
4694+
class="MuiList-root MuiList-padding MuiMenu-list css-6hp17o-MuiList-root-MuiMenu-list"
4695+
role="listbox"
4696+
tabindex="-1"
4697+
>
4698+
<li
4699+
aria-selected="true"
4700+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters Mui-selected MuiMenuItem-root MuiMenuItem-gutters Mui-selected framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4701+
data-value="4"
4702+
role="option"
4703+
tabindex="0"
4704+
>
4705+
awsy
4706+
<span
4707+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4708+
>
4709+
<span
4710+
class="css-y4cjyz-MuiTouchRipple-ripple MuiTouchRipple-ripple MuiTouchRipple-rippleVisible"
4711+
style="width: 2.8284271247461903px; height: 2.8284271247461903px; top: -1.4142135623730951px; left: -1.4142135623730951px;"
4712+
>
4713+
<span
4714+
class="MuiTouchRipple-child MuiTouchRipple-childLeaving"
4715+
/>
4716+
</span>
4717+
</span>
4718+
</li>
4719+
<li
4720+
aria-selected="false"
4721+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4722+
data-value="13"
4723+
role="option"
4724+
tabindex="-1"
4725+
>
4726+
browsertime
4727+
<span
4728+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4729+
/>
4730+
</li>
4731+
<li
4732+
aria-selected="false"
4733+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4734+
data-value="2"
4735+
role="option"
4736+
tabindex="-1"
4737+
>
4738+
build_metrics
4739+
<span
4740+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4741+
/>
4742+
</li>
4743+
<li
4744+
aria-selected="false"
4745+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4746+
data-value="12"
4747+
role="option"
4748+
tabindex="-1"
4749+
>
4750+
devtools
4751+
<span
4752+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4753+
/>
4754+
</li>
4755+
<li
4756+
aria-selected="false"
4757+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4758+
data-value="16"
4759+
role="option"
4760+
tabindex="-1"
4761+
>
4762+
fxrecord
4763+
<span
4764+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4765+
/>
4766+
</li>
4767+
<li
4768+
aria-selected="false"
4769+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4770+
data-value="11"
4771+
role="option"
4772+
tabindex="-1"
4773+
>
4774+
js-bench
4775+
<span
4776+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4777+
/>
4778+
</li>
4779+
<li
4780+
aria-selected="false"
4781+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4782+
data-value="15"
4783+
role="option"
4784+
tabindex="-1"
4785+
>
4786+
mozperftest
4787+
<span
4788+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4789+
/>
4790+
</li>
4791+
<li
4792+
aria-selected="false"
4793+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4794+
data-value="6"
4795+
role="option"
4796+
tabindex="-1"
4797+
>
4798+
platform_microbench
4799+
<span
4800+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4801+
/>
4802+
</li>
4803+
<li
4804+
aria-selected="false"
4805+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4806+
data-value="10"
4807+
role="option"
4808+
tabindex="-1"
4809+
>
4810+
raptor
4811+
<span
4812+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4813+
/>
4814+
</li>
4815+
<li
4816+
aria-selected="false"
4817+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters framework-dropdown-item css-56615l-MuiButtonBase-root-MuiMenuItem-root"
4818+
data-value="1"
4819+
role="option"
4820+
tabindex="-1"
4821+
>
4822+
talos
4823+
<span
4824+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
4825+
/>
4826+
</li>
4827+
</ul>
4828+
`;

0 commit comments

Comments
 (0)