From 1d08b2c8c96bc23608bfa1383dca1de01c16bb8a Mon Sep 17 00:00:00 2001
From: Anant Bhasin <bhasinanant@gmail.com>
Date: Wed, 2 Jun 2021 01:37:57 +0530
Subject: [PATCH] 2 Test files remaining in assorted

---
 app/views/DirectoryView/Options.js         | 3 ++-
 e2e/tests/assorted/07-changeserver.spec.js | 1 +
 e2e/tests/assorted/10-deleteserver.spec.js | 1 +
 package.json                               | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/DirectoryView/Options.js b/app/views/DirectoryView/Options.js
index ad8de1da1..e5454d214 100644
--- a/app/views/DirectoryView/Options.js
+++ b/app/views/DirectoryView/Options.js
@@ -69,6 +69,7 @@ export default class DirectoryOptions extends PureComponent {
 				onPress={() => changeType(itemType)}
 				style={styles.dropdownItemButton}
 				theme={theme}
+				accessibilityLabel={I18n.t(text)}
 			>
 				<View style={styles.dropdownItemContainer}>
 					<CustomIcon style={[styles.dropdownItemIcon, { color: themes[theme].bodyText }]} size={22} name={icon} />
@@ -97,7 +98,7 @@ export default class DirectoryOptions extends PureComponent {
 					<Animated.View style={[styles.backdrop, { backgroundColor: themes[theme].backdropColor, opacity: backdropOpacity }]} />
 				</TouchableWithoutFeedback>
 				<Animated.View style={[styles.dropdownContainer, { transform: [{ translateY }], backgroundColor: themes[theme].backgroundColor }]}>
-					<Touch onPress={this.close} theme={theme}>
+					<Touch onPress={this.close} theme={theme} accessibilityLabel={I18n.t('Search_by')}>
 						<View style={[styles.dropdownContainerHeader, styles.dropdownItemContainer, { borderColor: themes[theme].separatorColor }]}>
 							<Text style={[styles.dropdownToggleText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Search_by')}</Text>
 							<CustomIcon style={[styles.dropdownItemIcon, styles.inverted, { color: themes[theme].auxiliaryTintColor }]} size={22} name='chevron-down' />
diff --git a/e2e/tests/assorted/07-changeserver.spec.js b/e2e/tests/assorted/07-changeserver.spec.js
index 06ac7c36a..d2ce23152 100644
--- a/e2e/tests/assorted/07-changeserver.spec.js
+++ b/e2e/tests/assorted/07-changeserver.spec.js
@@ -5,6 +5,7 @@ const data = require('../../data');
 const { navigateToLogin, login, checkServer } = require('../../helpers/app');
 
 const reopenAndCheckServer = async(server) => {
+	await device.terminateApp();
 	await device.launchApp({ permissions: { notifications: 'YES' } });
 	await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(6000);
 	await checkServer(server);
diff --git a/e2e/tests/assorted/10-deleteserver.spec.js b/e2e/tests/assorted/10-deleteserver.spec.js
index ad797817e..75023fc90 100644
--- a/e2e/tests/assorted/10-deleteserver.spec.js
+++ b/e2e/tests/assorted/10-deleteserver.spec.js
@@ -32,6 +32,7 @@ describe('Delete server', () => {
 		await element(by.id('register-view-username')).replaceText(data.registeringUser3.username);
 		await element(by.id('register-view-email')).replaceText(data.registeringUser3.email);
 		await element(by.id('register-view-password')).typeText(data.registeringUser3.password);
+		await element(by.type('android.widget.ScrollView')).atIndex(0).swipe('up');
 		await element(by.id('register-view-submit')).tap();
 		await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(60000);
 
diff --git a/package.json b/package.json
index 8eebb4fab..dcde40858 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
     "generate-source-maps-android": "bugsnag-sourcemaps",
     "postinstall": "patch-package && jetify",
     "detoxAD": "detox build -c android.experimental.play.dev.debug  && detox test -c android.experimental.play.dev.debug",
-    "detoxAR": "detox build -c android.experimental.play.dev.release && cd .. && detox test -c android.experimental.play.dev.release",
+    "detoxAR": "detox build -c android.experimental.play.dev.release && detox test -c android.experimental.play.dev.release",
     "detoxADEmu": "detox build -c android.experimental.play.emu.debug  && detox test -c android.experimental.play.emu.debug",
-    "detoxAREmu": "detox build -c android.experimental.play.emu.release && cd .. && detox test -c android.experimental.play.emu.release"
+    "detoxAREmu": "detox build -c android.experimental.play.emu.release && detox test -c android.experimental.play.emu.release"
   },
   "husky": {
     "hooks": {