Minor fixes

RocketChat · Apr 19, 2021 · cbffe47 · cbffe47
1 parent 929b990
commit cbffe47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/e2e/helpers/app.js b/e2e/helpers/app.js
@@ -32,7 +32,7 @@ async function login(username, password) {
     await element(by.id('login-view-email')).replaceText(username);
     await element(by.id('login-view-password')).replaceText(password);
     await element(by.id('login-view-submit')).tap();
-    await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(10000);
+    await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(30000);
 }
 
 async function logout() {

diff --git a/e2e/helpers/data_setup.js b/e2e/helpers/data_setup.js
@@ -20,6 +20,7 @@ const login = async (username, password) => {
     const authToken = response.data.data.authToken
     rocketchat.defaults.headers.common['X-User-Id'] = userId
     rocketchat.defaults.headers.common['X-Auth-Token'] = authToken
+    return { authToken, userId };
 }
 
 const createUser = async (username, password, name, email) => {
@@ -146,5 +147,5 @@ const post = (endpoint, body) => {
 }
 
 module.exports = {
-    setup, sendMessage, get, post
+    setup, sendMessage, get, post, login
 }
diff --git a/e2e/tests/assorted/11-deeplinking.spec.js b/e2e/tests/assorted/11-deeplinking.spec.js
@@ -2,8 +2,8 @@ const {
 	device, element, by, waitFor
 } = require('detox');
 const data = require('../../data');
-const { tapBack, checkServer, navigateToRegister, login } = require('../../helpers/app');
-const { post, get } = require('../../helpers/data_setup');
+const { tapBack, checkServer, navigateToRegister } = require('../../helpers/app');
+const { post, get, login } = require('../../helpers/data_setup');
 
 const DEEPLINK_METHODS = { AUTH: 'auth', ROOM: 'room' };
 const getDeepLink = (method, server, params) => {
@@ -14,14 +14,10 @@ const getDeepLink = (method, server, params) => {
 
 describe('Deep linking', () => {
 	let userId;
-	let token;
+	let authToken;
 	before(async() => {
-		const loginResult = await post('login', {
-			user: data.users.regular.username,
-			password: data.users.regular.password
-		})
-    userId = loginResult.data.data.userId
-    token = loginResult.data.data.authToken
+		const loginResult = await login(data.users.regular.username, data.users.regular.password);
+		({ userId, authToken } = loginResult);
 	});
 
 	describe('Authentication', () => {
@@ -39,7 +35,7 @@ describe('Deep linking', () => {
 			await device.launchApp({
 				permissions: { notifications: 'YES' },
 				newInstance: true,
-				url: getDeepLink(DEEPLINK_METHODS.AUTH, data.server, `userId=${ userId }&token=${ token }&path=group/${ data.groups.private.name }`),
+				url: getDeepLink(DEEPLINK_METHODS.AUTH, data.server, `userId=${ userId }&token=${ authToken }&path=group/${ data.groups.private.name }`),
 				sourceApp: 'com.apple.mobilesafari'
 			});
 			await waitFor(element(by.id(`room-view-title-${ data.groups.private.name }`))).toExist().withTimeout(30000);