mirror of
https://github.com/element-hq/element-web
synced 2024-11-27 11:47:23 +03:00
Merge pull request #8271 from vector-im/jryans/rm-team-server
Remove support for team servers
This commit is contained in:
commit
8ab82b7ed7
2 changed files with 0 additions and 36 deletions
|
@ -157,8 +157,6 @@ For a good example, see https://riot.im/develop/config.json
|
|||
1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
|
||||
1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
|
||||
1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
|
||||
1. `teamServerConfig`, `teamTokenMap`, `referralBaseUrl`: an obsolete precursor to communities
|
||||
with referral tracking; please ignore it.
|
||||
1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
|
||||
|
||||
|
||||
|
|
|
@ -343,40 +343,6 @@ describe('loading:', function() {
|
|||
}).done(done, done);
|
||||
});
|
||||
|
||||
it("logs in correctly with a Riot Team Server", function() {
|
||||
sdk.setFetch(httpBackend.fetchFn); // XXX: ought to restore this!
|
||||
|
||||
httpBackend.when('GET', '/pushrules').respond(200, {});
|
||||
httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
|
||||
|
||||
loadApp({
|
||||
config: {
|
||||
teamServerConfig: {
|
||||
teamServerURL: 'http://my_team_server',
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
return Promise.delay(1).then(() => {
|
||||
// we expect a loading spinner while we log into the RTS
|
||||
assertAtLoadingSpinner(matrixChat);
|
||||
|
||||
httpBackend.when('GET', 'my_team_server/login').respond(200, {
|
||||
team_token: 'nom',
|
||||
});
|
||||
return httpBackend.flush();
|
||||
}).then(() => {
|
||||
return awaitSyncingSpinner(matrixChat);
|
||||
}).then(() => {
|
||||
// we got a sync spinner - let the sync complete
|
||||
return expectAndAwaitSync();
|
||||
}).then(() => {
|
||||
// once the sync completes, we should have a home page
|
||||
ReactTestUtils.findRenderedComponentWithType(
|
||||
matrixChat, sdk.getComponent('structures.HomePage'));
|
||||
});
|
||||
});
|
||||
|
||||
describe('/#/login link:', function() {
|
||||
beforeEach(function() {
|
||||
loadApp({
|
||||
|
|
Loading…
Reference in a new issue