From b22a5183edb3cf4d81bfcdfaea3007434a27dd3d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 19 Apr 2017 13:37:46 -0300
Subject: [PATCH] [Test] Remove code duplication, use getCredentials method

---
 tests/data/api-data.js                    |  5 +++--
 tests/end-to-end/api/00-miscellaneous.js  | 12 +-----------
 tests/end-to-end/api/01-users.js          | 12 +-----------
 tests/end-to-end/api/02-channels.js       | 12 +-----------
 tests/end-to-end/api/03-groups.js         | 12 +-----------
 tests/end-to-end/api/04-direct-message.js | 13 ++-----------
 tests/end-to-end/api/05-chat.js           | 12 +-----------
 7 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/tests/data/api-data.js b/tests/data/api-data.js
index 43a61859bc4..d9d5ee6acdb 100644
--- a/tests/data/api-data.js
+++ b/tests/data/api-data.js
@@ -36,7 +36,7 @@ export function log(res) {
 	});
 }
 
-export function getCredentials() {
+export function getCredentials(done = function() {}) {
 	request.post(api('login'))
 		.send(login)
 		.expect('Content-Type', 'application/json')
@@ -44,6 +44,7 @@ export function getCredentials() {
 		.expect((res) => {
 			credentials['X-Auth-Token'] = res.body.data.authToken;
 			credentials['X-User-Id'] = res.body.data.userId;
-		});
+		})
+		.end(done);
 }
 
diff --git a/tests/end-to-end/api/00-miscellaneous.js b/tests/end-to-end/api/00-miscellaneous.js
index 874f1db1708..6e457a37684 100644
--- a/tests/end-to-end/api/00-miscellaneous.js
+++ b/tests/end-to-end/api/00-miscellaneous.js
@@ -9,17 +9,7 @@ import supertest from 'supertest';
 describe('miscellaneous', function() {
 	this.retries(0);
 
-	before((done) => {
-		request.post(api('login'))
-		.send(login)
-		.expect('Content-Type', 'application/json')
-		.expect(200)
-		.expect((res) => {
-			credentials['X-Auth-Token'] = res.body.data.authToken;
-			credentials['X-User-Id'] = res.body.data.userId;
-		})
-		.end(done);
-	});
+	before(done => getCredentials(done));
 
 	describe('API default', () => {
 	// Required by mobile apps
diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
index 7d86025fb56..e5fa8fc3eb0 100644
--- a/tests/end-to-end/api/01-users.js
+++ b/tests/end-to-end/api/01-users.js
@@ -10,17 +10,7 @@ import supertest from 'supertest';
 describe('Users', function() {
 	this.retries(0);
 
-	before((done) => {
-		request.post(api('login'))
-		.send(login)
-		.expect('Content-Type', 'application/json')
-		.expect(200)
-		.expect((res) => {
-			credentials['X-Auth-Token'] = res.body.data.authToken;
-			credentials['X-User-Id'] = res.body.data.userId;
-		})
-		.end(done);
-	});
+	before(done => getCredentials(done));
 
 	it('/users.create', (done) => {
 		request.post(api('users.create'))
diff --git a/tests/end-to-end/api/02-channels.js b/tests/end-to-end/api/02-channels.js
index cb01dbbe02b..b872c27c2d9 100644
--- a/tests/end-to-end/api/02-channels.js
+++ b/tests/end-to-end/api/02-channels.js
@@ -22,17 +22,7 @@ function getRoomInfo(roomId) {
 describe('channels', function() {
 	this.retries(0);
 
-	before((done) => {
-		request.post(api('login'))
-		.send(login)
-		.expect('Content-Type', 'application/json')
-		.expect(200)
-		.expect((res) => {
-			credentials['X-Auth-Token'] = res.body.data.authToken;
-			credentials['X-User-Id'] = res.body.data.userId;
-		})
-		.end(done);
-	});
+	before(done => getCredentials(done));
 
 	it('/channels.create', (done) => {
 		request.post(api('channels.create'))
diff --git a/tests/end-to-end/api/03-groups.js b/tests/end-to-end/api/03-groups.js
index 17ccdfb9f2f..98498ba0844 100644
--- a/tests/end-to-end/api/03-groups.js
+++ b/tests/end-to-end/api/03-groups.js
@@ -22,17 +22,7 @@ function getRoomInfo(roomId) {
 describe('groups', function() {
 	this.retries(0);
 
-	before((done) => {
-		request.post(api('login'))
-		.send(login)
-		.expect('Content-Type', 'application/json')
-		.expect(200)
-		.expect((res) => {
-			credentials['X-Auth-Token'] = res.body.data.authToken;
-			credentials['X-User-Id'] = res.body.data.userId;
-		})
-		.end(done);
-	});
+	before(done => getCredentials(done));
 
 	it('/groups.create', (done) => {
 		request.post(api('groups.create'))
diff --git a/tests/end-to-end/api/04-direct-message.js b/tests/end-to-end/api/04-direct-message.js
index b75e678229b..96c10eecaee 100644
--- a/tests/end-to-end/api/04-direct-message.js
+++ b/tests/end-to-end/api/04-direct-message.js
@@ -9,17 +9,8 @@ import supertest from 'supertest';
 describe('direct messages', function() {
 	this.retries(0);
 
-	before((done) => {
-		request.post(api('login'))
-		.send(login)
-		.expect('Content-Type', 'application/json')
-		.expect(200)
-		.expect((res) => {
-			credentials['X-Auth-Token'] = res.body.data.authToken;
-			credentials['X-User-Id'] = res.body.data.userId;
-		})
-		.end(done);
-	});
+	before(done => getCredentials(done));
+
 	it('/chat.postMessage', (done) => {
 		request.post(api('chat.postMessage'))
 			.set(credentials)
diff --git a/tests/end-to-end/api/05-chat.js b/tests/end-to-end/api/05-chat.js
index ee770e56e71..495c9d78ad4 100644
--- a/tests/end-to-end/api/05-chat.js
+++ b/tests/end-to-end/api/05-chat.js
@@ -9,17 +9,7 @@ import supertest from 'supertest';
 describe('chat', function() {
 	this.retries(0);
 
-	before((done) => {
-		request.post(api('login'))
-		.send(login)
-		.expect('Content-Type', 'application/json')
-		.expect(200)
-		.expect((res) => {
-			credentials['X-Auth-Token'] = res.body.data.authToken;
-			credentials['X-User-Id'] = res.body.data.userId;
-		})
-		.end(done);
-	});
+	before(done => getCredentials(done));
 
 	it('/chat.postMessage', (done) => {
 		request.post(api('chat.postMessage'))