From 391ec65a4215d1fff6bee9413a09e76796e46a3b Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 28 Feb 2023 11:18:41 -0300 Subject: [PATCH] Explicit export Detox imports as per documentation --- .eslintrc.js | 13 +------------ e2e/helpers/app.ts | 2 +- e2e/tests/assorted/01-e2eencryption.spec.ts | 2 +- e2e/tests/assorted/02-broadcast.spec.ts | 2 +- e2e/tests/assorted/03-profile.spec.ts | 2 +- e2e/tests/assorted/04-setting.spec.ts | 2 +- e2e/tests/assorted/05-joinpublicroom.spec.ts | 2 +- e2e/tests/assorted/06-status.spec.ts | 2 +- e2e/tests/assorted/07-changeserver.spec.ts | 2 ++ e2e/tests/assorted/08-joinprotectedroom.spec.ts | 2 +- e2e/tests/assorted/09-joinfromdirectory.spec.ts | 2 ++ e2e/tests/assorted/10-deleteserver.spec.ts | 2 ++ e2e/tests/assorted/11-deeplinking.spec.ts | 1 + e2e/tests/assorted/12-i18n.spec.ts | 2 +- e2e/tests/assorted/13-display-pref.spec.ts | 2 +- e2e/tests/assorted/14-in-app-notification.spec.ts | 2 ++ e2e/tests/onboarding/01-onboarding.spec.ts | 2 +- e2e/tests/onboarding/02-legal.spec.ts | 2 +- e2e/tests/onboarding/03-forgotpassword.spec.ts | 2 +- e2e/tests/onboarding/04-createuser.spec.ts | 2 ++ e2e/tests/onboarding/05-login.spec.ts | 2 ++ e2e/tests/onboarding/06-roomslist.spec.ts | 2 +- e2e/tests/onboarding/07-server-history.spec.ts | 2 +- e2e/tests/room/01-createroom.spec.ts | 2 +- e2e/tests/room/02-room.spec.ts | 2 +- e2e/tests/room/03-roomactions.spec.ts | 3 +-- e2e/tests/room/04-discussion.spec.ts | 2 +- e2e/tests/room/05-threads.spec.ts | 2 +- e2e/tests/room/06-createdmgroup.spec.ts | 2 ++ e2e/tests/room/07-markasunread.spec.ts | 2 +- e2e/tests/room/08-roominfo.spec.ts | 2 +- e2e/tests/room/09-jumptomessage.spec.ts | 2 +- e2e/tests/room/10-ignoreuser.spec.ts | 2 +- e2e/tests/team/01-createteam.spec.ts | 2 +- e2e/tests/team/02-team.spec.ts | 2 +- e2e/tests/team/03-moveconvert.spec.ts | 2 ++ 36 files changed, 44 insertions(+), 39 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 963e50abf..f50cc8ecd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -240,19 +240,8 @@ module.exports = { }, { files: ['e2e/**'], - globals: { - by: true, - detox: true, - device: true, - element: true, - waitFor: true - }, rules: { - 'import/no-extraneous-dependencies': 0, - 'no-await-in-loop': 0, - 'no-restricted-syntax': 0, - // TODO: remove this rule when update Detox to 20 and test if the namespace Detox is available - 'no-undef': 1 + 'no-await-in-loop': 0 } } ] diff --git a/e2e/helpers/app.ts b/e2e/helpers/app.ts index 940157935..4057ff0b2 100644 --- a/e2e/helpers/app.ts +++ b/e2e/helpers/app.ts @@ -1,4 +1,4 @@ -import { by, expect, element } from 'detox'; +import Detox, { device, waitFor, element, by, expect } from 'detox'; import data from '../data'; diff --git a/e2e/tests/assorted/01-e2eencryption.spec.ts b/e2e/tests/assorted/01-e2eencryption.spec.ts index e755437cf..91edb3f20 100644 --- a/e2e/tests/assorted/01-e2eencryption.spec.ts +++ b/e2e/tests/assorted/01-e2eencryption.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, diff --git a/e2e/tests/assorted/02-broadcast.spec.ts b/e2e/tests/assorted/02-broadcast.spec.ts index 051ed0015..2ab3f9368 100644 --- a/e2e/tests/assorted/02-broadcast.spec.ts +++ b/e2e/tests/assorted/02-broadcast.spec.ts @@ -1,6 +1,6 @@ // const OTP = require('otp.js'); // const GA = OTP.googleAuthenticator; -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, diff --git a/e2e/tests/assorted/03-profile.spec.ts b/e2e/tests/assorted/03-profile.spec.ts index 033693e8c..df4c8ef3b 100644 --- a/e2e/tests/assorted/03-profile.spec.ts +++ b/e2e/tests/assorted/03-profile.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login, sleep, platformTypes, TTextMatcher } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/04-setting.spec.ts b/e2e/tests/assorted/04-setting.spec.ts index ff9efd761..b16841401 100644 --- a/e2e/tests/assorted/04-setting.spec.ts +++ b/e2e/tests/assorted/04-setting.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login, platformTypes, TTextMatcher } from '../../helpers/app'; import { createRandomRoom, createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/05-joinpublicroom.spec.ts b/e2e/tests/assorted/05-joinpublicroom.spec.ts index 0df17e230..09b44d032 100644 --- a/e2e/tests/assorted/05-joinpublicroom.spec.ts +++ b/e2e/tests/assorted/05-joinpublicroom.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import data from '../../data'; import { navigateToLogin, login, tapBack, searchRoom, platformTypes, TTextMatcher, mockRandomMessage } from '../../helpers/app'; diff --git a/e2e/tests/assorted/06-status.spec.ts b/e2e/tests/assorted/06-status.spec.ts index 67cb89006..34e3afe6a 100644 --- a/e2e/tests/assorted/06-status.spec.ts +++ b/e2e/tests/assorted/06-status.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login, sleep } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/07-changeserver.spec.ts b/e2e/tests/assorted/07-changeserver.spec.ts index 98c8205f0..4d0b32aa4 100644 --- a/e2e/tests/assorted/07-changeserver.spec.ts +++ b/e2e/tests/assorted/07-changeserver.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import data from '../../data'; import { navigateToLogin, login, checkServer, expectValidRegisterOrRetry } from '../../helpers/app'; import { createRandomRoom, createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/08-joinprotectedroom.spec.ts b/e2e/tests/assorted/08-joinprotectedroom.spec.ts index f9c7af0fc..ad0a28552 100644 --- a/e2e/tests/assorted/08-joinprotectedroom.spec.ts +++ b/e2e/tests/assorted/08-joinprotectedroom.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import data from '../../data'; import { navigateToLogin, login, searchRoom, mockRandomMessage } from '../../helpers/app'; diff --git a/e2e/tests/assorted/09-joinfromdirectory.spec.ts b/e2e/tests/assorted/09-joinfromdirectory.spec.ts index 2ee01f415..20b714e82 100644 --- a/e2e/tests/assorted/09-joinfromdirectory.spec.ts +++ b/e2e/tests/assorted/09-joinfromdirectory.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import data from '../../data'; import { navigateToLogin, login, tapBack, sleep } from '../../helpers/app'; import { createRandomTeam, createRandomUser, ITestUser, sendMessage } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/10-deleteserver.spec.ts b/e2e/tests/assorted/10-deleteserver.spec.ts index c70b83e8a..a0b3ef8cd 100644 --- a/e2e/tests/assorted/10-deleteserver.spec.ts +++ b/e2e/tests/assorted/10-deleteserver.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import data from '../../data'; import { sleep, diff --git a/e2e/tests/assorted/11-deeplinking.spec.ts b/e2e/tests/assorted/11-deeplinking.spec.ts index 8ebe9155d..f8a3ab31d 100644 --- a/e2e/tests/assorted/11-deeplinking.spec.ts +++ b/e2e/tests/assorted/11-deeplinking.spec.ts @@ -1,3 +1,4 @@ +import { device, waitFor, element, by } from 'detox'; import EJSON from 'ejson'; import data from '../../data'; diff --git a/e2e/tests/assorted/12-i18n.spec.ts b/e2e/tests/assorted/12-i18n.spec.ts index dea038600..bbf4df4b2 100644 --- a/e2e/tests/assorted/12-i18n.spec.ts +++ b/e2e/tests/assorted/12-i18n.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import Detox, { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/13-display-pref.spec.ts b/e2e/tests/assorted/13-display-pref.spec.ts index c56a47791..76361d340 100644 --- a/e2e/tests/assorted/13-display-pref.spec.ts +++ b/e2e/tests/assorted/13-display-pref.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { login, navigateToLogin } from '../../helpers/app'; import { createRandomUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/assorted/14-in-app-notification.spec.ts b/e2e/tests/assorted/14-in-app-notification.spec.ts index 661860d5c..8dbcb258f 100644 --- a/e2e/tests/assorted/14-in-app-notification.spec.ts +++ b/e2e/tests/assorted/14-in-app-notification.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import { navigateToLogin, login, sleep, tapBack, navigateToRoom, checkRoomTitle } from '../../helpers/app'; import { sendMessage, post, ITestUser, createRandomUser, createRandomRoom } from '../../helpers/data_setup'; diff --git a/e2e/tests/onboarding/01-onboarding.spec.ts b/e2e/tests/onboarding/01-onboarding.spec.ts index 2e7e1984e..d44777c7e 100644 --- a/e2e/tests/onboarding/01-onboarding.spec.ts +++ b/e2e/tests/onboarding/01-onboarding.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { TTextMatcher, platformTypes } from '../../helpers/app'; import data from '../../data'; diff --git a/e2e/tests/onboarding/02-legal.spec.ts b/e2e/tests/onboarding/02-legal.spec.ts index 8844ac085..8bbed0ea7 100644 --- a/e2e/tests/onboarding/02-legal.spec.ts +++ b/e2e/tests/onboarding/02-legal.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToRegister, navigateToLogin } from '../../helpers/app'; diff --git a/e2e/tests/onboarding/03-forgotpassword.spec.ts b/e2e/tests/onboarding/03-forgotpassword.spec.ts index 275866b12..32c1bfa5c 100644 --- a/e2e/tests/onboarding/03-forgotpassword.spec.ts +++ b/e2e/tests/onboarding/03-forgotpassword.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, platformTypes, TTextMatcher } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/onboarding/04-createuser.spec.ts b/e2e/tests/onboarding/04-createuser.spec.ts index e0e6738ac..5ca795ff3 100644 --- a/e2e/tests/onboarding/04-createuser.spec.ts +++ b/e2e/tests/onboarding/04-createuser.spec.ts @@ -1,3 +1,5 @@ +import { device, element, by } from 'detox'; + import { navigateToRegister, expectValidRegisterOrRetry } from '../../helpers/app'; import data from '../../data'; diff --git a/e2e/tests/onboarding/05-login.spec.ts b/e2e/tests/onboarding/05-login.spec.ts index d7fd3817b..b56381a82 100644 --- a/e2e/tests/onboarding/05-login.spec.ts +++ b/e2e/tests/onboarding/05-login.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import { navigateToLogin, tapBack, platformTypes, navigateToWorkspace, login, TTextMatcher } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/onboarding/06-roomslist.spec.ts b/e2e/tests/onboarding/06-roomslist.spec.ts index 262426646..3184e5737 100644 --- a/e2e/tests/onboarding/06-roomslist.spec.ts +++ b/e2e/tests/onboarding/06-roomslist.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { login, navigateToLogin, logout, tapBack, searchRoom } from '../../helpers/app'; import { createRandomUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/onboarding/07-server-history.spec.ts b/e2e/tests/onboarding/07-server-history.spec.ts index 9b786fa31..1bd38b6ad 100644 --- a/e2e/tests/onboarding/07-server-history.spec.ts +++ b/e2e/tests/onboarding/07-server-history.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { login, navigateToLogin, logout, tapBack, tapAndWaitFor } from '../../helpers/app'; import data from '../../data'; diff --git a/e2e/tests/room/01-createroom.spec.ts b/e2e/tests/room/01-createroom.spec.ts index 6edc060d4..455fa56b0 100644 --- a/e2e/tests/room/01-createroom.spec.ts +++ b/e2e/tests/room/01-createroom.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { tapBack, navigateToLogin, login, platformTypes, TTextMatcher, tapAndWaitFor } from '../../helpers/app'; import { createRandomUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/room/02-room.spec.ts b/e2e/tests/room/02-room.spec.ts index 1de595d87..5e20515c8 100644 --- a/e2e/tests/room/02-room.spec.ts +++ b/e2e/tests/room/02-room.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, diff --git a/e2e/tests/room/03-roomactions.spec.ts b/e2e/tests/room/03-roomactions.spec.ts index ce1b4fade..722356cc3 100644 --- a/e2e/tests/room/03-roomactions.spec.ts +++ b/e2e/tests/room/03-roomactions.spec.ts @@ -1,6 +1,5 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; -// import data from '../../data'; import { navigateToLogin, login, diff --git a/e2e/tests/room/04-discussion.spec.ts b/e2e/tests/room/04-discussion.spec.ts index 20024c41c..4675d2c5d 100644 --- a/e2e/tests/room/04-discussion.spec.ts +++ b/e2e/tests/room/04-discussion.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { TTextMatcher, diff --git a/e2e/tests/room/05-threads.spec.ts b/e2e/tests/room/05-threads.spec.ts index 4201bf3b5..20ebf28ea 100644 --- a/e2e/tests/room/05-threads.spec.ts +++ b/e2e/tests/room/05-threads.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, diff --git a/e2e/tests/room/06-createdmgroup.spec.ts b/e2e/tests/room/06-createdmgroup.spec.ts index 1e8d30695..5ebcc75eb 100644 --- a/e2e/tests/room/06-createdmgroup.spec.ts +++ b/e2e/tests/room/06-createdmgroup.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import { navigateToLogin, login, platformTypes, TTextMatcher } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/room/07-markasunread.spec.ts b/e2e/tests/room/07-markasunread.spec.ts index d4dfc3c31..664d7ae1a 100644 --- a/e2e/tests/room/07-markasunread.spec.ts +++ b/e2e/tests/room/07-markasunread.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login, sleep, platformTypes, TTextMatcher, navigateToRoom } from '../../helpers/app'; import { createRandomUser, ITestUser, sendMessage } from '../../helpers/data_setup'; diff --git a/e2e/tests/room/08-roominfo.spec.ts b/e2e/tests/room/08-roominfo.spec.ts index 9c73c7b3d..67b839712 100644 --- a/e2e/tests/room/08-roominfo.spec.ts +++ b/e2e/tests/room/08-roominfo.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import Detox, { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login, tapBack, sleep, platformTypes, TTextMatcher, navigateToRoom } from '../../helpers/app'; import { createRandomRoom, createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/room/09-jumptomessage.spec.ts b/e2e/tests/room/09-jumptomessage.spec.ts index 35f3134a5..137ad31c8 100644 --- a/e2e/tests/room/09-jumptomessage.spec.ts +++ b/e2e/tests/room/09-jumptomessage.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import data from '../../data'; import { navigateToLogin, tapBack, login, sleep, platformTypes, TTextMatcher, navigateToRoom } from '../../helpers/app'; diff --git a/e2e/tests/room/10-ignoreuser.spec.ts b/e2e/tests/room/10-ignoreuser.spec.ts index a14b385cc..d4743a07f 100644 --- a/e2e/tests/room/10-ignoreuser.spec.ts +++ b/e2e/tests/room/10-ignoreuser.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, diff --git a/e2e/tests/team/01-createteam.spec.ts b/e2e/tests/team/01-createteam.spec.ts index 39fc9bd79..b86a49efe 100644 --- a/e2e/tests/team/01-createteam.spec.ts +++ b/e2e/tests/team/01-createteam.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, login, platformTypes, TTextMatcher } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; diff --git a/e2e/tests/team/02-team.spec.ts b/e2e/tests/team/02-team.spec.ts index c714e5e61..9c087609d 100644 --- a/e2e/tests/team/02-team.spec.ts +++ b/e2e/tests/team/02-team.spec.ts @@ -1,4 +1,4 @@ -import { expect } from 'detox'; +import Detox, { device, waitFor, element, by, expect } from 'detox'; import { navigateToLogin, diff --git a/e2e/tests/team/03-moveconvert.spec.ts b/e2e/tests/team/03-moveconvert.spec.ts index bb99f0b0c..7adf12eda 100644 --- a/e2e/tests/team/03-moveconvert.spec.ts +++ b/e2e/tests/team/03-moveconvert.spec.ts @@ -1,3 +1,5 @@ +import { device, waitFor, element, by } from 'detox'; + import { navigateToLogin, login, tapBack, platformTypes, TTextMatcher, sleep, navigateToRoom } from '../../helpers/app'; import { createRandomUser, ITestUser } from '../../helpers/data_setup'; import random from '../../helpers/random';