Skip to content

Commit a99c371

Browse files
luizrrodriguesluizrrodrigues
committed
Merge branch 'develop_automation' into community-app-tests-poc
2 parents 3ceba27 + 5f65a62 commit a99c371

File tree

79 files changed

+8657
-17660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+8657
-17660
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ workflows:
230230
filters:
231231
branches:
232232
only:
233-
- free
233+
- develop
234234
- community-app-tests-poc
235235
post-steps:
236236
- run:
@@ -245,30 +245,28 @@ workflows:
245245
filters:
246246
branches:
247247
only:
248-
- gig-apply-fixes
248+
- free
249249
# This is alternate dev env for parallel testing
250250
- "build-qa":
251251
context : org-global
252252
filters:
253253
branches:
254254
only:
255-
- seo-fix
255+
- free
256256
# This is beta env for production soft releases
257257
- "build-prod-beta":
258258
context : org-global
259259
filters:
260260
branches:
261261
only:
262-
- integration-v5-challenge-api
263-
- hot-fix
262+
- free
264263
# This is stage env for production QA releases
265264
- "build-prod-staging":
266265
context : org-global
267266
filters:
268267
branches:
269268
only:
270269
- develop
271-
- listing-search
272270
# Production builds are exectuted
273271
# when PR is merged to the master
274272
# Don't change anything in this configuration
@@ -288,4 +286,3 @@ workflows:
288286
branches:
289287
ignore:
290288
- develop
291-

‎__tests__/shared/components/Leaderboard/__snapshots__/LeaderboardTable.jsx.snap

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ exports[`Matches shallow shapshot 1`] = `
5656
>
5757
<a
5858
href="undefined/members/undefined/"
59+
style={
60+
Object {
61+
"color": null,
62+
}
63+
}
5964
target="_blank"
6065
/>
6166
<div
@@ -103,6 +108,11 @@ exports[`Matches shallow shapshot 1`] = `
103108
>
104109
<a
105110
href="undefined/members/undefined/"
111+
style={
112+
Object {
113+
"color": null,
114+
}
115+
}
106116
target="_blank"
107117
/>
108118
<div
@@ -150,6 +160,11 @@ exports[`Matches shallow shapshot 1`] = `
150160
>
151161
<a
152162
href="undefined/members/undefined/"
163+
style={
164+
Object {
165+
"color": null,
166+
}
167+
}
153168
target="_blank"
154169
/>
155170
<div
@@ -197,6 +212,11 @@ exports[`Matches shallow shapshot 1`] = `
197212
>
198213
<a
199214
href="undefined/members/undefined/"
215+
style={
216+
Object {
217+
"color": null,
218+
}
219+
}
200220
target="_blank"
201221
/>
202222
<div

‎__tests__/shared/components/challenge-listing/Filters/FiltersSwitch.jsx

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeSearchBar.jsx.snap

Lines changed: 54 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,72 @@
22

33
exports[`Matches shallow shapshot 1`] = `
44
<div
5-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__ChallengeSearchBar___fvE3o"
6-
role="search"
5+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__container___29iSI"
76
>
8-
<label
9-
htmlFor="search-challenges"
7+
<div
8+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__ChallengeSearchBar___fvE3o"
9+
role="search"
1010
>
11-
Search:
12-
<input
13-
id="search-challenges"
14-
onChange={[Function]}
15-
onKeyPress={[Function]}
16-
placeholder=""
17-
type="text"
18-
value="query"
19-
/>
20-
<span
21-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__ClearButton___u_e0r src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__active___8LjMb"
22-
onClick={[Function]}
23-
onKeyPress={[Function]}
11+
<div
12+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__input-container___1II2g"
13+
htmlFor="search-challenges"
2414
>
25-
⨯
26-
</span>
27-
<span
28-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__SearchButton___3GzR0 src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__active___8LjMb"
29-
onClick={[Function]}
30-
onKeyPress={[Function]}
31-
role="button"
32-
tabIndex="0"
33-
>
34-
<ZoomIcon
35-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__zoomIcon___3d_cL"
36-
height="16"
37-
viewBox="0 0 16 16"
38-
width="16"
39-
xmlns="http://www.w3.org/2000/svg"
15+
<input
16+
id="search-challenges"
17+
onChange={[Function]}
18+
onInput={[Function]}
19+
placeholder=""
20+
type="text"
21+
value="query"
4022
/>
41-
</span>
42-
</label>
23+
<span
24+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__SearchButton___3GzR0"
25+
>
26+
<ZoomIcon
27+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__zoomIcon___3d_cL"
28+
height="16"
29+
viewBox="0 0 16 16"
30+
width="16"
31+
xmlns="http://www.w3.org/2000/svg"
32+
/>
33+
</span>
34+
</div>
35+
</div>
4336
</div>
4437
`;
4538

4639
exports[`Matches shallow shapshot 2`] = `
4740
<div
48-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__ChallengeSearchBar___fvE3o"
49-
role="search"
41+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__container___29iSI"
5042
>
51-
<label
52-
htmlFor="search-challenges"
43+
<div
44+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__ChallengeSearchBar___fvE3o"
45+
role="search"
5346
>
54-
Search:
55-
<input
56-
id="search-challenges"
57-
onChange={[Function]}
58-
onKeyPress={[Function]}
59-
placeholder=""
60-
type="text"
61-
value=""
62-
/>
63-
<span
64-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__ClearButton___u_e0r"
65-
onClick={[Function]}
66-
onKeyPress={[Function]}
67-
>
68-
⨯
69-
</span>
70-
<span
71-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__SearchButton___3GzR0"
72-
onClick={[Function]}
73-
onKeyPress={[Function]}
74-
role="button"
75-
tabIndex="0"
47+
<div
48+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__input-container___1II2g"
49+
htmlFor="search-challenges"
7650
>
77-
<ZoomIcon
78-
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__zoomIcon___3d_cL"
79-
height="16"
80-
viewBox="0 0 16 16"
81-
width="16"
82-
xmlns="http://www.w3.org/2000/svg"
51+
<input
52+
id="search-challenges"
53+
onChange={[Function]}
54+
onInput={[Function]}
55+
placeholder=""
56+
type="text"
57+
value=""
8358
/>
84-
</span>
85-
</label>
59+
<span
60+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__SearchButton___3GzR0"
61+
>
62+
<ZoomIcon
63+
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__zoomIcon___3d_cL"
64+
height="16"
65+
viewBox="0 0 16 16"
66+
width="16"
67+
xmlns="http://www.w3.org/2000/svg"
68+
/>
69+
</span>
70+
</div>
71+
</div>
8672
</div>
8773
`;

0 commit comments

Comments
 (0)