Merge pull request #422 from topcoder-platform/develop

topgear updates and bug bash updates
topcoder-platform · Aug 31, 2017 · 6bb8908 · 6bb8908
2 parents 8e82fe5 + fe4ef14
commit 6bb8908
Show file tree

Hide file tree

Showing 67 changed files with 1,761 additions and 249 deletions.
diff --git a/__tests__/shared/actions/challenge-listing/index.js b/__tests__/shared/actions/challenge-listing/index.js
@@ -82,7 +82,7 @@ describe('challengeListing.getPastChallengesInit', () => {
 });
 
 describe('challengeListing.getChallengeSubtracksDone', () => {
-  global.fetch = mockFetch(true, [{ description: 'dummy' }]);
+  global.fetch = mockFetch(true, { result: { status: 200, content: [{ description: 'dummy' }] } });
 
   const a = actions.getChallengeSubtracksDone();
 
@@ -91,7 +91,7 @@ describe('challengeListing.getChallengeSubtracksDone', () => {
   });
 
   test('payload is a promise which resolves to the expected object', () =>
-    a.payload.then(res => expect(res).toEqual(['dummy', 'dummy'])));
+    a.payload.then(res => expect(res).toEqual([{ description: 'dummy' }])));
 });
 
 describe('challengeListing.getChallengeTagsDone', () => {

diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
@@ -27,7 +27,7 @@ exports[`Snapshot match 1`] = `
       className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
     >
       <a
-        href="https://studio.topcoder-dev.com?module=DownloadSubmission&sbmid=undefined&sbt=original"
+        href={undefined}
       >
         <DownloadIcon />
       </a>
@@ -77,7 +77,7 @@ exports[`Snapshot match 2`] = `
       className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
     >
       <a
-        href="https://studio.topcoder-dev.com?module=DownloadSubmission&sbmid=12345&sbt=original"
+        href={undefined}
       >
         <DownloadIcon />
       </a>

diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionManagement.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionManagement.jsx.snap
@@ -26,20 +26,22 @@ exports[`Matches shallow shapshot 1`] = `
       <p
         className="src-shared-components-SubmissionManagement-SubmissionManagement-___styles__round___3QPI9"
       />
-      <p
-        className="src-shared-components-SubmissionManagement-SubmissionManagement-___styles__time-left___1Tye2"
-      >
-         
-        0
-        H 
-        0
-        M
-      </p>
-      <p
-        className="src-shared-components-SubmissionManagement-SubmissionManagement-___styles__left-label___1eGT9"
-      >
-        left
-      </p>
+      <div>
+        <p
+          className="src-shared-components-SubmissionManagement-SubmissionManagement-___styles__time-left___1Tye2"
+        >
+           
+          0
+          H 
+          0
+          M
+        </p>
+        <p
+          className="src-shared-components-SubmissionManagement-SubmissionManagement-___styles__left-label___1eGT9"
+        >
+          left
+        </p>
+      </div>
     </div>
   </div>
   <div

diff --git a/__tests__/shared/components/TopcoderHeader/__snapshots__/Auth.jsx.snap b/__tests__/shared/components/TopcoderHeader/__snapshots__/Auth.jsx.snap
@@ -3,6 +3,9 @@
 exports[`Snapshot match 1`] = `
 <div
   className="src-shared-components-TopcoderHeader-Auth-___style__auth___3X0_r"
+  onClick={[Function]}
+  role="button"
+  tabIndex="0"
 >
   <a
     className="tc-btn-sm tc-btn-primary"
@@ -22,6 +25,9 @@ exports[`Snapshot match 1`] = `
 exports[`Snapshot match 2`] = `
 <div
   className="column src-shared-components-TopcoderHeader-Auth-___style__auth___3X0_r"
+  onClick={[Function]}
+  role="button"
+  tabIndex="0"
 >
   <a
     className="tc-btn-sm tc-btn-primary"

diff --git a/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/Status.jsx.snap b/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/Status.jsx.snap
@@ -242,7 +242,6 @@ exports[`Matches shallow shapshot shapshot 1 3`] = `
         }
       >
         <LeaderboardAvatar
-          domain={undefined}
           member={
             Object {
               "handle": undefined,
@@ -271,7 +270,6 @@ exports[`Matches shallow shapshot shapshot 1 3`] = `
         }
       >
         <LeaderboardAvatar
-          domain={undefined}
           member={
             Object {
               "handle": undefined,
@@ -300,7 +298,6 @@ exports[`Matches shallow shapshot shapshot 1 3`] = `
         }
       >
         <LeaderboardAvatar
-          domain={undefined}
           member={
             Object {
               "handle": undefined,
@@ -314,7 +311,6 @@ exports[`Matches shallow shapshot shapshot 1 3`] = `
       </UserAvatarTooltip>
     </div>
     <LeaderboardAvatar
-      domain={undefined}
       member={
         Object {
           "handle": "+1",

diff --git a/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx b/__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx
@@ -25,7 +25,7 @@ const mockDatas = [{
   setFilterState,
   setSearchText,
   validKeywords: ['key', 'word'],
-  validSubtracks: ['sub', 'track'],
+  validSubtracks: [{ name: 'sub', subTrack: 'sub' }, { name: 'track', subTrack: 'track' }],
   onClose,
 }, {
   communityFilters: [

diff --git a/...sts__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap b/...sts__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap
@@ -31,7 +31,6 @@ exports[`Matches shallow shapshot shapshot 1`] = `
         <FiltersIcon
           className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__FiltersIcon___2xL1E"
         />
-        Filter
       </span>
       <FiltersSwitch
         active={false}
@@ -161,7 +160,11 @@ exports[`Matches shallow shapshot shapshot 2`] = `
         <FiltersIcon
           className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__FiltersIcon___2xL1E"
         />
-        Filter
+        <span
+          className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filtersCount___35dFo"
+        >
+          3
+        </span>
       </span>
       <FiltersSwitch
         active={false}

diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
@@ -65,6 +65,8 @@ exports[`Matches shallow shapshot 1`] = `
           Sub community
         </label>
         <Select
+          autoBlur={true}
+          clearable={false}
           id="community-select"
           onChange={[Function]}
           options={
@@ -113,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
         />
       </div>
       <div
-        className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c"
+        className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hidetwomonthdatepicker___OurWT"
       >
         <label
           htmlFor="date-range-picker"
@@ -123,6 +125,23 @@ exports[`Matches shallow shapshot 1`] = `
         <DateRangePicker
           endDate={undefined}
           id="date-range-picker"
+          numberOfMonths={1}
+          onDatesChange={[Function]}
+          startDate={undefined}
+        />
+      </div>
+      <div
+        className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hideonemonthdatepicker___2zdTb"
+      >
+        <label
+          htmlFor="date-range-picker"
+        >
+          Date range
+        </label>
+        <DateRangePicker
+          endDate={undefined}
+          id="date-range-picker"
+          numberOfMonths={2}
           onDatesChange={[Function]}
           startDate={undefined}
         />
@@ -204,6 +223,8 @@ exports[`Matches shallow shapshot 2`] = `
           Sub community
         </label>
         <Select
+          autoBlur={true}
+          clearable={false}
           id="community-select"
           onChange={[Function]}
           options={
@@ -241,7 +262,23 @@ exports[`Matches shallow shapshot 2`] = `
         />
       </div>
       <div
-        className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c"
+        className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hidetwomonthdatepicker___OurWT"
+      >
+        <label
+          htmlFor="date-range-picker"
+        >
+          Date range
+        </label>
+        <DateRangePicker
+          endDate={undefined}
+          id="date-range-picker"
+          numberOfMonths={1}
+          onDatesChange={[Function]}
+          startDate={undefined}
+        />
+      </div>
+      <div
+        className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter___1-QUz src-shared-components-challenge-listing-Filters-FiltersPanel-___style__dates___3kH3c src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hideonemonthdatepicker___2zdTb"
       >
         <label
           htmlFor="date-range-picker"
@@ -251,6 +288,7 @@ exports[`Matches shallow shapshot 2`] = `
         <DateRangePicker
           endDate={undefined}
           id="date-range-picker"
+          numberOfMonths={2}
           onDatesChange={[Function]}
           startDate={undefined}
         />

diff --git a/__tests__/shared/components/tc-communities/AccordionItem.jsx b/__tests__/shared/components/tc-communities/AccordionItem.jsx
@@ -53,7 +53,7 @@ describe('Click on title', () => {
   test('onTitleClick', () => {
     const btn = TU.findAllInRenderedTree(page, item =>
       item && item.className && item.className.match(/accordion-title-button/));
-    expect(btn.length).toBe(1);
+    expect(btn.length).toBe(2);
     TU.Simulate.click(btn[0]);
     expect(mockOnTitleClick).toHaveBeenCalled();
   });

diff --git a/__tests__/shared/components/tc-communities/__snapshots__/Accordion.jsx.snap b/__tests__/shared/components/tc-communities/__snapshots__/Accordion.jsx.snap
@@ -7,6 +7,7 @@ exports[`Snapshot match 1`] = `
     Object {
       "container": "src-shared-components-tc-communities-Accordion-Accordion-___style__container___2y_cC",
       "content": "src-shared-components-tc-communities-Accordion-Accordion-___style__content___39ka7",
+      "title": "src-shared-components-tc-communities-Accordion-Accordion-___style__title___2jqCR",
       "titleList": "src-shared-components-tc-communities-Accordion-Accordion-___style__titleList___1AJq5",
       "titleListItem": "src-shared-components-tc-communities-Accordion-Accordion-___style__titleListItem___3MrXc",
       "titleListItemSelected": "src-shared-components-tc-communities-Accordion-Accordion-___style__titleListItemSelected___2EAYn",

diff --git a/__tests__/shared/components/tc-communities/__snapshots__/AccordionItem.jsx.snap b/__tests__/shared/components/tc-communities/__snapshots__/AccordionItem.jsx.snap
@@ -8,6 +8,8 @@ exports[`Snapshot match 1`] = `
     Object {
       "containerOpen": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__containerOpen___2_Z8e",
       "content": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__content___1dpq2",
+      "desktop": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__desktop___23r4A",
+      "mobile": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__mobile___3e9mH",
       "title": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__title___1l-ih",
       "titleArrow": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__titleArrow___33JDq",
       "titleText": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__titleText___1TU4v",
@@ -29,6 +31,8 @@ exports[`Snapshot match 2`] = `
     Object {
       "containerOpen": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__containerOpen___2_Z8e",
       "content": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__content___1dpq2",
+      "desktop": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__desktop___23r4A",
+      "mobile": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__mobile___3e9mH",
       "title": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__title___1l-ih",
       "titleArrow": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__titleArrow___33JDq",
       "titleText": "src-shared-components-tc-communities-Accordion-AccordionItem-___style__titleText___1TU4v",

diff --git a/__tests__/shared/reducers/challenge-listing/index.js b/__tests__/shared/reducers/challenge-listing/index.js
@@ -81,6 +81,7 @@ let expectedState = {
 
   challenges: [],
   challengeSubtracks: [],
+  challengeSubtracksMap: {},
   challengeTags: [],
 
   filter: {},