|
@@ -1,7 +1,8 @@
|
|
|
import {browserHistory} from 'react-router';
|
|
|
import selectEvent from 'react-select-event';
|
|
|
import {AuthProvider} from 'sentry-fixture/authProvider';
|
|
|
-import {Members} from 'sentry-fixture/members';
|
|
|
+import {Member as MemberFixture} from 'sentry-fixture/member';
|
|
|
+import {Members as MembersFixture} from 'sentry-fixture/members';
|
|
|
import {Organization} from 'sentry-fixture/organization';
|
|
|
import RouterContextFixture from 'sentry-fixture/routerContextFixture';
|
|
|
import RouterFixture from 'sentry-fixture/routerFixture';
|
|
@@ -20,6 +21,7 @@ import {
|
|
|
import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
|
|
|
import ConfigStore from 'sentry/stores/configStore';
|
|
|
import OrganizationsStore from 'sentry/stores/organizationsStore';
|
|
|
+import {OrgRoleFixture} from 'sentry/types/role';
|
|
|
import {trackAnalytics} from 'sentry/utils/analytics';
|
|
|
import OrganizationMembersList from 'sentry/views/settings/organizationMembers/organizationMembersList';
|
|
|
|
|
@@ -57,10 +59,10 @@ const roles = [
|
|
|
// ];
|
|
|
|
|
|
describe('OrganizationMembersList', function () {
|
|
|
- const members = TestStubs.Members();
|
|
|
+ const members = MembersFixture();
|
|
|
|
|
|
const ownerTeam = Team({slug: 'owner-team', orgRole: 'owner'});
|
|
|
- const member = TestStubs.Member({
|
|
|
+ const member = MemberFixture({
|
|
|
id: '5',
|
|
|
email: 'member@sentry.io',
|
|
|
teams: [ownerTeam.slug],
|
|
@@ -72,16 +74,22 @@ describe('OrganizationMembersList', function () {
|
|
|
],
|
|
|
flags: {
|
|
|
'sso:linked': true,
|
|
|
+ 'idp:provisioned': false,
|
|
|
+ 'idp:role-restricted': false,
|
|
|
+ 'member-limit:restricted': false,
|
|
|
+ 'partnership:restricted': false,
|
|
|
+ 'sso:invalid': false,
|
|
|
},
|
|
|
groupOrgRoles: [
|
|
|
{
|
|
|
teamSlug: ownerTeam.slug,
|
|
|
- role: {id: 'owner'},
|
|
|
+ role: OrgRoleFixture({id: 'owner'}),
|
|
|
},
|
|
|
],
|
|
|
});
|
|
|
|
|
|
const currentUser = members[1];
|
|
|
+ currentUser.user = User({...currentUser, flags: {newsletter_consent_prompt: true}});
|
|
|
const organization = Organization({
|
|
|
access: ['member:admin', 'org:admin', 'member:write'],
|
|
|
status: {
|
|
@@ -100,7 +108,7 @@ describe('OrganizationMembersList', function () {
|
|
|
routeParams: router.params,
|
|
|
};
|
|
|
|
|
|
- jest.spyOn(ConfigStore, 'get').mockImplementation(() => currentUser);
|
|
|
+ jest.spyOn(ConfigStore, 'get').mockImplementation(() => currentUser.user);
|
|
|
|
|
|
afterAll(function () {
|
|
|
(ConfigStore.get as jest.Mock).mockRestore();
|
|
@@ -116,7 +124,7 @@ describe('OrganizationMembersList', function () {
|
|
|
MockApiClient.addMockResponse({
|
|
|
url: '/organizations/org-slug/members/',
|
|
|
method: 'GET',
|
|
|
- body: [...Members(), member],
|
|
|
+ body: [...MembersFixture(), member],
|
|
|
});
|
|
|
MockApiClient.addMockResponse({
|
|
|
url: `/organizations/org-slug/members/${member.id}/`,
|
|
@@ -448,15 +456,15 @@ describe('OrganizationMembersList', function () {
|
|
|
});
|
|
|
|
|
|
describe('OrganizationInviteRequests', function () {
|
|
|
- const inviteRequest = TestStubs.Member({
|
|
|
+ const inviteRequest = MemberFixture({
|
|
|
id: '123',
|
|
|
user: null,
|
|
|
inviteStatus: 'requested_to_be_invited',
|
|
|
- inviter: User(),
|
|
|
+ inviterName: User().name,
|
|
|
role: 'member',
|
|
|
teams: [],
|
|
|
});
|
|
|
- const joinRequest = TestStubs.Member({
|
|
|
+ const joinRequest = MemberFixture({
|
|
|
id: '456',
|
|
|
user: null,
|
|
|
email: 'test@gmail.com',
|