Merge pull request #226 from topcoder-platform/integration-v5-develop

Integration v5 develop

Author: sushilshinde

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-      - run: npm publish
+      - run: npm publish --tag test-release
 # dont change anything
 workflows:
   version: 2

__tests__/__snapshots__/index.js.snap

@@ -111,6 +111,8 @@ Object {
       "getSubtrackChallengesInit": [Function],
       "getUserMarathonDone": [Function],
       "getUserMarathonInit": [Function],
+      "getUserResourcesDone": [Function],
+      "getUserResourcesInit": [Function],
       "getUserSrmDone": [Function],
       "getUserSrmInit": [Function],
     },
@@ -223,9 +225,9 @@ Object {
       "setEndDate": [Function],
       "setReviewOpportunityType": [Function],
       "setStartDate": [Function],
-      "setSubtracks": [Function],
       "setTags": [Function],
       "setText": [Function],
+      "setTypes": [Function],
     },
   },
   "errors": Object {
@@ -303,7 +305,6 @@ Object {
       "default": undefined,
       "getService": [Function],
       "normalizeChallenge": [Function],
-      "normalizeChallengeDetails": [Function],
     },
     "communities": Object {
       "default": undefined,
@@ -340,6 +341,7 @@ Object {
     "reviewOpportunities": Object {
       "default": undefined,
       "getReviewOpportunitiesService": [Function],
+      "normalizeChallenges": [Function],
     },
     "submissions": Object {
       "default": undefined,
@@ -370,9 +372,10 @@ Object {
   },
   "tc": Object {
     "COMPETITION_TRACKS": Object {
-      "DATA_SCIENCE": "data_science",
-      "DESIGN": "design",
-      "DEVELOP": "develop",
+      "DATA_SCIENCE": "Data Science",
+      "DESIGN": "Design",
+      "DEVELOP": "Development",
+      "QA": "Quality Assurance",
     },
     "REVIEW_OPPORTUNITY_TYPES": Object {
       "Contest Review": "Review",

__tests__/actions/__snapshots__/challenge.js.snap

@@ -2,7 +2,7 @@
 
 exports[`challenge.fetchChallengeInit 1`] = `
 Object {
-  "payload": "12345",
+  "payload": "123456789",
   "type": "CHALLENGE/GET_DETAILS_INIT",
 }
 `;
@@ -16,7 +16,7 @@ Object {
 
 exports[`challenge.fetchSubmissionsInit 1`] = `
 Object {
-  "payload": "12345",
+  "payload": "123456789",
   "type": "CHALLENGE/GET_SUBMISSIONS_INIT",
 }
 `;

__tests__/actions/auth.js

@@ -1,17 +1,20 @@
-const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v3/groups?memberId=12345&membershipType=user';
+const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v5/groups?memberId=12345&membershipType=user';
 const MOCK_PROFILE_REQ_URL = 'https://api.topcoder-dev.com/v3/members/username12345';
 
 jest.mock('isomorphic-fetch', () => jest.fn(url => Promise.resolve({
+  ok: true,
   json: () => {
     let content;
     switch (url) {
-      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2']; break;
-      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 }; break;
+      case MOCK_GROUPS_REQ_URL:
+        content = ['Group1', 'Group2'];
+        break;
+      case MOCK_PROFILE_REQ_URL:
+        content = { result: { content: { userId: 12345 }, status: 200 } };
+        break;
       default: throw new Error('Unexpected URL!');
     }
-    return {
-      result: { content, status: 200 },
-    };
+    return content;
   },
 })));
 

__tests__/actions/challenge.js

@@ -3,20 +3,20 @@ import { actions } from '../../src';
 jest.mock('../../src/services/challenges');
 
 test('challenge.fetchChallengeInit', () => {
-  expect(actions.challenge.getDetailsInit(12345)).toMatchSnapshot();
+  expect(actions.challenge.getDetailsInit(123456789)).toMatchSnapshot();
 });
 
 test('challenge.fetchSubmissionsInit', () => {
-  expect(actions.challenge.getSubmissionsInit(12345)).toMatchSnapshot();
+  expect(actions.challenge.getSubmissionsInit(123456789)).toMatchSnapshot();
 });
 
 
 test('challenge.getDetailsDone', () => {
-  expect(actions.challenge.getDetailsDone(12345)).toMatchSnapshot();
+  expect(actions.challenge.getDetailsDone(123456789)).toMatchSnapshot();
 });
 
 test('challenge.fetchSubmissionsDone', () => {
-  expect(actions.challenge.getSubmissionsDone(12345, {})).toMatchSnapshot();
+  expect(actions.challenge.getSubmissionsDone(123456789, {})).toMatchSnapshot();
 });
 
 test('challenge.getActiveChallengesCountInit', () => {