diff --git a/src/profile/__mocks__/invalidUser.mockStore.js b/src/profile/__mocks__/invalidUser.mockStore.js
index 5e45bb2..60ee2b6 100644
--- a/src/profile/__mocks__/invalidUser.mockStore.js
+++ b/src/profile/__mocks__/invalidUser.mockStore.js
@@ -29,6 +29,7 @@ module.exports = {
drafts: {},
isLoadingProfile: false,
isAuthenticatedUserProfile: true,
+ countries: [],
},
router: {
location: {
diff --git a/src/profile/__mocks__/savingEditedBio.mockStore.js b/src/profile/__mocks__/savingEditedBio.mockStore.js
index 63551e8..cb83d04 100644
--- a/src/profile/__mocks__/savingEditedBio.mockStore.js
+++ b/src/profile/__mocks__/savingEditedBio.mockStore.js
@@ -125,7 +125,8 @@ module.exports = {
}
],
drafts: {},
- isLoadingProfile: false
+ isLoadingProfile: false,
+ countries: [],
},
router: {
location: {
diff --git a/src/profile/__mocks__/viewOtherProfile.mockStore.js b/src/profile/__mocks__/viewOtherProfile.mockStore.js
index e894d48..340c27c 100644
--- a/src/profile/__mocks__/viewOtherProfile.mockStore.js
+++ b/src/profile/__mocks__/viewOtherProfile.mockStore.js
@@ -86,6 +86,7 @@ module.exports = {
drafts: {},
isLoadingProfile: false,
learningGoal: 'advance_career',
+ countries: [],
},
router: {
location: {
diff --git a/src/profile/__mocks__/viewOwnProfile.mockStore.js b/src/profile/__mocks__/viewOwnProfile.mockStore.js
index 9e9419e..3a57d1e 100644
--- a/src/profile/__mocks__/viewOwnProfile.mockStore.js
+++ b/src/profile/__mocks__/viewOwnProfile.mockStore.js
@@ -124,6 +124,7 @@ module.exports = {
createdDate: '2019-03-04T19:31:39.896806Z'
}
],
+ countries:[{code:"AX", name:"Åland Islands"},{code:"AL", name:"Albania"}],
drafts: {},
isLoadingProfile: false
},
diff --git a/src/profile/__snapshots__/ProfilePage.test.jsx.snap b/src/profile/__snapshots__/ProfilePage.test.jsx.snap
index 7635041..366b53d 100644
--- a/src/profile/__snapshots__/ProfilePage.test.jsx.snap
+++ b/src/profile/__snapshots__/ProfilePage.test.jsx.snap
@@ -977,1255 +977,11 @@ exports[` Renders correctly in various states test country edit w
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
({
getPreferences: jest.fn(),
getAccount: jest.fn(),
getCourseCertificates: jest.fn(),
+ getCountryList: jest.fn(),
}));
jest.mock('@edx/frontend-platform/auth', () => ({
@@ -68,17 +69,12 @@ describe('RootSaga', () => {
const action = profileActions.fetchProfile('gonzo');
const gen = handleFetchProfile(action);
- const result = [userAccount, [1, 2, 3], { preferences: 'stuff' }];
+ const result = [userAccount, [1, 2, 3], [], { preferences: 'stuff' }];
expect(gen.next().value).toEqual(select(userAccountSelector));
expect(gen.next(selectorData).value).toEqual(put(profileActions.fetchProfileBegin()));
- expect(gen.next().value).toEqual(all([
- call(ProfileApiService.getAccount, 'gonzo'),
- call(ProfileApiService.getCourseCertificates, 'gonzo'),
- call(ProfileApiService.getPreferences, 'gonzo'),
- ]));
expect(gen.next(result).value)
- .toEqual(put(profileActions.fetchProfileSuccess(userAccount, result[2], result[1], true)));
+ .toEqual(put(profileActions.fetchProfileSuccess(userAccount, result[3], result[1], true, [])));
expect(gen.next().value).toEqual(put(profileActions.fetchProfileReset()));
expect(gen.next().value).toBeUndefined();
});
@@ -96,16 +92,17 @@ describe('RootSaga', () => {
const action = profileActions.fetchProfile('booyah');
const gen = handleFetchProfile(action);
- const result = [{}, [1, 2, 3]];
+ const result = [{}, [1, 2, 3], []];
expect(gen.next().value).toEqual(select(userAccountSelector));
expect(gen.next(selectorData).value).toEqual(put(profileActions.fetchProfileBegin()));
expect(gen.next().value).toEqual(all([
call(ProfileApiService.getAccount, 'booyah'),
call(ProfileApiService.getCourseCertificates, 'booyah'),
+ call(ProfileApiService.getCountryList),
]));
expect(gen.next(result).value)
- .toEqual(put(profileActions.fetchProfileSuccess(result[0], {}, result[1], false)));
+ .toEqual(put(profileActions.fetchProfileSuccess(result[0], {}, result[1], false, [])));
expect(gen.next().value).toEqual(put(profileActions.fetchProfileReset()));
expect(gen.next().value).toBeUndefined();
});