Merge pull request #601 from CruGlobal/develop

Develop > Master

package.json

@@ -52,7 +52,7 @@
     "react-native-default-preference": "^1.3.1",
     "react-native-device-info": "^0.21.5",
     "react-native-fabric": "^0.5.1",
-    "react-native-fbsdk": "^0.7.0",
+    "react-native-fbsdk": "^0.8.0",
     "react-native-omniture": "https://github.com/CruGlobal/react-native-omniture",
     "react-native-parallax-scroll-view": "^0.21.0",
     "react-native-push-notification": "https://github.com/CruGlobal/react-native-push-notification",

__tests__/App.js → src/__tests__/App.js

@@ -6,19 +6,19 @@ import Enzyme from 'enzyme/build/index';
 import { Crashlytics } from 'react-native-fabric';
 import StackTrace from 'stacktrace-js';
 
-import App from '../src/App';
+import App from '../App';
 import {
   EXPIRED_ACCESS_TOKEN,
   INVALID_ACCESS_TOKEN,
   INVALID_GRANT,
   NETWORK_REQUEST_FAILED,
-} from '../src/constants';
-import * as auth from '../src/actions/auth';
-import locale from '../src/i18n/locales/en-US';
+} from '../constants';
+import * as auth from '../actions/auth';
+import locale from '../i18n/locales/en-US';
 
 Enzyme.configure({ adapter: new Adapter() });
 
