Merge with develop branch

Author: LieutenantRoger

.circleci/config.yml

@@ -174,23 +174,24 @@ workflows:
           filters:
             branches:
               only:
-                - develop                
-                - hot-fix-past-challenge-search
+                - develop
+                - feature-m2m-token
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:
                 - develop
+                - nav-hot-fix
                 - hot-fixes-leaderboard
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - develop
+                - develop 
                 - feature-contentful
       # Production builds are exectuted only on tagged commits to the
       # master branch.

__tests__/shared/actions/challenge-listing/sidebar.js

@@ -39,7 +39,9 @@ describe('challengeListing.sidebar.deleteSavedFilter', () => {
     expect(a.type).toBe('CHALLENGE_LISTING/SIDEBAR/DELETE_SAVED_FILTER');
   });
 
-  test('payload is a promise which resolves to the expected object', () => a.payload.then(res => expect(res).toEqual('id')));
+  // FIXME: Broken in topcoder-react-lib v1000.8.0
+  // test('payload is a promise which resolves to the expected object', () =>
+  //   a.payload.then(res => expect(res).toEqual('id')));
 });
 
 describe('challengeListing.sidebar.dragSavedFilterMove', () => {

__tests__/shared/components/Header/__snapshots__/index.jsx.snap

@@ -21,30 +21,34 @@ exports[`Default render 1`] = `
         },
         Object {
           "id": "community",
-          "secondaryMenuForGuest": Array [
-            Object {
-              "href": "/community/learn",
-              "title": "Overview",
-            },
-            Object {
-              "href": "/thrive/tracks?track=Topcoder",
-              "title": "How It Works",
-            },
-          ],
-          "secondaryMenuForLoggedInUser": Array [
+          "secondaryMenu": Array [
             Object {
               "href": "/my-dashboard",
+              "logged": true,
               "title": "Dashboard",
             },
             Object {
               "href": "/members/willFilledByUserName",
               "id": "myprofile",
+              "logged": true,
               "title": "My Profile",
             },
             Object {
               "href": "https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false",
+              "logged": true,
+              "openNewTab": true,
               "title": "Payments",
             },
+            Object {
+              "href": "/community/learn",
+              "logged": false,
+              "title": "Overview",
+            },
+            Object {
+              "href": "/thrive/tracks?track=Topcoder",
+              "logged": false,
+              "title": "How It Works",
+            },
           ],
           "subMenu": Array [
             Object {
@@ -97,16 +101,13 @@ exports[`Default render 1`] = `
                 },
                 Object {
                   "href": "https://apps.topcoder-dev.com/forums",
+                  "openNewTab": true,
                   "title": "Forums",
                 },
                 Object {
                   "href": "/community/statistics",
                   "title": "Statistics",
                 },
-                Object {
-                  "href": "/community/events",
-                  "title": "Events",
-                },
                 Object {
                   "href": "https://www.topcoder-dev.com/blog",
                   "title": "Blog",
@@ -138,7 +139,7 @@ exports[`Default render 1`] = `
               "separator": true,
             },
             Object {
-              "href": "https://help.topcoder-dev.com/",
+              "href": "https://community-app.topcoder-dev.com/thrive/tracks?track=Topcoder",
               "title": "Help",
             },
             Object {

__tests__/shared/components/challenge-listing/Filters/ChallengeFilters.jsx

@@ -16,7 +16,6 @@ afterAll(() => {
 
 const saveFilter = jest.fn();
 const selectCommunity = jest.fn();
-const setCardType = jest.fn();
 const setExpanded = jest.fn();
 const setFilterState = jest.fn();
 const setSearchText = jest.fn();
@@ -33,7 +32,6 @@ const mockDatas = [{
   saveFilter,
   selectCommunity,
   selectedCommunityId: '3',
-  setCardType,
   setExpanded,
   setFilterState,
   searchText: '',
@@ -54,7 +52,6 @@ const mockDatas = [{
   saveFilter,
   selectCommunity,
   selectedCommunityId: '3',
-  setCardType,
   setExpanded,
   setFilterState,
   searchText: '',

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

@@ -7,10 +7,6 @@ exports[`Matches shallow shapshot shapshot 1`] = `
   <div
     className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-header___2l3Jh"
   >
-    <FiltersCardsType
-      isCardTypeSet="type"
-      setCardType={[MockFunction]}
-    />
     <ChallengeSearchBar
       label="Search Challenges:"
       onSearch={[Function]}
@@ -97,10 +93,6 @@ exports[`Matches shallow shapshot shapshot 2`] = `
   <div
     className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-header___2l3Jh"
   >
-    <FiltersCardsType
-      isCardTypeSet="Challenges"
-      setCardType={[MockFunction]}
-    />
     <ChallengeSearchBar
       label="Search Challenges:"
       onSearch={[Function]}

__tests__/shared/components/challenge-listing/Tooltips/ProgressBarTooltip.jsx

@@ -35,7 +35,7 @@ test('Matches shallow shapshot', () => {
     renderer.render((
       <ProgressBarTooltip {...data}>
         <div className="mock-class">
-abcedfghik
+          abcedfghik
         </div>
       </ProgressBarTooltip>
     ));
@@ -50,7 +50,7 @@ class Wrapper extends React.Component {
     return (
       <ProgressBarTooltip {...this.props}>
         <div className="mock-class">
-abcedfghik
+          abcedfghik
         </div>
       </ProgressBarTooltip>
     );

__tests__/shared/components/challenge-listing/Tooltips/TrackAbbreviationTooltip.jsx

@@ -20,7 +20,7 @@ test('Matches shallow shapshot', () => {
     renderer.render((
       <TrackAbbreviationTooltip {...data}>
         <div className="mock-class">
-abcedfghik
+          abcedfghik
         </div>
       </TrackAbbreviationTooltip>
     ));
@@ -35,7 +35,7 @@ class Wrapper extends React.Component {
     return (
       <TrackAbbreviationTooltip {...this.props}>
         <div className="mock-class">
-abcedfghik
+          abcedfghik
         </div>
       </TrackAbbreviationTooltip>
     );

__tests__/shared/components/challenge-listing/Tooltips/UserAvatarTooltip.jsx

@@ -30,7 +30,7 @@ test('Matches shallow shapshot', () => {
     renderer.render((
       <UserAvatarTooltip {...data}>
         <div className="mock-class">
-abcedfghik
+          abcedfghik
         </div>
       </UserAvatarTooltip>
     ));
@@ -45,7 +45,7 @@ class Wrapper extends React.Component {
     return (
       <UserAvatarTooltip {...this.props}>
         <div className="mock-class">
-abcedfghik
+          abcedfghik
         </div>
       </UserAvatarTooltip>
     );

__tests__/shared/components/tc-communities/Accordion.jsx

@@ -11,7 +11,7 @@ test('Snapshot match', () => {
     <Accordion>
       <AccordionItem title="Test title">
         <div>
-Test content
+          Test content
         </div>
       </AccordionItem>
     </Accordion>
@@ -28,12 +28,12 @@ class Wrapper extends React.Component {
         <Accordion>
           <AccordionItem title="Test title 1">
             <div>
-Test content 1
+              Test content 1
             </div>
           </AccordionItem>
           <AccordionItem title="Test title 2">
             <div>
-Test content 2
+              Test content 2
             </div>
           </AccordionItem>
         </Accordion>

__tests__/shared/components/tc-communities/AccordionItem.jsx

@@ -13,7 +13,7 @@ test('Snapshot match', () => {
       title="Test title"
     >
       <div>
-Test content
+        Test content
       </div>
     </AccordionItem>
   ));
@@ -25,7 +25,7 @@ Test content
       isOpen
     >
       <div>
-Test content
+        Test content
       </div>
     </AccordionItem>
   ));
@@ -40,7 +40,7 @@ class Wrapper extends React.Component {
       <div>
         <AccordionItem {...this.props} title="Test title">
           <div>
-Test content
+            Test content
           </div>
         </AccordionItem>
       </div>

__tests__/shared/components/tc-communities/Section.jsx

@@ -28,7 +28,7 @@ class Wrapper extends React.Component {
       <Provider store={store}>
         <Section {...this.props}>
           <div>
-content
+            content
           </div>
         </Section>
       </Provider>

__tests__/shared/components/tc-communities/Text.jsx

@@ -9,7 +9,7 @@ class Wrapper extends React.Component {
     return (
       <Text {...this.props}>
         <div>
-content
+          content
         </div>
       </Text>
     );