sync develop with v5-feature

Author: LieutenantRoger

__tests__/actions/auth.js

@@ -15,7 +15,22 @@ jest.mock('isomorphic-fetch', () => jest.fn(url => Promise.resolve({
   },
 })));
 
-const fetch = require('isomorphic-fetch');
+jest.mock('cross-fetch', () => jest.fn(url => Promise.resolve({
+  json: () => {
+    let content;
+    switch (url) {
+      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2']; break;
+      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 }; break;
+      default: throw new Error('Unexpected URL!');
+    }
+    return {
+      result: { content, status: 200 },
+    };
+  },
+})));
+
+// const fetch = require('isomorphic-fetch');
+const crossfetch = require('cross-fetch');
 const { actions } = require('../../src');
 
 describe('fetch with success response', () => {
@@ -25,13 +40,13 @@ describe('fetch with success response', () => {
     const action = actions.auth.loadProfile('token');
     expect(action.type).toBe('AUTH/LOAD_PROFILE');
     return action.payload.then((res) => {
-      expect(fetch).toHaveBeenCalledWith(MOCK_PROFILE_REQ_URL, {
+      expect(crossfetch).toHaveBeenCalledWith(MOCK_PROFILE_REQ_URL, {
         headers: {
           Authorization: 'Bearer token',
           'Content-Type': 'application/json',
         },
       });
-      expect(fetch).toHaveBeenCalledWith(MOCK_GROUPS_REQ_URL, {
+      expect(crossfetch).toHaveBeenCalledWith(MOCK_GROUPS_REQ_URL, {
         headers: {
           Authorization: 'Bearer token',
           'Content-Type': 'application/json',

__tests__/services/api.js

@@ -4,6 +4,11 @@ jest.mock(
   () => jest.fn((url, ops) => Promise.resolve({ url, ops })),
 );
 
+jest.mock(
+  'cross-fetch',
+  () => jest.fn((url, ops) => Promise.resolve({ url, ops })),
+);
+
 const { config } = require('topcoder-react-utils');
 const { getApi } = require('../../src/services/api');
 

dist/dev/index.js

@@ -18,7 +18,7 @@ This module provides a service for convenient manipulation with
             * [.close(challengeId, winnerId)](#module_services.challenges..ChallengesService+close) ⇒ <code>Promise</code>
             * [.createTask(projectId, accountId, title, description, assignee, payment)](#module_services.challenges..ChallengesService+createTask) ⇒ <code>Promise</code>
             * [.getChallengeDetails(challengeId)](#module_services.challenges..ChallengesService+getChallengeDetails) ⇒ <code>Promise</code>
-            * [.getChallengeSubtracks()](#module_services.challenges..ChallengesService+getChallengeSubtracks) ⇒ <code>Promise</code>
+            * [.getChallengeTypes()](#module_services.challenges..ChallengesService+getChallengeTypes) ⇒ <code>Promise</code>
             * [.getChallengeTags()](#module_services.challenges..ChallengesService+getChallengeTags) ⇒ <code>Promise</code>
             * [.getChallenges(filters, params)](#module_services.challenges..ChallengesService+getChallenges) ⇒ <code>Promise</code>
             * [.getMarathonMatches(filters, params)](#module_services.challenges..ChallengesService+getMarathonMatches) ⇒ <code>Promise</code>
@@ -119,7 +119,7 @@ Challenge service.
     * [.close(challengeId, winnerId)](#module_services.challenges..ChallengesService+close) ⇒ <code>Promise</code>
     * [.createTask(projectId, accountId, title, description, assignee, payment)](#module_services.challenges..ChallengesService+createTask) ⇒ <code>Promise</code>
     * [.getChallengeDetails(challengeId)](#module_services.challenges..ChallengesService+getChallengeDetails) ⇒ <code>Promise</code>
-    * [.getChallengeSubtracks()](#module_services.challenges..ChallengesService+getChallengeSubtracks) ⇒ <code>Promise</code>
+    * [.getChallengeTypes()](#module_services.challenges..ChallengesService+getChallengeTypes) ⇒ <code>Promise</code>
     * [.getChallengeTags()](#module_services.challenges..ChallengesService+getChallengeTags) ⇒ <code>Promise</code>
     * [.getChallenges(filters, params)](#module_services.challenges..ChallengesService+getChallenges) ⇒ <code>Promise</code>
     * [.getMarathonMatches(filters, params)](#module_services.challenges..ChallengesService+getMarathonMatches) ⇒ <code>Promise</code>
@@ -203,9 +203,9 @@ incorrect in the main v3 endpoint. This may change in the future.
 | --- | --- |
 | challengeId | <code>Number</code> \| <code>String</code> | 
 
-<a name="module_services.challenges..ChallengesService+getChallengeSubtracks"></a>
+<a name="module_services.challenges..ChallengesService+getChallengeTypes"></a>
 
-#### challengesService.getChallengeSubtracks() ⇒ <code>Promise</code>
+#### challengesService.getChallengeTypes() ⇒ <code>Promise</code>
 Gets possible challenge subtracks.
 
 **Kind**: instance method of [<code>ChallengesService</code>](#module_services.challenges..ChallengesService)