diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/client/client.jsx | 10 | ||||
| -rw-r--r-- | webapp/tests/client_team.test.jsx | 34 | ||||
| -rw-r--r-- | webapp/tests/test_helper.jsx | 94 |
3 files changed, 40 insertions, 98 deletions
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 5ce3e369d..e5fe25fcd 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -507,16 +507,6 @@ export default class Client { // Team Routes Section - createTeamFromSignup(teamSignup, success, error) { - request. - post(`${this.getTeamsRoute()}/create_from_signup`). - set(this.defaultHeaders). - type('application/json'). - accept('application/json'). - send(teamSignup). - end(this.handleResponse.bind(this, 'createTeamFromSignup', success, error)); - } - findTeamByName(teamName, success, error) { request. post(`${this.getTeamsRoute()}/find_team_by_name`). diff --git a/webapp/tests/client_team.test.jsx b/webapp/tests/client_team.test.jsx index 61449fb15..012259d0c 100644 --- a/webapp/tests/client_team.test.jsx +++ b/webapp/tests/client_team.test.jsx @@ -38,40 +38,6 @@ describe('Client.Team', function() { ); }); - it('createTeamFromSignup', function(done) { - var client = TestHelper.createClient(); - var email = TestHelper.fakeEmail(); - - client.signupTeam( - email, - function(data) { - var teamSignup = {}; - teamSignup.invites = []; - teamSignup.data = decodeURIComponent(data.follow_link.split('&h=')[0].replace('/signup_team_complete/?d=', '')); - teamSignup.hash = decodeURIComponent(data.follow_link.split('&h=')[1]); - - teamSignup.user = TestHelper.fakeUser(); - teamSignup.team = TestHelper.fakeTeam(); - teamSignup.team.email = teamSignup.user.email; - - client.createTeamFromSignup( - teamSignup, - function(data2) { - assert.equal(data2.team.id.length > 0, true); - assert.equal(data2.user.id.length > 0, true); - done(); - }, - function(err) { - done(new Error(err.message)); - } - ); - }, - function(err) { - done(new Error(err.message)); - } - ); - }); - it('createTeam', function(done) { var client = TestHelper.createClient(); var team = TestHelper.fakeTeam(); diff --git a/webapp/tests/test_helper.jsx b/webapp/tests/test_helper.jsx index 310714e30..79788948b 100644 --- a/webapp/tests/test_helper.jsx +++ b/webapp/tests/test_helper.jsx @@ -106,78 +106,64 @@ class TestHelperClass { initBasic = (callback, connectWS) => { this.basicc = this.createClient(); + function throwerror(err) { + throw err; + } + var d1 = jqd.Deferred(); var email = this.fakeEmail(); - var outer = this; // eslint-disable-line consistent-this - - this.basicClient().signupTeam( - email, - function(rsignUp) { - var teamSignup = {}; - teamSignup.invites = []; - teamSignup.data = decodeURIComponent(rsignUp.follow_link.split('&h=')[0].replace('/signup_team_complete/?d=', '')); - teamSignup.hash = decodeURIComponent(rsignUp.follow_link.split('&h=')[1]); - - teamSignup.user = outer.fakeUser(); - teamSignup.team = outer.fakeTeam(); - teamSignup.team.email = email; - teamSignup.user.email = email; - var password = teamSignup.user.password; - - outer.basicClient().createTeamFromSignup( - teamSignup, - function(rteamSignup) { - outer.basict = rteamSignup.team; - outer.basicu = rteamSignup.user; - outer.basicu.password = password; - outer.basicClient().setTeamId(outer.basict.id); - outer.basicClient().login( - rteamSignup.user.email, - password, - null, - function(data, res) { - if (connectWS) { - outer.basicwsc = outer.createWebSocketClient(res.header[HEADER_TOKEN]); - } - outer.basicClient().useHeaderToken(); - var channel = outer.fakeChannel(); - channel.team_id = outer.basicTeam().id; - outer.basicClient().createChannel( + var user = this.fakeUser(); + var team = this.fakeTeam(); + team.email = email; + user.email = email; + var self = this; + + this.basicClient().createUser( + user, + function(ruser) { + self.basicu = ruser; + self.basicu.password = user.password; + self.basicClient().login( + self.basicu.email, + self.basicu.password, + null, + function(data, res) { + if (connectWS) { + self.basicwsc = self.createWebSocketClient(res.header[HEADER_TOKEN]); + } + self.basicClient().useHeaderToken(); + self.basicClient().createTeam(team, + function(rteam) { + self.basict = rteam; + self.basicClient().setTeamId(rteam.id); + var channel = self.fakeChannel(); + channel.team_id = self.basicTeam().id; + self.basicClient().createChannel( channel, function(rchannel) { - outer.basicch = rchannel; - var post = outer.fakePost(); + self.basicch = rchannel; + var post = self.fakePost(); post.channel_id = rchannel.id; - outer.basicClient().createPost( + self.basicClient().createPost( post, function(rpost) { - outer.basicp = rpost; + self.basicp = rpost; d1.resolve(); }, - function(err) { - throw err; - } + throwerror ); }, - function(err) { - throw err; - } + throwerror ); }, - function(err) { - throw err; - } + throwerror ); }, - function(err) { - throw err; - } + throwerror ); }, - function(err) { - throw err; - } + throwerror ); jqd.when(d1).done(() => { |