Merge pull request #4779 from topcoder-platform/develop

Challenge API V5 Integration

Author: sushilshinde

.circleci/config.yml

@@ -231,7 +231,6 @@ workflows:
             branches:
               only:
                 - develop
-                - feature-contentful
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -245,22 +244,21 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - hot-fix
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-                - feature-contentful
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters:
             branches:
               only:
-                - develop
+                - hot-fix
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

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

@@ -6,6 +6,23 @@ const mockFetch = (ok, resolvesTo) => jest.fn(
   () => Promise.resolve({ ok, json: () => resolvesTo }),
 );
 
+const createXHRmock = () => {
+  const open = jest.fn();
+  // be aware we use *function* because we need to get *this*
+  // from *new XmlHttpRequest()* call
+  const send = jest.fn().mockImplementation(() => {
+    this.onload();
+  });
+  const xhrMockClass = {
+    open,
+    send,
+    setRequestHeader: jest.fn(),
+    getAllResponseHeaders: jest.fn(),
+  };
+
+  window.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass);
+};
+
 let originalFetch;
 
 beforeAll(() => {
@@ -32,6 +49,7 @@ describe('challengeListing.sidebar.changeFilterName', () => {
 
 describe('challengeListing.sidebar.deleteSavedFilter', () => {
   global.fetch = mockFetch(true, 'dummy');
+  createXHRmock();
 
   const a = actions.deleteSavedFilter('id', 'token');
 

__tests__/shared/components/ChallengeTile/__mocks__/design.json

@@ -14,14 +14,17 @@
 	"updatedBy": "22841596",
 	"technologies": "",
 	"status": "COMPLETED",
-	"track": "DESIGN",
-	"subTrack": "LOGO_DESIGN",
+	"legacy": {
+		"forumId": 599349
+	},
+	"track": "Design",
+	"type": "Challenge",
+	"tags": "Logo Design",
 	"name": "Sunshot - MapMySolar - SunGiver  - Brand Concept Logo Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30051608,
-	"forumId": 599349,
-	"numSubmissions": 22,
-	"numRegistrants": 31,
+	"numOfSubmissions": 22,
+	"numOfRegistrants": 31,
 	"registrationStartDate": "2015-10-01T22:21:07.491Z",
 	"registrationEndDate": "2015-10-09T13:04:02.272Z",
 	"checkpointSubmissionEndDate": "2015-10-05T13:05:56.398Z",
@@ -317,14 +320,17 @@
 	"updatedBy": "22841596",
 	"technologies": "",
 	"status": "COMPLETED",
-	"track": "DESIGN",
-	"subTrack": "LOGO_DESIGN",
+	"legacy": {
+		"forumId": 598066
+	},
+	"track": "Design",
+	"type": "Challenge",
+	"tags": ["Logo Design"],
 	"name": "2016 Topcoder Open Logo Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30051059,
-	"forumId": 598066,
-	"numSubmissions": 57,
-	"numRegistrants": 111,
+	"numOfSubmissions": 57,
+	"numOfRegistrants": 111,
 	"registrationStartDate": "2015-08-10T13:00:01.576Z",
 	"registrationEndDate": "2015-08-24T13:17:15.335Z",
 	"checkpointSubmissionEndDate": "2015-08-17T13:10:56.385Z",
@@ -527,14 +533,17 @@
 	"updatedBy": "22841596",
 	"technologies": "",
 	"status": "COMPLETED",
-	"track": "DESIGN",
-	"subTrack": "LOGO_DESIGN",
+	"legacy": {
+		"forumId": 596557
+	},
+	"track": "Design",
+	"type": "Challenge",
+	"tags": "Logo Design",
 	"name": "ACME Logos Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30050375,
-	"forumId": 596557,
-	"numSubmissions": 15,
-	"numRegistrants": 55,
+	"numOfSubmissions": 15,
+	"numOfRegistrants": 55,
 	"registrationStartDate": "2015-06-01T19:00:33.351Z",
 	"registrationEndDate": "2015-06-09T13:00:37.186Z",
 	"checkpointSubmissionEndDate": "2015-06-06T13:07:38.023Z",

__tests__/shared/components/ChallengeTile/__mocks__/develop.json

@@ -21,14 +21,16 @@
 	"updatedBy": "22841596",
 	"technologies": "CSS, HTML, JavaScript",
 	"status": "COMPLETED",
-	"track": "DEVELOP",
-	"subTrack": "FIRST_2_FINISH",
+	"legacy": {
+		"forumId": 39153
+	},
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060905,
-	"forumId": 39153,
-	"numSubmissions": 3,
-	"numRegistrants": 8,
+	"numOfSubmissions": 3,
+	"numOfRegistrants": 8,
 	"registrationStartDate": "2017-12-02T09:01:23.251Z",
 	"registrationEndDate": "2017-12-12T20:01:00.000Z",
 	"checkpointSubmissionEndDate": null,
@@ -162,14 +164,16 @@
 	"updatedBy": "22841596",
 	"technologies": "ReactJS",
 	"status": "COMPLETED",
-	"track": "DEVELOP",
-	"subTrack": "FIRST_2_FINISH",
+	"legacy": {
+		"forumId": 39151
+	},
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060903,
-	"forumId": 39151,
-	"numSubmissions": 2,
-	"numRegistrants": 6,
+	"numOfSubmissions": 2,
+	"numOfRegistrants": 6,
 	"registrationStartDate": "2017-12-02T09:01:21.329Z",
 	"registrationEndDate": "2017-12-12T20:01:00.000Z",
 	"checkpointSubmissionEndDate": null,
@@ -318,14 +322,16 @@
 	"updatedBy": "22841596",
 	"technologies": "Angular 2+, Express, JSON, Node.js",
 	"status": "COMPLETED",
-	"track": "DEVELOP",
-	"subTrack": "FIRST_2_FINISH",
+	"legacy": {
+		"forumId": 38951
+	},
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$500 BG800 Online Course Mock Rest API F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060687,
-	"forumId": 38951,
-	"numSubmissions": 14,
-	"numRegistrants": 18,
+	"numOfSubmissions": 14,
+	"numOfRegistrants": 18,
 	"registrationStartDate": "2017-11-24T13:27:44.751Z",
 	"registrationEndDate": "2017-12-05T22:27:00.000Z",
 	"checkpointSubmissionEndDate": null,
@@ -624,14 +630,16 @@
 	"updatedBy": "22841596",
 	"technologies": "JavaScript, ReactJS",
 	"status": "COMPLETED",
-	"track": "DEVELOP",
-	"subTrack": "FIRST_2_FINISH",
+	"legacy": {		
+		"forumId": 38702
+	},
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "John Hancock - Giving Tuesday - General image handling",
 	"reviewType": "INTERNAL",
 	"id": 30060425,
-	"forumId": 38702,
-	"numSubmissions": 3,
-	"numRegistrants": 17,
+	"numOfSubmissions": 3,
+	"numOfRegistrants": 17,
 	"registrationStartDate": "2017-11-11T02:02:21.127Z",
 	"registrationEndDate": "2017-11-21T02:02:00.000Z",
 	"checkpointSubmissionEndDate": null,