Skip to content

Merge to Master from Develop branch #3152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jul 29, 2019
Merged

Merge to Master from Develop branch #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
07c5d54
Merge pull request #2917 from r0hit-gupta/msft25
sushilshinde Jul 25, 2019
a8f6c3a
merged
sushilshinde Jul 25, 2019
43356bf
Merge pull request #2921 from r0hit-gupta/msft18
sushilshinde Jul 26, 2019
f0e7404
Merge pull request #2922 from r0hit-gupta/msft26
sushilshinde Jul 25, 2019
8ca7afa
Merge pull request #2934 from romitgit/MSFT-178-Issue#2850
sushilshinde Jul 25, 2019
4cceefd
Merge pull request #2917 from r0hit-gupta/msft25
sushilshinde Jul 25, 2019
79567e0
merged style.scss
sushilshinde Jul 25, 2019
11da147
Merge pull request #2919 from r0hit-gupta/msft28
sushilshinde Jul 25, 2019
0d9cbac
Merge pull request #2921 from r0hit-gupta/msft18
sushilshinde Jul 26, 2019
7a97d25
merged style.scss
sushilshinde Jul 25, 2019
113bb5e
Merge pull request #2922 from r0hit-gupta/msft26
sushilshinde Jul 25, 2019
ab487b9
Merge pull request #2934 from romitgit/MSFT-178-Issue#2850
sushilshinde Jul 25, 2019
d10c155
Merge pull request #2936 from PrakashDurlabhji/issue_2837
sushilshinde Jul 26, 2019
ab6a37a
Merge pull request #2936 from PrakashDurlabhji/issue_2837
sushilshinde Jul 26, 2019
4e74bb8
merged
sushilshinde Jul 28, 2019
e8438a5
Merge pull request #2938 from r0hit-gupta/msft33
sushilshinde Jul 20, 2019
917c311
Merge pull request #2943 from PrakashDurlabhji/issue_2754
sushilshinde Jul 20, 2019
6a0de3d
Merge pull request #2945 from PrakashDurlabhji/issue_2835
sushilshinde Jul 25, 2019
a651d29
Merge pull request #2950 from PrakashDurlabhji/issue_2886
sushilshinde Jul 21, 2019
56c79db
Merge pull request #2965 from PrakashDurlabhji/issue_2786_1
sushilshinde Jul 25, 2019
3d9f5f0
Merge pull request #2976 from gets0ul/issue-2910
sushilshinde Jul 21, 2019
318ae25
Merge pull request #2977 from gets0ul/issue-2836
sushilshinde Jul 25, 2019
6847666
Merge pull request #2990 from anonymousjaggu/issue-2805
sushilshinde Jul 25, 2019
c042d2a
Merge pull request #2997 from afrisalyp/2802
sushilshinde Jul 25, 2019
0c92c02
Merge pull request #2999 from anonymousjaggu/issue-2844
sushilshinde Jul 25, 2019
6b1a384
Merge pull request #3004 from anonymousjaggu/issue-2841
sushilshinde Jul 25, 2019
169c651
fix for h3 challenege font issue
sushilshinde Jul 29, 2019
bd5b21b
Merge branch 'develop' into release-qa-accessibility
sushilshinde Jul 29, 2019
946f070
Merge pull request #3150 from topcoder-platform/release-qa-accessibility
sushilshinde Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/shared/components/ProfilePage/Header/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`renders profile about header correctly 1`] = `
className="src-shared-components-ProfilePage-Header-___styles__handle___-v11j"
style={
Object {
"color": "#9D9FA0",
"color": "#555555",
}
}
>
Expand Down
50 changes: 43 additions & 7 deletions __tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ exports[`Default render 1`] = `
onMouseLeave={[Function]}
onTouchStart={[Function]}
>
Compete
<span
role="link"
tabIndex={0}
>
Compete
</span>
</li>
<li
className="src-shared-components-TopcoderHeader-___style__main-menu-item___2KIu6"
Expand All @@ -51,7 +56,12 @@ exports[`Default render 1`] = `
onMouseLeave={[Function]}
onTouchStart={[Function]}
>
Community
<span
role="link"
tabIndex={0}
>
Community
</span>
</li>
</ul>
<div
Expand All @@ -70,6 +80,8 @@ exports[`Default render 1`] = `
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onTouchStart={[Function]}
role="button"
tabIndex={0}
>
<MagnifyingGlass
height="18"
Expand Down Expand Up @@ -294,7 +306,12 @@ exports[`Render with open menu 1`] = `
onMouseLeave={[Function]}
onTouchStart={[Function]}
>
Compete
<span
role="link"
tabIndex={0}
>
Compete
</span>
</li>
<li
className="src-shared-components-TopcoderHeader-___style__main-menu-item___2KIu6"
Expand All @@ -316,7 +333,12 @@ exports[`Render with open menu 1`] = `
onMouseLeave={[Function]}
onTouchStart={[Function]}
>
Community
<span
role="link"
tabIndex={0}
>
Community
</span>
</li>
</ul>
<div
Expand All @@ -335,6 +357,8 @@ exports[`Render with open menu 1`] = `
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onTouchStart={[Function]}
role="button"
tabIndex={0}
>
<MagnifyingGlass
height="18"
Expand Down Expand Up @@ -570,7 +594,12 @@ exports[`Render with specified profile 1`] = `
onMouseLeave={[Function]}
onTouchStart={[Function]}
>
Compete
<span
role="link"
tabIndex={0}
>
Compete
</span>
</li>
<li
className="src-shared-components-TopcoderHeader-___style__main-menu-item___2KIu6"
Expand All @@ -592,7 +621,12 @@ exports[`Render with specified profile 1`] = `
onMouseLeave={[Function]}
onTouchStart={[Function]}
>
Community
<span
role="link"
tabIndex={0}
>
Community
</span>
</li>
</ul>
<div
Expand All @@ -609,7 +643,7 @@ exports[`Render with specified profile 1`] = `
className="src-shared-components-TopcoderHeader-___style__user-menu-handle___r6kbg"
style={
Object {
"color": "#9D9FA0",
"color": "#555555",
}
}
/>
Expand All @@ -630,6 +664,8 @@ exports[`Render with specified profile 1`] = `
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onTouchStart={[Function]}
role="button"
tabIndex={0}
>
<MagnifyingGlass
height="18"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/shared/components/TopcoderHeader/desktop/SubMenu/Item.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ test('Matches shallow shapshot', () => {
renderer.render((
<Item
currentSubMenuTitle="title"
icon="icon url"
icon={<div />}
title="title"
link="menu url"
/>
Expand All @@ -18,7 +18,7 @@ test('Matches shallow shapshot', () => {
renderer.render((
<Item
currentSubMenuTitle="another title"
icon="icon url"
icon={<div />}
title="title"
link="menu url"
/>
Expand Down
8 changes: 6 additions & 2 deletions __tests__/shared/components/TopcoderHeader/desktop/SubMenu/__snapshots__/Item.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ exports[`Matches shallow shapshot 1`] = `
openNewTab={false}
to="menu url"
>
icon url
<div
aria-label="title"
/>
title
</Link>
</li>
Expand All @@ -28,7 +30,9 @@ exports[`Matches shallow shapshot 2`] = `
openNewTab={false}
to="menu url"
>
icon url
<div
aria-label="title"
/>
title
</Link>
</li>
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/TopcoderHeader/mobile/__snapshots__/UserMenu.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exports[`Snapshot match 1`] = `
className="src-shared-components-TopcoderHeader-mobile-UserMenu-___style__handle___CL0Tq"
style={
Object {
"color": "#9D9FA0",
"color": "#555555",
}
}
>
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/__snapshots__/Handle.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`Matches shallow shapshot 1`] = `
href=""
style={
Object {
"color": "#9D9FA0",
"color": "#555555",
"fontSize": "24px",
}
}
Expand Down
6 changes: 4 additions & 2 deletions __tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ exports[`Matches shallow shapshot 1`] = `
options={
Array [
Object {
"label": <div>
"data": <div>
Sample community
</div>,
"label": "Sample community",
"name": "Sample community",
"value": "123",
},
Expand Down Expand Up @@ -299,9 +300,10 @@ exports[`Matches shallow shapshot 2`] = `
options={
Array [
Object {
"label": <div>
"data": <div>
Sample community
</div>,
"label": "Sample community",
"name": "Sample community",
"value": "123",
},
Expand Down
4 changes: 4 additions & 0 deletions __tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersSwitch.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ exports[`Matches shallow shapshot 1`] = `
className="tc-outline-btn name src-shared-components-challenge-listing-Filters-FiltersSwitch-___style__FiltersSwitch___2ixiH"
onClick={[Function]}
onKeyPress={[Function]}
role="button"
tabIndex={0}
>
<FiltersIcon
className="src-shared-components-challenge-listing-Filters-FiltersSwitch-___style__FiltersIcon___OqBJh"
Expand All @@ -22,6 +24,8 @@ exports[`Matches shallow shapshot 2`] = `
className="tc-outline-btn name src-shared-components-challenge-listing-Filters-FiltersSwitch-___style__FiltersSwitch___2ixiH src-shared-components-challenge-listing-Filters-FiltersSwitch-___style__active___2wLTl"
onClick={[Function]}
onKeyPress={[Function]}
role="button"
tabIndex={0}
>
<FiltersIcon
className="src-shared-components-challenge-listing-Filters-FiltersSwitch-___style__FiltersIcon___OqBJh"
Expand Down
Loading