-jest.mock('../src/AppNavigator', () => ({ AppNavigator: 'mockAppNavigator' }));
+jest.mock('../AppNavigator', () => ({ AppNavigator: 'mockAppNavigator' }));
 
 jest.mock('react-native-default-preference', () => ({
   get: jest.fn().mockReturnValue(Promise.reject()),
@@ -35,8 +35,8 @@ jest.mock('react-navigation-redux-helpers', () => ({
 
 jest.mock('stacktrace-js');
 
-jest.mock('../src/store', () => ({
-  store: require('../testUtils').createMockStore(),
+jest.mock('../store', () => ({
+  store: require('../../testUtils').createMockStore(),
   persistor: {},
 }));
 

__tests__/storeMigrations.js → src/__tests__/storeMigrations.js

@@ -1,4 +1,4 @@
-import { migrations } from '../src/storeMigrations';
+import { migrations } from '../storeMigrations';
 
 it('should migrate impact reducer to use summary key', () => {
   expect(

__tests__/actions/analytics.js → src/actions/__tests__/analytics.js

@@ -12,14 +12,14 @@ import {
   trackActionWithoutData,
   trackSearchFilter,
   emitterCallback,
-} from '../../src/actions/analytics';
+} from '../analytics';
 import {
   ACTIONS,
   ANALYTICS,
   ANALYTICS_CONTEXT_CHANGED,
   CUSTOM_STEP_TYPE,
   LOGGED_IN,
-} from '../../src/constants';
+} from '../../constants';
 
 const mockTracker = {
   trackScreenView: jest.fn(),

__tests__/actions/api.js → src/actions/__tests__/api.js

@@ -1,17 +1,17 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import callApi, { REQUESTS } from '../../src/actions/api';
-import API_CALLS from '../../src/api';
+import callApi, { REQUESTS } from '../api';
+import API_CALLS from '../../api';
 import {
   EXPIRED_ACCESS_TOKEN,
   INVALID_ACCESS_TOKEN,
   INVALID_GRANT,
   UPDATE_TOKEN,
-} from '../../src/constants';
-import { mockFnWithParams } from '../../testUtils';
-import * as auth from '../../src/actions/auth';
-import * as facebook from '../../src/actions/facebook';
+} from '../../constants';
+import { mockFnWithParams } from '../../../testUtils';
+import * as auth from '../auth';
+import * as facebook from '../facebook';
 
 const token = 'alsnjfjwqfpuqfeownposfnjnsaobjfaslkklnsfd';
 const refreshToken = 'refresh';

__tests__/actions/auth.js → src/actions/__tests__/auth.js

@@ -4,17 +4,17 @@ import i18next from 'i18next';
 import MockDate from 'mockdate';
 import { Linking } from 'react-native';
 
-import * as callApi from '../../src/actions/api';
-import * as constants from '../../src/constants';
-import { REQUESTS } from '../../src/actions/api';
-import * as navigation from '../../src/actions/navigation';
-import * as login from '../../src/actions/login';
-import * as auth from '../../src/actions/auth';
-import * as person from '../../src/actions/person';
-import * as organizations from '../../src/actions/organizations';
-import * as stages from '../../src/actions/stages';
-import * as steps from '../../src/actions/steps';
-import * as notifications from '../../src/actions/notifications';
+import * as callApi from '../api';
+import { REQUESTS } from '../api';
+import * as constants from '../../constants';
+import * as navigation from '../navigation';
+import * as login from '../login';
+import * as auth from '../auth';
+import * as person from '../person';
+import * as organizations from '../organizations';
+import * as stages from '../stages';
+import * as steps from '../steps';
+import * as notifications from '../notifications';
 import {
   keyLogin,
   refreshAccessToken,
@@ -23,16 +23,16 @@ import {
   logout,
   upgradeAccount,
   openKeyURL,
-} from '../../src/actions/auth';
-import { mockFnWithParams } from '../../testUtils';
-import { LOGIN_OPTIONS_SCREEN } from '../../src/containers/LoginOptionsScreen';
-import { OPEN_URL } from '../../src/constants';
-import { getTimezoneString } from '../../src/actions/auth';
-import { refreshAnonymousLogin } from '../../src/actions/auth';
-import { deletePushToken } from '../../src/actions/notifications';
-import * as onboardingProfile from '../../src/actions/onboardingProfile';
-
-jest.mock('../../src/actions/notifications');
+} from '../auth';
+import { mockFnWithParams } from '../../../testUtils';
+import { LOGIN_OPTIONS_SCREEN } from '../../containers/LoginOptionsScreen';
+import { OPEN_URL } from '../../constants';
+import { getTimezoneString } from '../auth';
+import { refreshAnonymousLogin } from '../auth';
+import { deletePushToken } from '../notifications';
+import * as onboardingProfile from '../onboardingProfile';
+
+jest.mock('../../actions/notifications');
 
 const email = 'klas&jflk@lkjasdf.com';
 const password = 'this&is=unsafe';

__tests__/actions/celebration.js → src/actions/__tests__/celebration.js

@@ -1,17 +1,14 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import {
-  getGroupCelebrateFeed,
-  toggleLike,
-} from '../../src/actions/celebration';
-import callApi, { REQUESTS } from '../../src/actions/api';
+import { getGroupCelebrateFeed, toggleLike } from '../celebration';
+import callApi, { REQUESTS } from '../api';
 import {
   DEFAULT_PAGE_LIMIT,
   RESET_CELEBRATION_PAGINATION,
-} from '../../src/constants';
+} from '../../constants';
 
-jest.mock('../../src/actions/api');
+jest.mock('../api');
 
 const orgId = '123';
 

__tests__/actions/challenges.js → src/actions/__tests__/challenges.js

@@ -8,20 +8,20 @@ import {
   joinChallenge,
   createChallenge,
   updateChallenge,
-} from '../../src/actions/challenges';
-import { reloadGroupCelebrateFeed } from '../../src/actions/celebration';
-import callApi, { REQUESTS } from '../../src/actions/api';
+} from '../challenges';
+import { reloadGroupCelebrateFeed } from '../celebration';
+import callApi, { REQUESTS } from '../api';
 import {
   DEFAULT_PAGE_LIMIT,
   RESET_CHALLENGE_PAGINATION,
-} from '../../src/constants';
-import { CELEBRATION_SCREEN } from '../../src/containers/CelebrationScreen';
-import * as common from '../../src/utils/common';
-import { navigatePush } from '../../src/actions/navigation';
+} from '../../constants';
+import { CELEBRATION_SCREEN } from '../../containers/CelebrationScreen';
+import * as common from '../../utils/common';
+import { navigatePush } from '../navigation';
 
-jest.mock('../../src/actions/api');
-jest.mock('../../src/actions/navigation');
-jest.mock('../../src/actions/celebration');
+jest.mock('../api');
+jest.mock('../navigation');
+jest.mock('../celebration');
 
 const fakeDate = '2018-09-06T14:13:21Z';
 common.formatApiDate = jest.fn(() => fakeDate);

__tests__/actions/facebook.js → src/actions/__tests__/facebook.js

@@ -2,16 +2,16 @@ import { AccessToken, LoginManager } from 'react-native-fbsdk';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import { mockFnWithParams } from '../../testUtils';
-import { REQUESTS } from '../../src/actions/api';
-import * as callApi from '../../src/actions/api';
-import { ANALYTICS } from '../../src/constants';
-import * as analytics from '../../src/actions/analytics';
+import { mockFnWithParams } from '../../../testUtils';
+import { REQUESTS } from '../api';
+import * as callApi from '../api';
+import { ANALYTICS } from '../../constants';
+import * as analytics from '../analytics';
 import {
   facebookLoginAction,
   facebookLoginWithUsernamePassword,
   refreshMissionHubFacebookAccess,
-} from '../../src/actions/facebook';
+} from '../facebook';
 
 const mockStore = configureStore([thunk]);
 

__tests__/actions/impact.js → src/actions/__tests__/impact.js

@@ -5,10 +5,10 @@ import {
   getImpactSummary,
   getPeopleInteractionsReport,
   refreshImpact,
-} from '../../src/actions/impact';
-import callApi, { REQUESTS } from '../../src/actions/api';
+} from '../impact';
+import callApi, { REQUESTS } from '../api';
 
-jest.mock('../../src/actions/api');
+jest.mock('../api');
 
 const store = configureStore([thunk])();
 

__tests__/actions/interactions.js → src/actions/__tests__/interactions.js

@@ -1,20 +1,20 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import { addNewInteraction, editComment } from '../../src/actions/interactions';
-import * as api from '../../src/actions/api';
-import { REQUESTS } from '../../src/actions/api';
-import * as analytics from '../../src/actions/analytics';
-import * as impact from '../../src/actions/impact';
-import { mockFnWithParams } from '../../testUtils';
-import { ACTIONS, INTERACTION_TYPES } from '../../src/constants';
-import { reloadGroupCelebrateFeed } from '../../src/actions/celebration';
-import { reloadJourney } from '../../src/actions/journey';
+import { addNewInteraction, editComment } from '../interactions';
+import * as api from '../api';
+import { REQUESTS } from '../api';
+import * as analytics from '../analytics';
+import * as impact from '../impact';
+import { mockFnWithParams } from '../../../testUtils';
+import { ACTIONS, INTERACTION_TYPES } from '../../constants';
+import { reloadGroupCelebrateFeed } from '../celebration';
+import { reloadJourney } from '../journey';
 
 let store;
 
-jest.mock('../../src/actions/celebration');
-jest.mock('../../src/actions/journey');
+jest.mock('../celebration');
+jest.mock('../journey');
 
 const mockApi = (result, ...expectedParams) =>
   mockFnWithParams(api, 'default', result, ...expectedParams);

__tests__/actions/journey.js → src/actions/__tests__/journey.js

@@ -1,16 +1,12 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import callApi, { REQUESTS } from '../../src/actions/api';
-import {
-  getJourney,
-  reloadJourney,
-  getGroupJourney,
-} from '../../src/actions/journey';
-import { isAdminForOrg } from '../../src/utils/common';
-
-jest.mock('../../src/actions/api');
-jest.mock('../../src/utils/common');
+import callApi, { REQUESTS } from '../api';
+import { getJourney, reloadJourney, getGroupJourney } from '../journey';
+import { isAdminForOrg } from '../../utils/common';
+
+jest.mock('../api');
+jest.mock('../../utils/common');
 
 Date = jest.fn(() => ({
   toISOString: () => '2018-04-17T00:00:00Z',

__tests__/actions/login.js → src/actions/__tests__/login.js

@@ -3,15 +3,15 @@ import thunk from 'redux-thunk';
 import { Crashlytics } from 'react-native-fabric';
 import * as RNOmniture from 'react-native-omniture';
 
-import * as person from '../../src/actions/person';
-import * as navigation from '../../src/actions/navigation';
-import { onSuccessfulLogin } from '../../src/actions/login';
-import { mockFnWithParams } from '../../testUtils';
-import * as analytics from '../../src/actions/analytics';
-import { ADD_SOMEONE_SCREEN } from '../../src/containers/AddSomeoneScreen';
-import { GET_STARTED_SCREEN } from '../../src/containers/GetStartedScreen';
-import { MAIN_TABS, ACTIONS } from '../../src/constants';
-import * as onboardingProfile from '../../src/actions/onboardingProfile';
+import * as person from '../person';
+import * as navigation from '../navigation';
+import { onSuccessfulLogin } from '../login';
+import { mockFnWithParams } from '../../../testUtils';
+import * as analytics from '../analytics';
+import { ADD_SOMEONE_SCREEN } from '../../containers/AddSomeoneScreen';
+import { GET_STARTED_SCREEN } from '../../containers/GetStartedScreen';
+import { MAIN_TABS, ACTIONS } from '../../constants';
+import * as onboardingProfile from '../onboardingProfile';
 
 const mockStore = configureStore([thunk]);
 const personId = '593348';