Merge branch 'develop' into fix.multiple-calls-jump-to-message
This commit is contained in:
Reinaldo Neto
GitHub
commit
df09ef1c35
|
|
@ -1,6 +1,6 @@
|
||||||
__tests__
|
__tests__
|
||||||
node_modules
|
node_modules
|
||||||
coverage
|
coverage
|
||||||
e2e
|
e2e/docker
|
||||||
android
|
android
|
||||||
ios
|
ios
|
||||||
21
.eslintrc.js
21
.eslintrc.js
|
|
@ -29,7 +29,8 @@ module.exports = {
|
||||||
"commonjs": true,
|
"commonjs": true,
|
||||||
"es6": true,
|
"es6": true,
|
||||||
"node": true,
|
"node": true,
|
||||||
"jquery": true
|
"jquery": true,
|
||||||
|
"mocha": true
|
||||||
},
|
},
|
||||||
"rules": {
|
"rules": {
|
||||||
"react/jsx-filename-extension": [1, {
|
"react/jsx-filename-extension": [1, {
|
||||||
|
|
@ -155,5 +156,23 @@ module.exports = {
|
||||||
},
|
},
|
||||||
"globals": {
|
"globals": {
|
||||||
"__DEV__": true
|
"__DEV__": true
|
||||||
|
},
|
||||||
|
overrides: [
|
||||||
|
{
|
||||||
|
files: ['e2e/**'],
|
||||||
|
globals: {
|
||||||
|
by: true,
|
||||||
|
detox: true,
|
||||||
|
device: true,
|
||||||
|
element: true,
|
||||||
|
expect: true,
|
||||||
|
waitFor: true
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
'import/no-extraneous-dependencies': 0,
|
||||||
|
'no-await-in-loop': 0,
|
||||||
|
'no-restricted-syntax': 0
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -11490,7 +11490,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -11593,7 +11593,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -11696,7 +11696,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -11973,7 +11973,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -12076,7 +12076,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -12179,7 +12179,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -12420,7 +12420,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -12692,7 +12692,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -12795,7 +12795,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -12898,7 +12898,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -13175,7 +13175,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -13278,7 +13278,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -13381,7 +13381,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -13622,7 +13622,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
|
||||||
},
|
},
|
||||||
undefined,
|
undefined,
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -67631,7 +67631,7 @@ Array [
|
||||||
"textAlign": "left",
|
"textAlign": "left",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"backgroundColor": "transparent",
|
"backgroundColor": "transparent",
|
||||||
|
|
@ -67791,7 +67791,7 @@ Array [
|
||||||
"textAlign": "left",
|
"textAlign": "left",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"backgroundColor": "transparent",
|
"backgroundColor": "transparent",
|
||||||
|
|
@ -74309,7 +74309,7 @@ exports[`Storyshots Thread Messages.Item themes 1`] = `
|
||||||
"textAlign": "left",
|
"textAlign": "left",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"flex": 1,
|
"flex": 1,
|
||||||
|
|
@ -74661,7 +74661,7 @@ exports[`Storyshots Thread Messages.Item themes 1`] = `
|
||||||
"textAlign": "left",
|
"textAlign": "left",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"color": "#e8ebed",
|
"color": "#cbced1",
|
||||||
},
|
},
|
||||||
Object {
|
Object {
|
||||||
"flex": 1,
|
"flex": 1,
|
||||||
|
|
|
||||||
|
|
@ -66,9 +66,10 @@ export const INVITE_LINKS = createRequestTypes('INVITE_LINKS', [
|
||||||
'CLEAR',
|
'CLEAR',
|
||||||
...defaultTypes
|
...defaultTypes
|
||||||
]);
|
]);
|
||||||
export const SETTINGS = createRequestTypes('SETTINGS', ['CLEAR', 'ADD']);
|
export const SETTINGS = createRequestTypes('SETTINGS', ['CLEAR', 'ADD', 'UPDATE']);
|
||||||
export const APP_STATE = createRequestTypes('APP_STATE', ['FOREGROUND', 'BACKGROUND']);
|
export const APP_STATE = createRequestTypes('APP_STATE', ['FOREGROUND', 'BACKGROUND']);
|
||||||
export const ENTERPRISE_MODULES = createRequestTypes('ENTERPRISE_MODULES', ['CLEAR', 'SET']);
|
export const ENTERPRISE_MODULES = createRequestTypes('ENTERPRISE_MODULES', ['CLEAR', 'SET']);
|
||||||
export const ENCRYPTION = createRequestTypes('ENCRYPTION', ['INIT', 'STOP', 'DECODE_KEY', 'SET', 'SET_BANNER']);
|
export const ENCRYPTION = createRequestTypes('ENCRYPTION', ['INIT', 'STOP', 'DECODE_KEY', 'SET', 'SET_BANNER']);
|
||||||
|
|
||||||
export const PERMISSIONS = createRequestTypes('PERMISSIONS', ['SET']);
|
export const PERMISSIONS = createRequestTypes('PERMISSIONS', ['SET', 'UPDATE']);
|
||||||
|
export const ROLES = createRequestTypes('ROLES', ['SET', 'UPDATE', 'REMOVE']);
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
import * as types from './actionsTypes';
|
import * as types from './actionsTypes';
|
||||||
|
|
||||||
export function loginRequest(credentials, logoutOnError) {
|
export function loginRequest(credentials, logoutOnError, isFromWebView) {
|
||||||
return {
|
return {
|
||||||
type: types.LOGIN.REQUEST,
|
type: types.LOGIN.REQUEST,
|
||||||
credentials,
|
credentials,
|
||||||
logoutOnError
|
logoutOnError,
|
||||||
|
isFromWebView
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,3 +6,10 @@ export function setPermissions(permissions) {
|
||||||
permissions
|
permissions
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function updatePermission(id, roles) {
|
||||||
|
return {
|
||||||
|
type: types.PERMISSIONS.UPDATE,
|
||||||
|
payload: { id, roles }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
import * as types from './actionsTypes';
|
||||||
|
|
||||||
|
export function setRoles(roles) {
|
||||||
|
return {
|
||||||
|
type: types.ROLES.SET,
|
||||||
|
roles
|
||||||
|
};
|
||||||
|
}
|
||||||
|
export function updateRoles(id, desc) {
|
||||||
|
return {
|
||||||
|
type: types.ROLES.UPDATE,
|
||||||
|
payload: { id, desc }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
export function removeRoles(id) {
|
||||||
|
return {
|
||||||
|
type: types.ROLES.REMOVE,
|
||||||
|
payload: { id }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -23,11 +23,12 @@ export function leaveRoom(roomType, room, selected) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export function deleteRoom(rid, t) {
|
export function deleteRoom(roomType, room, selected) {
|
||||||
return {
|
return {
|
||||||
type: types.ROOM.DELETE,
|
type: types.ROOM.DELETE,
|
||||||
rid,
|
room,
|
||||||
t
|
roomType,
|
||||||
|
selected
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,13 @@ export function addSettings(settings) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function updateSettings(id, value) {
|
||||||
|
return {
|
||||||
|
type: SETTINGS.UPDATE,
|
||||||
|
payload: { id, value }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
export function clearSettings() {
|
export function clearSettings() {
|
||||||
return {
|
return {
|
||||||
type: SETTINGS.CLEAR
|
type: SETTINGS.CLEAR
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ export const themes = {
|
||||||
auxiliaryBackground: '#07101e',
|
auxiliaryBackground: '#07101e',
|
||||||
bannerBackground: '#0e1f38',
|
bannerBackground: '#0e1f38',
|
||||||
titleText: '#f9f9f9',
|
titleText: '#f9f9f9',
|
||||||
bodyText: '#e8ebed',
|
bodyText: '#cbced1',
|
||||||
backdropColor: '#000000',
|
backdropColor: '#000000',
|
||||||
dangerColor: '#f5455c',
|
dangerColor: '#f5455c',
|
||||||
successColor: '#2de0a5',
|
successColor: '#2de0a5',
|
||||||
|
|
@ -121,7 +121,7 @@ export const themes = {
|
||||||
auxiliaryBackground: '#080808',
|
auxiliaryBackground: '#080808',
|
||||||
bannerBackground: '#1f2329',
|
bannerBackground: '#1f2329',
|
||||||
titleText: '#f9f9f9',
|
titleText: '#f9f9f9',
|
||||||
bodyText: '#e8ebed',
|
bodyText: '#cbced1',
|
||||||
backdropColor: '#000000',
|
backdropColor: '#000000',
|
||||||
dangerColor: '#f5455c',
|
dangerColor: '#f5455c',
|
||||||
successColor: '#2de0a5',
|
successColor: '#2de0a5',
|
||||||
|
|
|
||||||
|
|
@ -196,5 +196,11 @@ export default {
|
||||||
},
|
},
|
||||||
Accounts_AllowInvisibleStatusOption: {
|
Accounts_AllowInvisibleStatusOption: {
|
||||||
type: 'valueAsString'
|
type: 'valueAsString'
|
||||||
|
},
|
||||||
|
Jitsi_Enable_Teams: {
|
||||||
|
type: 'valueAsBoolean'
|
||||||
|
},
|
||||||
|
Jitsi_Enable_Channels: {
|
||||||
|
type: 'valuesAsBoolean'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ const NotifierComponent = React.memo(({ notification, isMasterDetail }) => {
|
||||||
const { title = name, avatar = name } = notification;
|
const { title = name, avatar = name } = notification;
|
||||||
|
|
||||||
const onPress = () => {
|
const onPress = () => {
|
||||||
const { prid } = payload;
|
const { prid, _id } = payload;
|
||||||
if (!rid) {
|
if (!rid) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -89,7 +89,7 @@ const NotifierComponent = React.memo(({ notification, isMasterDetail }) => {
|
||||||
} else {
|
} else {
|
||||||
Navigation.navigate('RoomsListView');
|
Navigation.navigate('RoomsListView');
|
||||||
}
|
}
|
||||||
goRoom({ item, isMasterDetail });
|
goRoom({ item, isMasterDetail, jumpToMessageId: _id });
|
||||||
hideNotification();
|
hideNotification();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -685,7 +685,7 @@
|
||||||
"Following": "verfolgte",
|
"Following": "verfolgte",
|
||||||
"Threads_displaying_all": "zeige alle",
|
"Threads_displaying_all": "zeige alle",
|
||||||
"Threads_displaying_following": "zeige gefolgte",
|
"Threads_displaying_following": "zeige gefolgte",
|
||||||
"Threads_displaying_unread": "zeige ungelesene",
|
"Threads_displaying_unread": "Zeige ungelesene",
|
||||||
"No_threads": "Es gibt keine Threads",
|
"No_threads": "Es gibt keine Threads",
|
||||||
"No_threads_following": "Du folgst keinen Threads",
|
"No_threads_following": "Du folgst keinen Threads",
|
||||||
"No_threads_unread": "Es gibt keine ungelesenen Threads",
|
"No_threads_unread": "Es gibt keine ungelesenen Threads",
|
||||||
|
|
@ -724,6 +724,7 @@
|
||||||
"creating_team": "Team erstellen",
|
"creating_team": "Team erstellen",
|
||||||
"team-name-already-exists": "Ein Team mit diesem Namen existiert bereits",
|
"team-name-already-exists": "Ein Team mit diesem Namen existiert bereits",
|
||||||
"Add_Channel_to_Team": "Kanal zum Team hinzufügen",
|
"Add_Channel_to_Team": "Kanal zum Team hinzufügen",
|
||||||
|
"Left_The_Team_Successfully": "Das Team erfolgreich verlassen",
|
||||||
"Create_New": "Neu erstellen",
|
"Create_New": "Neu erstellen",
|
||||||
"Add_Existing": "Vorhandenes hinzufügen",
|
"Add_Existing": "Vorhandenes hinzufügen",
|
||||||
"Add_Existing_Channel": "Vorhandenen Kanal hinzufügen",
|
"Add_Existing_Channel": "Vorhandenen Kanal hinzufügen",
|
||||||
|
|
|
||||||
|
|
@ -762,5 +762,8 @@
|
||||||
"Move_to_Team_Warning": "After reading the previous intructions about this behavior, do you still want to move this channel to the selected team?",
|
"Move_to_Team_Warning": "After reading the previous intructions about this behavior, do you still want to move this channel to the selected team?",
|
||||||
"Load_More": "Load More",
|
"Load_More": "Load More",
|
||||||
"Load_Newer": "Load Newer",
|
"Load_Newer": "Load Newer",
|
||||||
"Load_Older": "Load Older"
|
"Load_Older": "Load Older",
|
||||||
|
"Left_The_Room_Successfully": "Left the room successfully",
|
||||||
|
"Deleted_The_Team_Successfully": "Team deleted successfully",
|
||||||
|
"Deleted_The_Room_Successfully": "Room deleted successfully"
|
||||||
}
|
}
|
||||||
|
|
@ -724,6 +724,7 @@
|
||||||
"creating_team": "création de l'équipe",
|
"creating_team": "création de l'équipe",
|
||||||
"team-name-already-exists": "Une équipe portant ce nom existe déjà",
|
"team-name-already-exists": "Une équipe portant ce nom existe déjà",
|
||||||
"Add_Channel_to_Team": "Ajouter un canal à l'équipe",
|
"Add_Channel_to_Team": "Ajouter un canal à l'équipe",
|
||||||
|
"Left_The_Team_Successfully": "A quitté l'équipe avec succès",
|
||||||
"Create_New": "Créer un nouveau",
|
"Create_New": "Créer un nouveau",
|
||||||
"Add_Existing": "Ajouter existant",
|
"Add_Existing": "Ajouter existant",
|
||||||
"Add_Existing_Channel": "Ajouter un canal existant",
|
"Add_Existing_Channel": "Ajouter un canal existant",
|
||||||
|
|
@ -761,5 +762,8 @@
|
||||||
"Move_to_Team_Warning": "Après avoir lu les instructions précédentes sur ce comportement, voulez-vous toujours déplacer ce canal vers l'équipe sélectionnée ?",
|
"Move_to_Team_Warning": "Après avoir lu les instructions précédentes sur ce comportement, voulez-vous toujours déplacer ce canal vers l'équipe sélectionnée ?",
|
||||||
"Load_More": "Charger plus",
|
"Load_More": "Charger plus",
|
||||||
"Load_Newer": "Charger plus récent",
|
"Load_Newer": "Charger plus récent",
|
||||||
"Load_Older": "Charger plus ancien"
|
"Load_Older": "Charger plus ancien",
|
||||||
|
"Left_The_Room_Successfully": "A quitté le salon avec succès",
|
||||||
|
"Deleted_The_Team_Successfully": "Equipe supprimée avec succès",
|
||||||
|
"Deleted_The_Room_Successfully": "Salon supprimé avec succès"
|
||||||
}
|
}
|
||||||
|
|
@ -724,6 +724,7 @@
|
||||||
"creating_team": "team maken",
|
"creating_team": "team maken",
|
||||||
"team-name-already-exists": "Er bestaat al een team met die naam",
|
"team-name-already-exists": "Er bestaat al een team met die naam",
|
||||||
"Add_Channel_to_Team": "Kanaal toevoegen aan team",
|
"Add_Channel_to_Team": "Kanaal toevoegen aan team",
|
||||||
|
"Left_The_Team_Successfully": "Het team met succes verlaten",
|
||||||
"Create_New": "Maak nieuw",
|
"Create_New": "Maak nieuw",
|
||||||
"Add_Existing": "Voeg bestaande",
|
"Add_Existing": "Voeg bestaande",
|
||||||
"Add_Existing_Channel": "Bestaand kanaal toevoegen",
|
"Add_Existing_Channel": "Bestaand kanaal toevoegen",
|
||||||
|
|
@ -761,5 +762,8 @@
|
||||||
"Move_to_Team_Warning": "Wil je na het lezen van de vorige instructies over dit gedrag, dit kanaal nog steeds naar het geselecteerde team verplaatsen?",
|
"Move_to_Team_Warning": "Wil je na het lezen van de vorige instructies over dit gedrag, dit kanaal nog steeds naar het geselecteerde team verplaatsen?",
|
||||||
"Load_More": "Meer laden",
|
"Load_More": "Meer laden",
|
||||||
"Load_Newer": "Nieuwer laden",
|
"Load_Newer": "Nieuwer laden",
|
||||||
"Load_Older": "Ouder laden"
|
"Load_Older": "Ouder laden",
|
||||||
|
"Left_The_Room_Successfully": "Heeft kamer met succes verlaten",
|
||||||
|
"Deleted_The_Team_Successfully": "Team succesvol verwijderd",
|
||||||
|
"Deleted_The_Room_Successfully": "Kamer succesvol verwijderd"
|
||||||
}
|
}
|
||||||
|
|
@ -664,6 +664,10 @@
|
||||||
"No_team_channels_found": "Nenhum canal encontrado",
|
"No_team_channels_found": "Nenhum canal encontrado",
|
||||||
"Team_not_found": "Time não encontrado",
|
"Team_not_found": "Time não encontrado",
|
||||||
"Private_Team": "Equipe Privada",
|
"Private_Team": "Equipe Privada",
|
||||||
|
"Left_The_Team_Successfully": "Saiu do time com sucesso",
|
||||||
"Add_Existing_Channel": "Adicionar Canal Existente",
|
"Add_Existing_Channel": "Adicionar Canal Existente",
|
||||||
"invalid-room": "Sala inválida"
|
"invalid-room": "Sala inválida",
|
||||||
|
"Left_The_Room_Successfully": "Saiu da sala com sucesso",
|
||||||
|
"Deleted_The_Team_Successfully": "Time deletado com sucesso",
|
||||||
|
"Deleted_The_Room_Successfully": "Sala deletada com sucesso"
|
||||||
}
|
}
|
||||||
|
|
@ -10,19 +10,22 @@
|
||||||
"error-could-not-change-email": "Não foi possível alterar o e-mail",
|
"error-could-not-change-email": "Não foi possível alterar o e-mail",
|
||||||
"error-could-not-change-name": "Não foi possível alterar o nome",
|
"error-could-not-change-name": "Não foi possível alterar o nome",
|
||||||
"error-could-not-change-username": "Não foi possível alterar o nome de utilizador",
|
"error-could-not-change-username": "Não foi possível alterar o nome de utilizador",
|
||||||
|
"error-could-not-change-status": "Impossível mudar estado",
|
||||||
"error-delete-protected-role": "Não é possível eliminar uma função protegida",
|
"error-delete-protected-role": "Não é possível eliminar uma função protegida",
|
||||||
"error-department-not-found": "Departamento não encontrado",
|
"error-department-not-found": "Departamento não encontrado",
|
||||||
"error-direct-message-file-upload-not-allowed": "Partilha de ficheiros não permitido em mensagens diretas",
|
"error-direct-message-file-upload-not-allowed": "Partilha de ficheiros não permitido em mensagens diretas",
|
||||||
"error-duplicate-channel-name": "Um canal com o nome {{channel_name}} existe",
|
"error-duplicate-channel-name": "Existe um canal com o nome {{room_name}}",
|
||||||
"error-email-domain-blacklisted": "O domínio de e-mail está na lista negra",
|
"error-email-domain-blacklisted": "O domínio de e-mail está na lista negra",
|
||||||
"error-email-send-failed": "Erro ao tentar enviar e-mail: {{message}}",
|
"error-email-send-failed": "Erro ao tentar enviar e-mail: {{message}}",
|
||||||
|
"error-save-image": "Erro ao salvar imagem",
|
||||||
|
"error-save-video": "Erro ao salvar vídeo",
|
||||||
"error-field-unavailable": "{{field}} já está em uso :(",
|
"error-field-unavailable": "{{field}} já está em uso :(",
|
||||||
"error-file-too-large": "Ficheiro demasiado grande",
|
"error-file-too-large": "Ficheiro demasiado grande",
|
||||||
"error-importer-not-defined": "O importador não foi definido correctamente, a classe Import está em falta.",
|
"error-importer-not-defined": "O importador não foi definido correctamente, a classe Import está em falta.",
|
||||||
"error-input-is-not-a-valid-field": "{{input}} não é um {{field}} válido",
|
"error-input-is-not-a-valid-field": "{{input}} não é um {{field}} válido",
|
||||||
"error-invalid-actionlink": "Link de acção inválido",
|
"error-invalid-actionlink": "Link de acção inválido",
|
||||||
"error-invalid-arguments": "Argumentos inválidos",
|
"error-invalid-arguments": "Argumentos inválidos",
|
||||||
"error-invalid-asset": "Ficheiro inválida",
|
"error-invalid-asset": "Ficheiro inválido",
|
||||||
"error-invalid-channel": "Canal inválido.",
|
"error-invalid-channel": "Canal inválido.",
|
||||||
"error-invalid-channel-start-with-chars": "Canal inválido. Começa por @ ou #",
|
"error-invalid-channel-start-with-chars": "Canal inválido. Começa por @ ou #",
|
||||||
"error-invalid-custom-field": "Campo personalizado inválido",
|
"error-invalid-custom-field": "Campo personalizado inválido",
|
||||||
|
|
@ -58,6 +61,7 @@
|
||||||
"error-message-editing-blocked": "A edição de mensagens está bloqueada",
|
"error-message-editing-blocked": "A edição de mensagens está bloqueada",
|
||||||
"error-message-size-exceeded": "O tamanho da mensagem excede Message_MaxAllowedSize",
|
"error-message-size-exceeded": "O tamanho da mensagem excede Message_MaxAllowedSize",
|
||||||
"error-missing-unsubscribe-link": "Você deve fornecer o link para cancelar a subscrição: [unsubscribe].",
|
"error-missing-unsubscribe-link": "Você deve fornecer o link para cancelar a subscrição: [unsubscribe].",
|
||||||
|
"error-no-owner-channel": "Você não é dono do canal",
|
||||||
"error-no-tokens-for-this-user": "Não há tokens para este utilizador",
|
"error-no-tokens-for-this-user": "Não há tokens para este utilizador",
|
||||||
"error-not-allowed": "Não permitido",
|
"error-not-allowed": "Não permitido",
|
||||||
"error-not-authorized": "Não autorizado",
|
"error-not-authorized": "Não autorizado",
|
||||||
|
|
@ -75,33 +79,46 @@
|
||||||
"error-user-registration-disabled": "O registo de utilizadores está desactivado",
|
"error-user-registration-disabled": "O registo de utilizadores está desactivado",
|
||||||
"error-user-registration-secret": "O registo de utilizadores só é permitido por meio de um URL secreto",
|
"error-user-registration-secret": "O registo de utilizadores só é permitido por meio de um URL secreto",
|
||||||
"error-you-are-last-owner": "Você é o último proprietário. Por favor, defina novo proprietário antes de sair da sala.",
|
"error-you-are-last-owner": "Você é o último proprietário. Por favor, defina novo proprietário antes de sair da sala.",
|
||||||
|
"error-status-not-allowed": "O estado invisível está desactivado",
|
||||||
"Actions": "Acções",
|
"Actions": "Acções",
|
||||||
"activity": "actividade",
|
"activity": "actividade",
|
||||||
"Activity": "Actividade",
|
"Activity": "Actividade",
|
||||||
"Add_Reaction": "Adicionar Reacção",
|
"Add_Reaction": "Adicionar Reacção",
|
||||||
"Add_Server": "Adicionar Servidor",
|
"Add_Server": "Adicionar Servidor",
|
||||||
"Add_users": "Adicionar utilizadores",
|
"Add_users": "Adicionar utilizadores",
|
||||||
|
"Admin_Panel": "Painel de Administração",
|
||||||
|
"Agent": "Agente",
|
||||||
"Alert": "Alerta",
|
"Alert": "Alerta",
|
||||||
"alert": "alerta",
|
"alert": "alerta",
|
||||||
"alerts": "alertas",
|
"alerts": "alertas",
|
||||||
"All_users_in_the_channel_can_write_new_messages": "Todos os utilizadores no canal podem escrever novas mensagens",
|
"All_users_in_the_channel_can_write_new_messages": "Todos os utilizadores no canal podem escrever novas mensagens",
|
||||||
|
"All_users_in_the_team_can_write_new_messages": "Todos os usuários da equipa podem escrever novas mensagens",
|
||||||
|
"A_meaningful_name_for_the_discussion_room": "Um nome significativo para a sala de discussão",
|
||||||
"All": "Todos",
|
"All": "Todos",
|
||||||
|
"All_Messages": "Todas as Mensagens",
|
||||||
"Allow_Reactions": "Permitir Reacções",
|
"Allow_Reactions": "Permitir Reacções",
|
||||||
"Alphabetical": "Alfabética",
|
"Alphabetical": "Alfabética",
|
||||||
"and_more": "e mais",
|
"and_more": "e mais",
|
||||||
"and": "e",
|
"and": "e",
|
||||||
"announcement": "anúncio",
|
"announcement": "anúncio",
|
||||||
"Announcement": "Anúncio",
|
"Announcement": "Anúncio",
|
||||||
|
"Apply_Your_Certificate": "Aplique o seu Certificado",
|
||||||
"ARCHIVE": "ARQUIVAR",
|
"ARCHIVE": "ARQUIVAR",
|
||||||
"archive": "arquivar",
|
"archive": "arquivar",
|
||||||
"are_typing": "estão a escrever",
|
"are_typing": "estão a escrever",
|
||||||
"Are_you_sure_question_mark": "Tem a certeza?",
|
"Are_you_sure_question_mark": "Tem a certeza?",
|
||||||
"Are_you_sure_you_want_to_leave_the_room": "Tem certeza de que quer sair da sala {{room}}?",
|
"Are_you_sure_you_want_to_leave_the_room": "Tem certeza de que quer sair da sala {{room}}?",
|
||||||
|
"Audio": "Áudio",
|
||||||
"Authenticating": "Autenticando",
|
"Authenticating": "Autenticando",
|
||||||
|
"Automatic": "Automático",
|
||||||
|
"Auto_Translate": "Auto-Tradução",
|
||||||
"Avatar_changed_successfully": "Avatar alterado com sucesso!",
|
"Avatar_changed_successfully": "Avatar alterado com sucesso!",
|
||||||
"Avatar_Url": "URL do Avatar",
|
"Avatar_Url": "URL do Avatar",
|
||||||
"Away": "Ausente",
|
"Away": "Ausente",
|
||||||
|
"Back": "Voltar",
|
||||||
|
"Black": "Preto",
|
||||||
"Block_user": "Bloquear utilizador",
|
"Block_user": "Bloquear utilizador",
|
||||||
|
"Browser": "Navegador",
|
||||||
"Broadcast_channel_Description": "Apenas utilizadores autorizados podem escrever novas mensagens, mas os outros utilizadores poderão responder",
|
"Broadcast_channel_Description": "Apenas utilizadores autorizados podem escrever novas mensagens, mas os outros utilizadores poderão responder",
|
||||||
"Broadcast_Channel": "Canal de Transmissão",
|
"Broadcast_Channel": "Canal de Transmissão",
|
||||||
"Busy": "Ocupado",
|
"Busy": "Ocupado",
|
||||||
|
|
@ -111,80 +128,187 @@
|
||||||
"Cancel": "Cancelar",
|
"Cancel": "Cancelar",
|
||||||
"changing_avatar": "a alterar avatar",
|
"changing_avatar": "a alterar avatar",
|
||||||
"creating_channel": "a criar canal",
|
"creating_channel": "a criar canal",
|
||||||
|
"creating_invite": "a criar convite",
|
||||||
"Channel_Name": "Nome do Canal",
|
"Channel_Name": "Nome do Canal",
|
||||||
"Channels": "Canais",
|
"Channels": "Canais",
|
||||||
"Chats": "Chats",
|
"Chats": "Chats",
|
||||||
|
"Call_already_ended": "Chamada já terminada!",
|
||||||
|
"Clear_cookies_alert": "Quer limpar todas as cookies?",
|
||||||
|
"Clear_cookies_desc": "Esta acção irá limpar todos os cookies de login, permitindo que você faça login em outras contas.",
|
||||||
|
"Clear_cookies_yes": "Sim, limpar cookies",
|
||||||
|
"Clear_cookies_no": "Não, guardar cookies",
|
||||||
|
"Click_to_join": "Clique para Entrar!",
|
||||||
"Close": "Fechar",
|
"Close": "Fechar",
|
||||||
"Close_emoji_selector": "Fechar selector de emoticons",
|
"Close_emoji_selector": "Fechar selector de emoticons",
|
||||||
|
"Closing_chat": "A fechar o chat",
|
||||||
|
"Change_language_loading": "Mudança de idioma.",
|
||||||
|
"Chat_closed_by_agent": "Chat fechado por agente",
|
||||||
"Choose": "Escolher",
|
"Choose": "Escolher",
|
||||||
"Choose_from_library": "Escolher da biblioteca",
|
"Choose_from_library": "Escolher da biblioteca",
|
||||||
|
"Choose_file": "Escolher arquivo",
|
||||||
|
"Choose_where_you_want_links_be_opened": "Escolha onde você quer que os links sejam abertos",
|
||||||
"Code": "Código",
|
"Code": "Código",
|
||||||
|
"Code_or_password_invalid": "Código ou senha inválidos",
|
||||||
"Collaborative": "Colaborativa",
|
"Collaborative": "Colaborativa",
|
||||||
"Confirm": "Confirmar",
|
"Confirm": "Confirmar",
|
||||||
"Connect": "Ligar",
|
"Connect": "Ligar",
|
||||||
"Connected": "Ligado",
|
"Connected": "Ligado",
|
||||||
|
"connecting_server": "conexão ao servidor",
|
||||||
"Connecting": "A ligar...",
|
"Connecting": "A ligar...",
|
||||||
|
"Contact_us": "Contacte-nos",
|
||||||
|
"Contact_your_server_admin": "Contacte o administrador do seu servidor.",
|
||||||
"Continue_with": "Continuar com",
|
"Continue_with": "Continuar com",
|
||||||
"Copied_to_clipboard": "Copiado para a área de transferência!",
|
"Copied_to_clipboard": "Copiado para a área de transferência!",
|
||||||
"Copy": "Copiar",
|
"Copy": "Copiar",
|
||||||
|
"Conversation": "Conversa",
|
||||||
"Permalink": "Link permanente",
|
"Permalink": "Link permanente",
|
||||||
|
"Certificate_password": "Senha do Certificado",
|
||||||
|
"Clear_cache": "Limpar a cache do servidor local",
|
||||||
|
"Clear_cache_loading": "A limpar a cache.",
|
||||||
|
"Whats_the_password_for_your_certificate": "Qual é a senha para o seu certificado?",
|
||||||
"Create_account": "Criar uma conta",
|
"Create_account": "Criar uma conta",
|
||||||
"Create_Channel": "Criar Canal",
|
"Create_Channel": "Criar Canal",
|
||||||
|
"Create_Direct_Messages": "Criar Mensagens Diretas",
|
||||||
|
"Create_Discussion": "Criar Discussão",
|
||||||
"Created_snippet": "criado um extracto",
|
"Created_snippet": "criado um extracto",
|
||||||
"Create_a_new_workspace": "Criar um novo espaço de trabalho",
|
"Create_a_new_workspace": "Criar um novo espaço de trabalho",
|
||||||
"Create": "Criar",
|
"Create": "Criar",
|
||||||
|
"Custom_Status": "Status Personalizado",
|
||||||
|
"Dark": "Escuro",
|
||||||
|
"Dark_level": "Nível Escuro",
|
||||||
|
"Default": "Predefinição",
|
||||||
|
"Default_browser": "Navegador predefinido",
|
||||||
"Delete_Room_Warning": "Apagar uma sala irá remover todas as mensagens contidas nela. Isto não pode ser desfeito.",
|
"Delete_Room_Warning": "Apagar uma sala irá remover todas as mensagens contidas nela. Isto não pode ser desfeito.",
|
||||||
|
"Department": "Departamento",
|
||||||
"delete": "apagar",
|
"delete": "apagar",
|
||||||
"Delete": "Apagar",
|
"Delete": "Apagar",
|
||||||
"DELETE": "APAGAR",
|
"DELETE": "APAGAR",
|
||||||
|
"move": "mover",
|
||||||
"deleting_room": "apagando sala",
|
"deleting_room": "apagando sala",
|
||||||
"description": "descrição",
|
"description": "descrição",
|
||||||
"Description": "Descrição",
|
"Description": "Descrição",
|
||||||
|
"Desktop_Options": "Opções da área de trabalho",
|
||||||
|
"Desktop_Notifications": "Notificações da área de trabalho",
|
||||||
|
"Desktop_Alert_info": "Estas notificações são entregues na área de trabalho",
|
||||||
|
"Directory": "Directório",
|
||||||
"Direct_Messages": "Mensagens Directas",
|
"Direct_Messages": "Mensagens Directas",
|
||||||
"Disable_notifications": "Desactivar notificações",
|
"Disable_notifications": "Desactivar notificações",
|
||||||
|
"Discussions": "Discussões",
|
||||||
|
"Discussion_Desc": "Ajude a manter uma visão geral sobre o que está acontecendo! Ao criar uma discussão, é criado um sub-canal do que você selecionou e ambos estão ligados.",
|
||||||
|
"Discussion_name": "Nome da discussão",
|
||||||
|
"Done": "Feito",
|
||||||
"Dont_Have_An_Account": "Não tem uma conta?",
|
"Dont_Have_An_Account": "Não tem uma conta?",
|
||||||
|
"Do_you_have_an_account": "Você tem uma conta?",
|
||||||
|
"Do_you_have_a_certificate": "Você tem um certificado?",
|
||||||
"Do_you_really_want_to_key_this_room_question_mark": "Você quer mesmo {{key}} esta sala?",
|
"Do_you_really_want_to_key_this_room_question_mark": "Você quer mesmo {{key}} esta sala?",
|
||||||
|
"E2E_Encryption": "Encriptação E2E",
|
||||||
|
"E2E_How_It_Works_info1": "Agora você pode criar grupos privados criptografados e mensagens diretas. Você também pode alterar grupos privados existentes ou DMs para criptografados.",
|
||||||
|
"E2E_How_It_Works_info2": "Isto é *criptografia ponto a ponto* portanto a chave para codificar/descodificar as suas mensagens não será salva no servidor. Por essa razão *você precisa armazenar esta senha em algum lugar seguro* que você posa aceder mais tarde, se precisar.",
|
||||||
|
"E2E_How_It_Works_info3": "Se você prosseguir, uma senha E2E será gerada automaticamente.",
|
||||||
|
"E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento a partir de qualquer navegador que você tenha inserido a senha existente do E2E.",
|
||||||
"edit": "editar",
|
"edit": "editar",
|
||||||
|
"edited": "editado",
|
||||||
"Edit": "Editar",
|
"Edit": "Editar",
|
||||||
|
"Edit_Status": "Editar Status",
|
||||||
|
"Edit_Invite": "Editar Convite",
|
||||||
|
"End_to_end_encrypted_room": "Sala encriptada de ponta a ponta",
|
||||||
|
"end_to_end_encryption": "encriptação de ponta a ponta",
|
||||||
|
"Email_Notification_Mode_All": "Cada Menção/DM",
|
||||||
|
"Email_Notification_Mode_Disabled": "Desactivado",
|
||||||
"Email_or_password_field_is_empty": "O campo de e-mail ou palavra-passe está vazio",
|
"Email_or_password_field_is_empty": "O campo de e-mail ou palavra-passe está vazio",
|
||||||
"Email": "E-mail",
|
"Email": "E-mail",
|
||||||
"email": "e-mail",
|
"email": "e-mail",
|
||||||
|
"Empty_title": "Título vazio",
|
||||||
|
"Enable_Auto_Translate": "Activar Auto-Tradução",
|
||||||
"Enable_notifications": "Activar notificações",
|
"Enable_notifications": "Activar notificações",
|
||||||
|
"Encrypted": "Encriptado",
|
||||||
|
"Encrypted_message": "Mensagem encriptada",
|
||||||
|
"Enter_Your_E2E_Password": "Digite a sua senha E2E",
|
||||||
|
"Enter_Your_Encryption_Password_desc1": "Isto permitir-lhe-á aceder aos seus grupos privados encriptados e às suas mensagens directas.",
|
||||||
|
"Enter_Your_Encryption_Password_desc2": "Você precisa digitar a senha para codificar/descodificar mensagens em cada lugar que você usar o chat.",
|
||||||
|
"Encryption_error_title": "A sua senha de encriptação parece errada",
|
||||||
|
"Encryption_error_desc": "Não foi possível descodificar a sua chave de encriptação para ser importada.",
|
||||||
"Everyone_can_access_this_channel": "Todos podem aceder a este canal",
|
"Everyone_can_access_this_channel": "Todos podem aceder a este canal",
|
||||||
|
"Everyone_can_access_this_team": "Todos podem aceder a esta equipa",
|
||||||
"Error_uploading": "Erro ao fazer o envio",
|
"Error_uploading": "Erro ao fazer o envio",
|
||||||
|
"Expiration_Days": "Validade (Dias)",
|
||||||
|
"Favorite": "Favorito",
|
||||||
"Favorites": "Favoritos",
|
"Favorites": "Favoritos",
|
||||||
"Files": "Ficheiros",
|
"Files": "Ficheiros",
|
||||||
"File_description": "Descrição do ficheiro",
|
"File_description": "Descrição do ficheiro",
|
||||||
"File_name": "Nome do ficheiro",
|
"File_name": "Nome do ficheiro",
|
||||||
"Finish_recording": "Terminar a gravação",
|
"Finish_recording": "Terminar a gravação",
|
||||||
|
"Following_thread": "Seguir discussão",
|
||||||
"For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve escrever a sua palavra-passe actual para continuar",
|
"For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve escrever a sua palavra-passe actual para continuar",
|
||||||
"Forgot_password_If_this_email_is_registered": "Se este e-mail estiver registado, enviaremos instruções sobre como repor a sua palavra-passe. Se você não receber um e-mail em breve, volte e tente novamente.",
|
"Forgot_password_If_this_email_is_registered": "Se este e-mail estiver registado, enviaremos instruções sobre como repor a sua palavra-passe. Se você não receber um e-mail em breve, volte e tente novamente.",
|
||||||
"Forgot_password": "Esquecer palavra-passe",
|
"Forgot_password": "Esquecer palavra-passe",
|
||||||
"Forgot_Password": "Esquecer Palavra-passe",
|
"Forgot_Password": "Esquecer Palavra-passe",
|
||||||
|
"Forward": "Reencaminhar",
|
||||||
|
"Forward_Chat": "Reencaminhar Chat",
|
||||||
|
"Forward_to_department": "Reencaminhar para o departamento",
|
||||||
|
"Forward_to_user": "Reencaminhar para o utilizador",
|
||||||
|
"Full_table": "Clique para ver a tabela completa",
|
||||||
|
"Generate_New_Link": "Gerar Novo Link",
|
||||||
"Group_by_favorites": "Agrupar por favoritos",
|
"Group_by_favorites": "Agrupar por favoritos",
|
||||||
"Group_by_type": "Agrupar por tipo",
|
"Group_by_type": "Agrupar por tipo",
|
||||||
|
"Hide": "Esconder",
|
||||||
"Has_joined_the_channel": "entrou no canal",
|
"Has_joined_the_channel": "entrou no canal",
|
||||||
"Has_joined_the_conversation": "entrou na conversa",
|
"Has_joined_the_conversation": "entrou na conversa",
|
||||||
"Has_left_the_channel": "saiu do canal",
|
"Has_left_the_channel": "saiu do canal",
|
||||||
|
"Hide_System_Messages": "Esconder mensagens do sistema",
|
||||||
|
"Hide_type_messages": "Esconder mensagens \"{{type}}\"",
|
||||||
|
"How_It_Works": "Como Funciona",
|
||||||
|
"Message_HideType_uj": "Utilizador entrou",
|
||||||
|
"Message_HideType_ul": "Utilizador saiu",
|
||||||
|
"Message_HideType_ru": "Utilizador removido",
|
||||||
|
"Message_HideType_au": "Utilizador adicionado",
|
||||||
|
"Message_HideType_mute_unmute": "Utilizador silenciado/de-silenciado",
|
||||||
|
"Message_HideType_r": "Nome da sala alterado",
|
||||||
|
"Message_HideType_ut": "Utilizador entrou na conversação",
|
||||||
|
"Message_HideType_wm": "Bem-vindo",
|
||||||
|
"Message_HideType_rm": "Mensagem Removida",
|
||||||
|
"Message_HideType_subscription_role_added": "Foi definido o estatuto",
|
||||||
|
"Message_HideType_subscription_role_removed": "Definição de estatuto removida",
|
||||||
|
"Message_HideType_room_archived": "Sala arquivada",
|
||||||
|
"Message_HideType_room_unarchived": "Sala desarquivada",
|
||||||
|
"I_Saved_My_E2E_Password": "Guardei a minha senha E2E",
|
||||||
|
"IP": "IP",
|
||||||
|
"In_app": "Na aplicação",
|
||||||
|
"In_App_And_Desktop": "Na aplicação e área de trabalho",
|
||||||
|
"In_App_and_Desktop_Alert_info": "Exibe um banner no topo da tela quando a aplicação está aberto, e exibe uma notificação na área de trabalho",
|
||||||
"Invisible": "Invisível",
|
"Invisible": "Invisível",
|
||||||
"Invite": "Convidar",
|
"Invite": "Convidar",
|
||||||
"is_a_valid_RocketChat_instance": "é uma instância válida do Rocket.Chat",
|
"is_a_valid_RocketChat_instance": "é uma instância válida do Rocket.Chat",
|
||||||
"is_not_a_valid_RocketChat_instance": "is not a valid Rocket.Chat instance",
|
"is_not_a_valid_RocketChat_instance": "is not a valid Rocket.Chat instance",
|
||||||
"is_typing": "está a escrever",
|
"is_typing": "está a escrever",
|
||||||
|
"Invalid_or_expired_invite_token": "Token de convite invalido ou expirado",
|
||||||
"Invalid_server_version": "O servidor ao qual esta tentando ligar-se, utiliza uma versão que não é suporta pela aplicação: {{currentVersion}}.\n\nA versão mínima requerida é {{minVersion}}",
|
"Invalid_server_version": "O servidor ao qual esta tentando ligar-se, utiliza uma versão que não é suporta pela aplicação: {{currentVersion}}.\n\nA versão mínima requerida é {{minVersion}}",
|
||||||
|
"Invite_Link": "Link de convite",
|
||||||
|
"Invite_users": "Convidar utilizadores",
|
||||||
"Join": "Entrar",
|
"Join": "Entrar",
|
||||||
|
"Join_Code": "Código de entrada",
|
||||||
|
"Insert_Join_Code": "Insira o código de entrada",
|
||||||
|
"Join_our_open_workspace": "Junte-se ao nosso espaço de trabalho aberto",
|
||||||
|
"Join_your_workspace": "Junte-se ao seu espaço de trabalho",
|
||||||
"Just_invited_people_can_access_this_channel": "Apenas utilizadores convidados podem aceder a este canal",
|
"Just_invited_people_can_access_this_channel": "Apenas utilizadores convidados podem aceder a este canal",
|
||||||
|
"Just_invited_people_can_access_this_team": "Apenas pessoas convidadas podem aceder a esta equipa",
|
||||||
"Language": "Idioma",
|
"Language": "Idioma",
|
||||||
"last_message": "última mensagem",
|
"last_message": "última mensagem",
|
||||||
"Leave_channel": "Sair do canal",
|
"Leave_channel": "Sair do canal",
|
||||||
"leaving_room": "a sair da sala",
|
"leaving_room": "a sair da sala",
|
||||||
|
"Leave": "Sair",
|
||||||
"leave": "sair",
|
"leave": "sair",
|
||||||
"Legal": "Legal",
|
"Legal": "Legal",
|
||||||
|
"Light": "Luz",
|
||||||
|
"License": "Licença",
|
||||||
"Livechat": "Livechat",
|
"Livechat": "Livechat",
|
||||||
"Login": "Entrar",
|
"Login": "Entrar",
|
||||||
"Login_error": "As suas credenciais foram rejeitadas! Por favor, tente novamente.",
|
"Login_error": "As suas credenciais foram rejeitadas! Por favor, tente novamente.",
|
||||||
"Login_with": "Entrar com",
|
"Login_with": "Entrar com",
|
||||||
|
"Logging_out": "A terminar a sessão.",
|
||||||
"Logout": "Sair",
|
"Logout": "Sair",
|
||||||
|
"Max_number_of_uses": "Número máximo de utilizações",
|
||||||
|
"Max_number_of_users_allowed_is_number": "O número máximo de utilizadores permitido é {{maxUsers}}",
|
||||||
"members": "membros",
|
"members": "membros",
|
||||||
"Members": "Membros",
|
"Members": "Membros",
|
||||||
"Mentioned_Messages": "Mensagens Mencionadas",
|
"Mentioned_Messages": "Mensagens Mencionadas",
|
||||||
|
|
@ -194,7 +318,13 @@
|
||||||
"Message_actions": "Acções de mensagem",
|
"Message_actions": "Acções de mensagem",
|
||||||
"Message_pinned": "Mensagem afixada",
|
"Message_pinned": "Mensagem afixada",
|
||||||
"Message_removed": "Mensagem removida",
|
"Message_removed": "Mensagem removida",
|
||||||
|
"Message_starred": "Mensagem estrelada",
|
||||||
|
"Message_unstarred": "Mensagem não estrelada",
|
||||||
|
"message": "mensagem",
|
||||||
|
"messages": "mensagens",
|
||||||
|
"Message": "Mensagem",
|
||||||
"Messages": "Mensagens",
|
"Messages": "Mensagens",
|
||||||
|
"Message_Reported": "Mensagem reportada",
|
||||||
"Microphone_Permission_Message": "O Rocket.Chat necessita de acesso ao seu microfone para que você possa enviar mensagens de áudio.",
|
"Microphone_Permission_Message": "O Rocket.Chat necessita de acesso ao seu microfone para que você possa enviar mensagens de áudio.",
|
||||||
"Microphone_Permission": "Permissão de Microfone",
|
"Microphone_Permission": "Permissão de Microfone",
|
||||||
"Mute": "Silenciar",
|
"Mute": "Silenciar",
|
||||||
|
|
@ -202,52 +332,92 @@
|
||||||
"My_servers": "Meus servidores",
|
"My_servers": "Meus servidores",
|
||||||
"N_people_reacted": "{{n}} pessoas reagiram",
|
"N_people_reacted": "{{n}} pessoas reagiram",
|
||||||
"N_users": "{{n}} utilizadores",
|
"N_users": "{{n}} utilizadores",
|
||||||
|
"N_channels": "{{n}} canais",
|
||||||
"name": "nome",
|
"name": "nome",
|
||||||
"Name": "Nome",
|
"Name": "Nome",
|
||||||
|
"Navigation_history": "Histórico de navegação",
|
||||||
|
"Never": "Nunca",
|
||||||
"New_Message": "Nova Mensagem",
|
"New_Message": "Nova Mensagem",
|
||||||
"New_Password": "Nova Palavra-passe",
|
"New_Password": "Nova Palavra-passe",
|
||||||
"New_Server": "Novo Servidor",
|
"New_Server": "Novo Servidor",
|
||||||
"Next": "Próximo",
|
"Next": "Próximo",
|
||||||
"No_files": "Nenhum ficheiro",
|
"No_files": "Nenhum ficheiro",
|
||||||
|
"No_limit": "Sem limite",
|
||||||
"No_mentioned_messages": "Nenhuma mensagem mencionada",
|
"No_mentioned_messages": "Nenhuma mensagem mencionada",
|
||||||
"No_pinned_messages": "Nenhuma mensagem afixada",
|
"No_pinned_messages": "Nenhuma mensagem afixada",
|
||||||
"No_results_found": "Nenhum resultado encontrado",
|
"No_results_found": "Nenhum resultado encontrado",
|
||||||
"No_starred_messages": "Nenhuma mensagem marcada com estrela",
|
"No_starred_messages": "Nenhuma mensagem marcada com estrela",
|
||||||
|
"No_thread_messages": "Sem mensagens de discussão ",
|
||||||
|
"No_label_provided": "{{label}} não fornecida/o",
|
||||||
"No_Message": "Nenhuma mensagem",
|
"No_Message": "Nenhuma mensagem",
|
||||||
|
"No_messages_yet": "Ainda sem mensagens",
|
||||||
"No_Reactions": "Nenhuma reação",
|
"No_Reactions": "Nenhuma reação",
|
||||||
|
"No_Read_Receipts": "Sem recibos de leitura",
|
||||||
"Not_logged": "Não ligado",
|
"Not_logged": "Não ligado",
|
||||||
|
"Not_RC_Server": "Isto não é um servidor Rocket.Chat.\n{{contact}}",
|
||||||
|
"Nothing": "Nada",
|
||||||
"Nothing_to_save": "Nada para guardar!",
|
"Nothing_to_save": "Nada para guardar!",
|
||||||
"Notify_active_in_this_room": "Notifica utilizadores activos nesta sala",
|
"Notify_active_in_this_room": "Notifica utilizadores activos nesta sala",
|
||||||
"Notify_all_in_this_room": "Notifica todos os utilizadores nesta sala",
|
"Notify_all_in_this_room": "Notifica todos os utilizadores nesta sala",
|
||||||
|
"Notifications": "Notificações",
|
||||||
|
"Notification_Duration": "Duração da Notificação",
|
||||||
|
"Notification_Preferences": "Preferências de Notificação",
|
||||||
|
"No_available_agents_to_transfer": "Não há agentes disponíveis para transferir",
|
||||||
"Offline": "Desligado",
|
"Offline": "Desligado",
|
||||||
"Oops": "Oops!",
|
"Oops": "Oops!",
|
||||||
|
"Omnichannel": "Omnichannel",
|
||||||
|
"Open_Livechats": "Chats em andamento",
|
||||||
|
"Omnichannel_enable_alert": "Você não está disponível no Omnichannel. Você gostaria de estar disponível?",
|
||||||
|
"Onboarding_description": "Um espaço de trabalho é o espaço da sua equipa ou organização para colaborar. Peça ao administrador do espaço de trabalho um endereço para se juntar ou criar um para a sua equipa.",
|
||||||
|
"Onboarding_join_workspace": "Junte-se a um espaço de trabalho",
|
||||||
|
"Onboarding_subtitle": "Além da Colaboração da Equipe",
|
||||||
"Onboarding_title": "Bem vindo(a) ao Rocket.Chat",
|
"Onboarding_title": "Bem vindo(a) ao Rocket.Chat",
|
||||||
|
"Onboarding_join_open_description": "Junte-se ao nosso espaço de trabalho aberto para conversar com a equipa e comunidade Rocket.Chat.",
|
||||||
|
"Onboarding_agree_terms": "Ao continuar, você concorda com Rocket.Chat",
|
||||||
|
"Onboarding_less_options": "Menos opções",
|
||||||
|
"Onboarding_more_options": "Mais opções",
|
||||||
"Online": "Ligado",
|
"Online": "Ligado",
|
||||||
"Only_authorized_users_can_write_new_messages": "Apenas utilizadores autorizados podem escrever novas mensagens",
|
"Only_authorized_users_can_write_new_messages": "Apenas utilizadores autorizados podem escrever novas mensagens",
|
||||||
"Open_emoji_selector": "Abra o selector de emoticons",
|
"Open_emoji_selector": "Abra o selector de emoticons",
|
||||||
"Open_Source_Communication": "Comunicação Open Source",
|
"Open_Source_Communication": "Comunicação Open Source",
|
||||||
|
"Open_your_authentication_app_and_enter_the_code": "Abra o seu aplicativo de autenticação e digite o código.",
|
||||||
|
"OR": "OU",
|
||||||
|
"OS": "OS",
|
||||||
|
"Overwrites_the_server_configuration_and_use_room_config": "Sobrescreve a configuração do servidor e a configuração da sala de uso",
|
||||||
"Password": "Palavra-passe",
|
"Password": "Palavra-passe",
|
||||||
|
"Parent_channel_or_group": "Canal de origem ou grupo",
|
||||||
"Permalink_copied_to_clipboard": "Link permanente copiado para a área de transferência!",
|
"Permalink_copied_to_clipboard": "Link permanente copiado para a área de transferência!",
|
||||||
|
"Phone": "Telefone",
|
||||||
"Pin": "Afixar",
|
"Pin": "Afixar",
|
||||||
"Pinned_Messages": "Mensagens Afixadas",
|
"Pinned_Messages": "Mensagens Afixadas",
|
||||||
"pinned": "afixada",
|
"pinned": "afixada",
|
||||||
"Pinned": "Afixada",
|
"Pinned": "Afixada",
|
||||||
|
"Please_add_a_comment": "Por favor, acrescente um comentário",
|
||||||
"Please_enter_your_password": "Por favor, introduza a sua palavra-passe",
|
"Please_enter_your_password": "Por favor, introduza a sua palavra-passe",
|
||||||
|
"Please_wait": "Por favor, espere.",
|
||||||
|
"Preferences": "Preferências",
|
||||||
"Preferences_saved": "Preferências guardadas!",
|
"Preferences_saved": "Preferências guardadas!",
|
||||||
"Privacy_Policy": " Política de Privacidade",
|
"Privacy_Policy": " Política de Privacidade",
|
||||||
"Private_Channel": "Canal Privado",
|
"Private_Channel": "Canal Privado",
|
||||||
"Private_Groups": "Grupos Privados",
|
"Private_Groups": "Grupos Privados",
|
||||||
"Private": "Privado",
|
"Private": "Privado",
|
||||||
|
"Processing": "A processar...",
|
||||||
"Profile_saved_successfully": "Perfil actualizado com sucesso!",
|
"Profile_saved_successfully": "Perfil actualizado com sucesso!",
|
||||||
"Profile": "Perfil",
|
"Profile": "Perfil",
|
||||||
"Public_Channel": "Canal Público",
|
"Public_Channel": "Canal Público",
|
||||||
"Public": "Público",
|
"Public": "Público",
|
||||||
|
"Push_Notifications": "Notificações Push",
|
||||||
|
"Push_Notifications_Alert_Info": "Estas notificações são entregues quando o aplicativo não está aberto",
|
||||||
"Quote": "Citar",
|
"Quote": "Citar",
|
||||||
"Reactions_are_disabled": "Reacções desactivadas",
|
"Reactions_are_disabled": "Reacções desactivadas",
|
||||||
"Reactions_are_enabled": "Reacções activadas",
|
"Reactions_are_enabled": "Reacções activadas",
|
||||||
"Reactions": "Reacções",
|
"Reactions": "Reacções",
|
||||||
|
"Read": "Ler",
|
||||||
|
"Read_External_Permission_Message": "Rocket.Chat precisa acessar fotos, média e arquivos em seu dispositivo",
|
||||||
|
"Read_External_Permission": "Permissão de leitura da média",
|
||||||
"Read_Only_Channel": "Canal só de leitura",
|
"Read_Only_Channel": "Canal só de leitura",
|
||||||
"Read_Only": "Só de Leitura",
|
"Read_Only": "Só de Leitura",
|
||||||
|
"Read_Receipt": "Recibos de leitura",
|
||||||
"Register": "Registar",
|
"Register": "Registar",
|
||||||
"Repeat_Password": "Repita a palavra-passe",
|
"Repeat_Password": "Repita a palavra-passe",
|
||||||
"Reply": "Responder",
|
"Reply": "Responder",
|
||||||
|
|
|
||||||
|
|
@ -724,6 +724,7 @@
|
||||||
"creating_team": "создание Команды",
|
"creating_team": "создание Команды",
|
||||||
"team-name-already-exists": "Команда с таким названием уже существует",
|
"team-name-already-exists": "Команда с таким названием уже существует",
|
||||||
"Add_Channel_to_Team": "Добавить канал в Команду",
|
"Add_Channel_to_Team": "Добавить канал в Команду",
|
||||||
|
"Left_The_Team_Successfully": "Успешно покинул команду",
|
||||||
"Create_New": "Создать",
|
"Create_New": "Создать",
|
||||||
"Add_Existing": "Добавить существующее",
|
"Add_Existing": "Добавить существующее",
|
||||||
"Add_Existing_Channel": "Добавить существующий канал",
|
"Add_Existing_Channel": "Добавить существующий канал",
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ export default class User extends Model {
|
||||||
|
|
||||||
@field('avatar_etag') avatarETag;
|
@field('avatar_etag') avatarETag;
|
||||||
|
|
||||||
@field('login_email_password') loginEmailPassword;
|
|
||||||
|
|
||||||
@field('show_message_in_main_thread') showMessageInMainThread;
|
@field('show_message_in_main_thread') showMessageInMainThread;
|
||||||
|
|
||||||
|
@field('is_from_webview') isFromWebView;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,16 @@ export default schemaMigrations({
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
]
|
]
|
||||||
|
}, {
|
||||||
|
toVersion: 11,
|
||||||
|
steps: [
|
||||||
|
addColumns({
|
||||||
|
table: 'users',
|
||||||
|
columns: [
|
||||||
|
{ name: 'is_from_webview', type: 'boolean', isOptional: true }
|
||||||
|
]
|
||||||
|
})
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { appSchema, tableSchema } from '@nozbe/watermelondb';
|
import { appSchema, tableSchema } from '@nozbe/watermelondb';
|
||||||
|
|
||||||
export default appSchema({
|
export default appSchema({
|
||||||
version: 10,
|
version: 11,
|
||||||
tables: [
|
tables: [
|
||||||
tableSchema({
|
tableSchema({
|
||||||
name: 'users',
|
name: 'users',
|
||||||
|
|
@ -15,7 +15,8 @@ export default appSchema({
|
||||||
{ name: 'roles', type: 'string', isOptional: true },
|
{ name: 'roles', type: 'string', isOptional: true },
|
||||||
{ name: 'login_email_password', type: 'boolean', isOptional: true },
|
{ name: 'login_email_password', type: 'boolean', isOptional: true },
|
||||||
{ name: 'show_message_in_main_thread', type: 'boolean', isOptional: true },
|
{ name: 'show_message_in_main_thread', type: 'boolean', isOptional: true },
|
||||||
{ name: 'avatar_etag', type: 'string', isOptional: true }
|
{ name: 'avatar_etag', type: 'string', isOptional: true },
|
||||||
|
{ name: 'is_from_webview', type: 'boolean', isOptional: true }
|
||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
tableSchema({
|
tableSchema({
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import { compareServerVersion, methods } from '../utils';
|
||||||
import database from '../database';
|
import database from '../database';
|
||||||
import log from '../../utils/log';
|
import log from '../../utils/log';
|
||||||
import reduxStore from '../createStore';
|
import reduxStore from '../createStore';
|
||||||
|
import RocketChat from '../rocketchat';
|
||||||
import protectedFunction from './helpers/protectedFunction';
|
import protectedFunction from './helpers/protectedFunction';
|
||||||
import { setPermissions as setPermissionsAction } from '../../actions/permissions';
|
import { setPermissions as setPermissionsAction } from '../../actions/permissions';
|
||||||
|
|
||||||
|
|
@ -128,7 +129,7 @@ export function getPermissions() {
|
||||||
const db = database.active;
|
const db = database.active;
|
||||||
const permissionsCollection = db.get('permissions');
|
const permissionsCollection = db.get('permissions');
|
||||||
const allRecords = await permissionsCollection.query().fetch();
|
const allRecords = await permissionsCollection.query().fetch();
|
||||||
|
RocketChat.subscribe('stream-notify-logged', 'permissions-changed');
|
||||||
// if server version is lower than 0.73.0, fetches from old api
|
// if server version is lower than 0.73.0, fetches from old api
|
||||||
if (compareServerVersion(serverVersion, '0.73.0', methods.lowerThan)) {
|
if (compareServerVersion(serverVersion, '0.73.0', methods.lowerThan)) {
|
||||||
// RC 0.66.0
|
// RC 0.66.0
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,66 @@ import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
|
||||||
|
|
||||||
import database from '../database';
|
import database from '../database';
|
||||||
import log from '../../utils/log';
|
import log from '../../utils/log';
|
||||||
|
import reduxStore from '../createStore';
|
||||||
import protectedFunction from './helpers/protectedFunction';
|
import protectedFunction from './helpers/protectedFunction';
|
||||||
|
import {
|
||||||
|
removeRoles, setRoles as setRolesAction, updateRoles
|
||||||
|
} from '../../actions/roles';
|
||||||
|
|
||||||
export default function() {
|
export async function setRoles() {
|
||||||
|
const db = database.active;
|
||||||
|
const rolesCollection = db.collections.get('roles');
|
||||||
|
const allRoles = await rolesCollection.query().fetch();
|
||||||
|
const parsed = allRoles.reduce((acc, item) => ({ ...acc, [item.id]: item.description || item.id }), {});
|
||||||
|
reduxStore.dispatch(setRolesAction(parsed));
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function onRolesChanged(ddpMessage) {
|
||||||
|
const { type, _id, description } = ddpMessage.fields.args[0];
|
||||||
|
if (/changed/.test(type)) {
|
||||||
|
const db = database.active;
|
||||||
|
const rolesCollection = db.get('roles');
|
||||||
|
try {
|
||||||
|
const rolesRecord = await rolesCollection.find(_id);
|
||||||
|
try {
|
||||||
|
await db.action(async() => {
|
||||||
|
await rolesRecord.update((u) => {
|
||||||
|
u.description = description;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
log(e);
|
||||||
|
}
|
||||||
|
reduxStore.dispatch(updateRoles(_id, description));
|
||||||
|
} catch (err) {
|
||||||
|
try {
|
||||||
|
await db.action(async() => {
|
||||||
|
await rolesCollection.create((post) => {
|
||||||
|
post._raw = sanitizedRaw({ id: _id, description }, rolesCollection.schema);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
log(e);
|
||||||
|
}
|
||||||
|
reduxStore.dispatch(updateRoles(_id, description || _id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (/removed/.test(type)) {
|
||||||
|
const db = database.active;
|
||||||
|
const rolesCollection = db.get('roles');
|
||||||
|
try {
|
||||||
|
const rolesRecord = await rolesCollection.find(_id);
|
||||||
|
await db.action(async() => {
|
||||||
|
await rolesRecord.destroyPermanently();
|
||||||
|
});
|
||||||
|
reduxStore.dispatch(removeRoles(_id));
|
||||||
|
} catch (err) {
|
||||||
|
console.log(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getRoles() {
|
||||||
const db = database.active;
|
const db = database.active;
|
||||||
return new Promise(async(resolve) => {
|
return new Promise(async(resolve) => {
|
||||||
try {
|
try {
|
||||||
|
|
@ -50,6 +107,7 @@ export default function() {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(e);
|
log(e);
|
||||||
}
|
}
|
||||||
|
setRoles();
|
||||||
return allRecords.length;
|
return allRecords.length;
|
||||||
});
|
});
|
||||||
return resolve();
|
return resolve();
|
||||||
|
|
|
||||||
|
|
@ -146,6 +146,7 @@ export default async function() {
|
||||||
const filteredSettingsIds = filteredSettings.map(s => s._id);
|
const filteredSettingsIds = filteredSettings.map(s => s._id);
|
||||||
|
|
||||||
reduxStore.dispatch(addSettings(this.parseSettings(filteredSettings)));
|
reduxStore.dispatch(addSettings(this.parseSettings(filteredSettings)));
|
||||||
|
RocketChat.subscribe('stream-notify-all', 'public-settings-changed');
|
||||||
|
|
||||||
// filter server info
|
// filter server info
|
||||||
const serverInfo = filteredSettings.filter(i1 => serverInfoKeys.includes(i1._id));
|
const serverInfo = filteredSettings.filter(i1 => serverInfoKeys.includes(i1._id));
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ import {
|
||||||
getEnterpriseModules, setEnterpriseModules, hasLicense, isOmnichannelModuleAvailable
|
getEnterpriseModules, setEnterpriseModules, hasLicense, isOmnichannelModuleAvailable
|
||||||
} from './methods/enterpriseModules';
|
} from './methods/enterpriseModules';
|
||||||
import getSlashCommands from './methods/getSlashCommands';
|
import getSlashCommands from './methods/getSlashCommands';
|
||||||
import getRoles from './methods/getRoles';
|
import { getRoles, setRoles, onRolesChanged } from './methods/getRoles';
|
||||||
import canOpenRoom from './methods/canOpenRoom';
|
import canOpenRoom from './methods/canOpenRoom';
|
||||||
import triggerBlockAction, { triggerSubmitView, triggerCancel } from './methods/actions';
|
import triggerBlockAction, { triggerSubmitView, triggerCancel } from './methods/actions';
|
||||||
|
|
||||||
|
|
@ -63,7 +63,9 @@ import UserPreferences from './userPreferences';
|
||||||
import { Encryption } from './encryption';
|
import { Encryption } from './encryption';
|
||||||
import EventEmitter from '../utils/events';
|
import EventEmitter from '../utils/events';
|
||||||
import { sanitizeLikeString } from './database/utils';
|
import { sanitizeLikeString } from './database/utils';
|
||||||
|
import { updatePermission } from '../actions/permissions';
|
||||||
import { TEAM_TYPE } from '../definition/ITeam';
|
import { TEAM_TYPE } from '../definition/ITeam';
|
||||||
|
import { updateSettings } from '../actions/settings';
|
||||||
|
|
||||||
const TOKEN_KEY = 'reactnativemeteor_usertoken';
|
const TOKEN_KEY = 'reactnativemeteor_usertoken';
|
||||||
const CURRENT_SERVER = 'currentServer';
|
const CURRENT_SERVER = 'currentServer';
|
||||||
|
|
@ -225,6 +227,14 @@ const RocketChat = {
|
||||||
this.usersListener.then(this.stopListener);
|
this.usersListener.then(this.stopListener);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.notifyAllListener) {
|
||||||
|
this.notifyAllListener.then(this.stopListener);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.rolesListener) {
|
||||||
|
this.rolesListener.then(this.stopListener);
|
||||||
|
}
|
||||||
|
|
||||||
if (this.notifyLoggedListener) {
|
if (this.notifyLoggedListener) {
|
||||||
this.notifyLoggedListener.then(this.stopListener);
|
this.notifyLoggedListener.then(this.stopListener);
|
||||||
}
|
}
|
||||||
|
|
@ -274,6 +284,31 @@ const RocketChat = {
|
||||||
|
|
||||||
this.usersListener = this.sdk.onStreamData('users', protectedFunction(ddpMessage => RocketChat._setUser(ddpMessage)));
|
this.usersListener = this.sdk.onStreamData('users', protectedFunction(ddpMessage => RocketChat._setUser(ddpMessage)));
|
||||||
|
|
||||||
|
this.notifyAllListener = this.sdk.onStreamData('stream-notify-all', protectedFunction(async(ddpMessage) => {
|
||||||
|
const { eventName } = ddpMessage.fields;
|
||||||
|
if (/public-settings-changed/.test(eventName)) {
|
||||||
|
const { _id, value } = ddpMessage.fields.args[1];
|
||||||
|
const db = database.active;
|
||||||
|
const settingsCollection = db.get('settings');
|
||||||
|
try {
|
||||||
|
const settingsRecord = await settingsCollection.find(_id);
|
||||||
|
const { type } = defaultSettings[_id];
|
||||||
|
if (type) {
|
||||||
|
await db.action(async() => {
|
||||||
|
await settingsRecord.update((u) => {
|
||||||
|
u[type] = value;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
reduxStore.dispatch(updateSettings(_id, value));
|
||||||
|
} catch (e) {
|
||||||
|
log(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
this.rolesListener = this.sdk.onStreamData('stream-roles', protectedFunction(ddpMessage => onRolesChanged(ddpMessage)));
|
||||||
|
|
||||||
this.notifyLoggedListener = this.sdk.onStreamData('stream-notify-logged', protectedFunction(async(ddpMessage) => {
|
this.notifyLoggedListener = this.sdk.onStreamData('stream-notify-logged', protectedFunction(async(ddpMessage) => {
|
||||||
const { eventName } = ddpMessage.fields;
|
const { eventName } = ddpMessage.fields;
|
||||||
if (/user-status/.test(eventName)) {
|
if (/user-status/.test(eventName)) {
|
||||||
|
|
@ -310,6 +345,21 @@ const RocketChat = {
|
||||||
} catch {
|
} catch {
|
||||||
// We can't create a new record since we don't receive the user._id
|
// We can't create a new record since we don't receive the user._id
|
||||||
}
|
}
|
||||||
|
} else if (/permissions-changed/.test(eventName)) {
|
||||||
|
const { _id, roles } = ddpMessage.fields.args[1];
|
||||||
|
const db = database.active;
|
||||||
|
const permissionsCollection = db.get('permissions');
|
||||||
|
try {
|
||||||
|
const permissionsRecord = await permissionsCollection.find(_id);
|
||||||
|
await db.action(async() => {
|
||||||
|
await permissionsRecord.update((u) => {
|
||||||
|
u.roles = roles;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
reduxStore.dispatch(updatePermission(_id, roles));
|
||||||
|
} catch (err) {
|
||||||
|
//
|
||||||
|
}
|
||||||
} else if (/Users:NameChanged/.test(eventName)) {
|
} else if (/Users:NameChanged/.test(eventName)) {
|
||||||
const userNameChanged = ddpMessage.fields.args[0];
|
const userNameChanged = ddpMessage.fields.args[0];
|
||||||
const db = database.active;
|
const db = database.active;
|
||||||
|
|
@ -476,10 +526,10 @@ const RocketChat = {
|
||||||
return this.post('users.forgotPassword', { email }, false);
|
return this.post('users.forgotPassword', { email }, false);
|
||||||
},
|
},
|
||||||
|
|
||||||
loginTOTP(params, loginEmailPassword) {
|
loginTOTP(params, loginEmailPassword, isFromWebView = false) {
|
||||||
return new Promise(async(resolve, reject) => {
|
return new Promise(async(resolve, reject) => {
|
||||||
try {
|
try {
|
||||||
const result = await this.login(params, loginEmailPassword);
|
const result = await this.login(params, isFromWebView);
|
||||||
return resolve(result);
|
return resolve(result);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) {
|
if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) {
|
||||||
|
|
@ -542,15 +592,15 @@ const RocketChat = {
|
||||||
return this.loginTOTP(params, true);
|
return this.loginTOTP(params, true);
|
||||||
},
|
},
|
||||||
|
|
||||||
async loginOAuthOrSso(params) {
|
async loginOAuthOrSso(params, isFromWebView = true) {
|
||||||
const result = await this.loginTOTP(params);
|
const result = await this.loginTOTP(params, false, isFromWebView);
|
||||||
reduxStore.dispatch(loginRequest({ resume: result.token }));
|
reduxStore.dispatch(loginRequest({ resume: result.token }, false, isFromWebView));
|
||||||
},
|
},
|
||||||
|
|
||||||
async login(params, loginEmailPassword) {
|
async login(credentials, isFromWebView = false) {
|
||||||
const sdk = this.shareSDK || this.sdk;
|
const sdk = this.shareSDK || this.sdk;
|
||||||
// RC 0.64.0
|
// RC 0.64.0
|
||||||
await sdk.login(params);
|
await sdk.login(credentials);
|
||||||
const { result } = sdk.currentLogin;
|
const { result } = sdk.currentLogin;
|
||||||
const user = {
|
const user = {
|
||||||
id: result.userId,
|
id: result.userId,
|
||||||
|
|
@ -565,7 +615,7 @@ const RocketChat = {
|
||||||
emails: result.me.emails,
|
emails: result.me.emails,
|
||||||
roles: result.me.roles,
|
roles: result.me.roles,
|
||||||
avatarETag: result.me.avatarETag,
|
avatarETag: result.me.avatarETag,
|
||||||
loginEmailPassword,
|
isFromWebView,
|
||||||
showMessageInMainThread: result.me.settings?.preferences?.showMessageInMainThread ?? true
|
showMessageInMainThread: result.me.settings?.preferences?.showMessageInMainThread ?? true
|
||||||
};
|
};
|
||||||
return user;
|
return user;
|
||||||
|
|
@ -843,6 +893,7 @@ const RocketChat = {
|
||||||
isOmnichannelModuleAvailable,
|
isOmnichannelModuleAvailable,
|
||||||
getSlashCommands,
|
getSlashCommands,
|
||||||
getRoles,
|
getRoles,
|
||||||
|
setRoles,
|
||||||
parseSettings: settings => settings.reduce((ret, item) => {
|
parseSettings: settings => settings.reduce((ret, item) => {
|
||||||
ret[item._id] = defaultSettings[item._id] && item[defaultSettings[item._id].type];
|
ret[item._id] = defaultSettings[item._id] && item[defaultSettings[item._id].type];
|
||||||
if (item._id === 'Hide_System_Messages') {
|
if (item._id === 'Hide_System_Messages') {
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ import createDiscussion from './createDiscussion';
|
||||||
import enterpriseModules from './enterpriseModules';
|
import enterpriseModules from './enterpriseModules';
|
||||||
import encryption from './encryption';
|
import encryption from './encryption';
|
||||||
import permissions from './permissions';
|
import permissions from './permissions';
|
||||||
|
import roles from './roles';
|
||||||
|
|
||||||
import inquiry from '../ee/omnichannel/reducers/inquiry';
|
import inquiry from '../ee/omnichannel/reducers/inquiry';
|
||||||
|
|
||||||
|
|
@ -43,5 +44,6 @@ export default combineReducers({
|
||||||
inquiry,
|
inquiry,
|
||||||
enterpriseModules,
|
enterpriseModules,
|
||||||
encryption,
|
encryption,
|
||||||
permissions
|
permissions,
|
||||||
|
roles
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,16 @@
|
||||||
import { PERMISSIONS } from '../actions/actionsTypes';
|
import { PERMISSIONS } from '../actions/actionsTypes';
|
||||||
|
|
||||||
const initialState = {
|
const initialState = {};
|
||||||
permissions: {}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function permissions(state = initialState, action) {
|
export default function permissions(state = initialState, action) {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
case PERMISSIONS.SET:
|
case PERMISSIONS.SET:
|
||||||
return action.permissions;
|
return action.permissions;
|
||||||
|
case PERMISSIONS.UPDATE:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
[action.payload.id]: action.payload.roles
|
||||||
|
};
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
import { ROLES } from '../actions/actionsTypes';
|
||||||
|
|
||||||
|
const initialState = {};
|
||||||
|
|
||||||
|
export default function permissions(state = initialState, action) {
|
||||||
|
switch (action.type) {
|
||||||
|
case ROLES.SET:
|
||||||
|
return action.roles;
|
||||||
|
case ROLES.UPDATE:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
[action.payload.id]: action.payload.desc || action.payload.id
|
||||||
|
};
|
||||||
|
case ROLES.REMOVE: {
|
||||||
|
const newState = { ...state };
|
||||||
|
delete newState[action.payload.id];
|
||||||
|
return newState;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -28,7 +28,7 @@ export default function(state = initialState, action) {
|
||||||
case ROOM.DELETE:
|
case ROOM.DELETE:
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
rid: action.rid,
|
rid: action.room.rid,
|
||||||
isDeleting: true
|
isDeleting: true
|
||||||
};
|
};
|
||||||
case ROOM.CLOSE:
|
case ROOM.CLOSE:
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,11 @@ export default (state = initialState, action) => {
|
||||||
...state,
|
...state,
|
||||||
...action.payload
|
...action.payload
|
||||||
};
|
};
|
||||||
|
case SETTINGS.UPDATE:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
[action.payload.id]: action.payload.value
|
||||||
|
};
|
||||||
case SETTINGS.CLEAR:
|
case SETTINGS.CLEAR:
|
||||||
return initialState;
|
return initialState;
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ const fallbackNavigation = function* fallbackNavigation() {
|
||||||
const handleOAuth = function* handleOAuth({ params }) {
|
const handleOAuth = function* handleOAuth({ params }) {
|
||||||
const { credentialToken, credentialSecret } = params;
|
const { credentialToken, credentialSecret } = params;
|
||||||
try {
|
try {
|
||||||
yield RocketChat.loginOAuthOrSso({ oauth: { credentialToken, credentialSecret } });
|
yield RocketChat.loginOAuthOrSso({ oauth: { credentialToken, credentialSecret } }, false);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log(e);
|
log(e);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,15 +30,15 @@ import Navigation from '../lib/Navigation';
|
||||||
|
|
||||||
const getServer = state => state.server.server;
|
const getServer = state => state.server.server;
|
||||||
const loginWithPasswordCall = args => RocketChat.loginWithPassword(args);
|
const loginWithPasswordCall = args => RocketChat.loginWithPassword(args);
|
||||||
const loginCall = args => RocketChat.login(args);
|
const loginCall = (credentials, isFromWebView) => RocketChat.login(credentials, isFromWebView);
|
||||||
const logoutCall = args => RocketChat.logout(args);
|
const logoutCall = args => RocketChat.logout(args);
|
||||||
|
|
||||||
const handleLoginRequest = function* handleLoginRequest({ credentials, logoutOnError = false }) {
|
const handleLoginRequest = function* handleLoginRequest({ credentials, logoutOnError = false, isFromWebView = false }) {
|
||||||
logEvent(events.LOGIN_DEFAULT_LOGIN);
|
logEvent(events.LOGIN_DEFAULT_LOGIN);
|
||||||
try {
|
try {
|
||||||
let result;
|
let result;
|
||||||
if (credentials.resume) {
|
if (credentials.resume) {
|
||||||
result = yield call(loginCall, credentials);
|
result = yield loginCall(credentials, isFromWebView);
|
||||||
} else {
|
} else {
|
||||||
result = yield call(loginWithPasswordCall, credentials);
|
result = yield call(loginWithPasswordCall, credentials);
|
||||||
}
|
}
|
||||||
|
|
@ -68,7 +68,6 @@ const handleLoginRequest = function* handleLoginRequest({ credentials, logoutOnE
|
||||||
log(e);
|
log(e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
yield put(loginSuccess(result));
|
yield put(loginSuccess(result));
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
@ -90,6 +89,7 @@ const fetchCustomEmojis = function* fetchCustomEmojis() {
|
||||||
};
|
};
|
||||||
|
|
||||||
const fetchRoles = function* fetchRoles() {
|
const fetchRoles = function* fetchRoles() {
|
||||||
|
RocketChat.subscribe('stream-roles', 'roles');
|
||||||
yield RocketChat.getRoles();
|
yield RocketChat.getRoles();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -147,14 +147,13 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
|
||||||
status: user.status,
|
status: user.status,
|
||||||
statusText: user.statusText,
|
statusText: user.statusText,
|
||||||
roles: user.roles,
|
roles: user.roles,
|
||||||
loginEmailPassword: user.loginEmailPassword,
|
isFromWebView: user.isFromWebView,
|
||||||
showMessageInMainThread: user.showMessageInMainThread,
|
showMessageInMainThread: user.showMessageInMainThread,
|
||||||
avatarETag: user.avatarETag
|
avatarETag: user.avatarETag
|
||||||
};
|
};
|
||||||
yield serversDB.action(async() => {
|
yield serversDB.action(async() => {
|
||||||
try {
|
try {
|
||||||
const userRecord = await usersCollection.find(user.id);
|
const userRecord = await usersCollection.find(user.id);
|
||||||
u.loginEmailPassword = userRecord?.loginEmailPassword;
|
|
||||||
await userRecord.update((record) => {
|
await userRecord.update((record) => {
|
||||||
record._raw = sanitizedRaw({ id: user.id, ...record._raw }, usersCollection.schema);
|
record._raw = sanitizedRaw({ id: user.id, ...record._raw }, usersCollection.schema);
|
||||||
Object.assign(record, u);
|
Object.assign(record, u);
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ const watchUserTyping = function* watchUserTyping({ rid, status }) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleRemovedRoom = function* handleRemovedRoom(roomType) {
|
const handleRemovedRoom = function* handleRemovedRoom(roomType, actionType) {
|
||||||
const isMasterDetail = yield select(state => state.app.isMasterDetail);
|
const isMasterDetail = yield select(state => state.app.isMasterDetail);
|
||||||
if (isMasterDetail) {
|
if (isMasterDetail) {
|
||||||
yield Navigation.navigate('DrawerNavigator');
|
yield Navigation.navigate('DrawerNavigator');
|
||||||
|
|
@ -40,9 +40,13 @@ const handleRemovedRoom = function* handleRemovedRoom(roomType) {
|
||||||
yield Navigation.navigate('RoomsListView');
|
yield Navigation.navigate('RoomsListView');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (roomType === 'team') {
|
if (actionType === 'leave') {
|
||||||
EventEmitter.emit(LISTENER, { message: I18n.t('Left_The_Team_Successfully') });
|
EventEmitter.emit(LISTENER, { message: roomType === 'team' ? I18n.t('Left_The_Team_Successfully') : I18n.t('Left_The_Room_Successfully') });
|
||||||
}
|
}
|
||||||
|
if (actionType === 'delete') {
|
||||||
|
EventEmitter.emit(LISTENER, { message: roomType === 'team' ? I18n.t('Deleted_The_Team_Successfully') : I18n.t('Deleted_The_Room_Successfully') });
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// types.ROOM.REMOVE is triggered by `subscriptions-changed` with `removed` arg
|
// types.ROOM.REMOVE is triggered by `subscriptions-changed` with `removed` arg
|
||||||
const { timeout } = yield race({
|
const { timeout } = yield race({
|
||||||
|
|
@ -66,7 +70,7 @@ const handleLeaveRoom = function* handleLeaveRoom({ room, roomType, selected })
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result?.success) {
|
if (result?.success) {
|
||||||
yield handleRemovedRoom(roomType);
|
yield handleRemovedRoom(roomType, 'leave');
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logEvent(events.RA_LEAVE_F);
|
logEvent(events.RA_LEAVE_F);
|
||||||
|
|
@ -80,16 +84,23 @@ const handleLeaveRoom = function* handleLeaveRoom({ room, roomType, selected })
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleDeleteRoom = function* handleDeleteRoom({ rid, t }) {
|
const handleDeleteRoom = function* handleDeleteRoom({ room, roomType, selected }) {
|
||||||
logEvent(events.RI_EDIT_DELETE);
|
logEvent(events.RI_EDIT_DELETE);
|
||||||
try {
|
try {
|
||||||
const result = yield RocketChat.deleteRoom(rid, t);
|
let result = {};
|
||||||
if (result.success) {
|
|
||||||
yield handleRemovedRoom();
|
if (roomType === 'channel') {
|
||||||
|
result = yield RocketChat.deleteRoom(room.rid, room.t);
|
||||||
|
} else if (roomType === 'team') {
|
||||||
|
result = yield RocketChat.deleteTeam({ teamId: room.teamId, ...(selected && { roomsToRemove: selected }) });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result?.success) {
|
||||||
|
yield handleRemovedRoom(roomType, 'delete');
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logEvent(events.RI_EDIT_DELETE_F);
|
logEvent(events.RI_EDIT_DELETE_F);
|
||||||
Alert.alert(I18n.t('Oops'), I18n.t('There_was_an_error_while_action', { action: I18n.t('deleting_room') }));
|
Alert.alert(I18n.t('Oops'), I18n.t('There_was_an_error_while_action', { action: roomType === 'team' ? I18n.t('deleting_team') : I18n.t('deleting_room') }));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ const handleSelectServer = function* handleSelectServer({ server, version, fetch
|
||||||
RocketChat.setSettings();
|
RocketChat.setSettings();
|
||||||
RocketChat.setCustomEmojis();
|
RocketChat.setCustomEmojis();
|
||||||
RocketChat.setPermissions();
|
RocketChat.setPermissions();
|
||||||
|
RocketChat.setRoles();
|
||||||
RocketChat.setEnterpriseModules();
|
RocketChat.setEnterpriseModules();
|
||||||
|
|
||||||
let serverInfo;
|
let serverInfo;
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,8 @@ class RoomActionsView extends React.Component {
|
||||||
route: PropTypes.object,
|
route: PropTypes.object,
|
||||||
leaveRoom: PropTypes.func,
|
leaveRoom: PropTypes.func,
|
||||||
jitsiEnabled: PropTypes.bool,
|
jitsiEnabled: PropTypes.bool,
|
||||||
|
jitsiEnableTeams: PropTypes.bool,
|
||||||
|
jitsiEnableChannels: PropTypes.bool,
|
||||||
encryptionEnabled: PropTypes.bool,
|
encryptionEnabled: PropTypes.bool,
|
||||||
setLoadingInvite: PropTypes.func,
|
setLoadingInvite: PropTypes.func,
|
||||||
closeRoom: PropTypes.func,
|
closeRoom: PropTypes.func,
|
||||||
|
|
@ -655,10 +657,15 @@ class RoomActionsView extends React.Component {
|
||||||
|
|
||||||
renderJitsi = () => {
|
renderJitsi = () => {
|
||||||
const { room } = this.state;
|
const { room } = this.state;
|
||||||
const { jitsiEnabled } = this.props;
|
const { jitsiEnabled, jitsiEnableTeams, jitsiEnableChannels } = this.props;
|
||||||
if (!jitsiEnabled || room.teamMain) {
|
|
||||||
|
const isJitsiDisabledForTeams = room.teamMain && !jitsiEnableTeams;
|
||||||
|
const isJitsiDisabledForChannels = !room.teamMain && (room.t === 'p' || room.t === 'c') && !jitsiEnableChannels;
|
||||||
|
|
||||||
|
if (!jitsiEnabled || isJitsiDisabledForTeams || isJitsiDisabledForChannels) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<List.Section>
|
<List.Section>
|
||||||
<List.Separator />
|
<List.Separator />
|
||||||
|
|
@ -1078,6 +1085,8 @@ class RoomActionsView extends React.Component {
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
jitsiEnabled: state.settings.Jitsi_Enabled || false,
|
jitsiEnabled: state.settings.Jitsi_Enabled || false,
|
||||||
|
jitsiEnableTeams: state.settings.Jitsi_Enable_Teams || false,
|
||||||
|
jitsiEnableChannels: state.settings.Jitsi_Enable_Channels || false,
|
||||||
encryptionEnabled: state.encryption.enabled,
|
encryptionEnabled: state.encryption.enabled,
|
||||||
serverVersion: state.server.version,
|
serverVersion: state.server.version,
|
||||||
isMasterDetail: state.app.isMasterDetail,
|
isMasterDetail: state.app.isMasterDetail,
|
||||||
|
|
|
||||||
|
|
@ -292,34 +292,11 @@ class RoomInfoEditView extends React.Component {
|
||||||
}, 100);
|
}, 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleDeleteTeam = async(selected) => {
|
|
||||||
logEvent(events.RI_EDIT_DELETE_TEAM);
|
|
||||||
const { navigation, isMasterDetail } = this.props;
|
|
||||||
const { room } = this.state;
|
|
||||||
try {
|
|
||||||
const result = await RocketChat.deleteTeam({ teamId: room.teamId, ...(selected && { roomsToRemove: selected }) });
|
|
||||||
if (result.success) {
|
|
||||||
if (isMasterDetail) {
|
|
||||||
navigation.navigate('DrawerNavigator');
|
|
||||||
} else {
|
|
||||||
navigation.navigate('RoomsListView');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
logEvent(events.RI_EDIT_DELETE_TEAM_F);
|
|
||||||
log(e);
|
|
||||||
showErrorAlert(
|
|
||||||
e.data.error
|
|
||||||
? I18n.t(e.data.error)
|
|
||||||
: I18n.t('There_was_an_error_while_action', { action: I18n.t('deleting_team') }),
|
|
||||||
I18n.t('Cannot_delete')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
deleteTeam = async() => {
|
deleteTeam = async() => {
|
||||||
const { room } = this.state;
|
const { room } = this.state;
|
||||||
const { navigation } = this.props;
|
const {
|
||||||
|
navigation, deleteCPermission, deletePPermission, deleteRoom
|
||||||
|
} = this.props;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const db = database.active;
|
const db = database.active;
|
||||||
|
|
@ -329,16 +306,27 @@ class RoomInfoEditView extends React.Component {
|
||||||
Q.where('team_main', Q.notEq(true))
|
Q.where('team_main', Q.notEq(true))
|
||||||
);
|
);
|
||||||
|
|
||||||
if (teamChannels.length) {
|
const teamChannelOwner = [];
|
||||||
|
for (let i = 0; i < teamChannels.length; i += 1) {
|
||||||
|
const permissionType = teamChannels[i].t === 'c' ? deleteCPermission : deletePPermission;
|
||||||
|
// eslint-disable-next-line no-await-in-loop
|
||||||
|
const permissions = await RocketChat.hasPermission([
|
||||||
|
permissionType
|
||||||
|
], teamChannels[i].rid);
|
||||||
|
|
||||||
|
if (permissions[0]) { teamChannelOwner.push(teamChannels[i]); }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (teamChannelOwner.length) {
|
||||||
navigation.navigate('SelectListView', {
|
navigation.navigate('SelectListView', {
|
||||||
title: 'Delete_Team',
|
title: 'Delete_Team',
|
||||||
data: teamChannels,
|
data: teamChannelOwner,
|
||||||
infoText: 'Select_channels_to_delete',
|
infoText: 'Select_channels_to_delete',
|
||||||
nextAction: (selected) => {
|
nextAction: (selected) => {
|
||||||
showConfirmationAlert({
|
showConfirmationAlert({
|
||||||
message: I18n.t('You_are_deleting_the_team', { team: RocketChat.getRoomTitle(room) }),
|
message: I18n.t('You_are_deleting_the_team', { team: RocketChat.getRoomTitle(room) }),
|
||||||
confirmationText: I18n.t('Yes_action_it', { action: I18n.t('delete') }),
|
confirmationText: I18n.t('Yes_action_it', { action: I18n.t('delete') }),
|
||||||
onPress: () => this.handleDeleteTeam(selected)
|
onPress: () => deleteRoom('team', room, selected)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -346,7 +334,7 @@ class RoomInfoEditView extends React.Component {
|
||||||
showConfirmationAlert({
|
showConfirmationAlert({
|
||||||
message: I18n.t('You_are_deleting_the_team', { team: RocketChat.getRoomTitle(room) }),
|
message: I18n.t('You_are_deleting_the_team', { team: RocketChat.getRoomTitle(room) }),
|
||||||
confirmationText: I18n.t('Yes_action_it', { action: I18n.t('delete') }),
|
confirmationText: I18n.t('Yes_action_it', { action: I18n.t('delete') }),
|
||||||
onPress: () => this.handleDeleteTeam()
|
onPress: () => deleteRoom('team', room)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
@ -375,7 +363,7 @@ class RoomInfoEditView extends React.Component {
|
||||||
{
|
{
|
||||||
text: I18n.t('Yes_action_it', { action: I18n.t('delete') }),
|
text: I18n.t('Yes_action_it', { action: I18n.t('delete') }),
|
||||||
style: 'destructive',
|
style: 'destructive',
|
||||||
onPress: () => deleteRoom(room.rid, room.t)
|
onPress: () => deleteRoom('channel', room)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
{ cancelable: false }
|
{ cancelable: false }
|
||||||
|
|
@ -767,7 +755,7 @@ const mapStateToProps = state => ({
|
||||||
});
|
});
|
||||||
|
|
||||||
const mapDispatchToProps = dispatch => ({
|
const mapDispatchToProps = dispatch => ({
|
||||||
deleteRoom: (rid, t) => dispatch(deleteRoomAction(rid, t))
|
deleteRoom: (roomType, room, selected) => dispatch(deleteRoomAction(roomType, room, selected))
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(mapStateToProps, mapDispatchToProps)(withTheme(RoomInfoEditView));
|
export default connect(mapStateToProps, mapDispatchToProps)(withTheme(RoomInfoEditView));
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import { connect } from 'react-redux';
|
||||||
import UAParser from 'ua-parser-js';
|
import UAParser from 'ua-parser-js';
|
||||||
import isEmpty from 'lodash/isEmpty';
|
import isEmpty from 'lodash/isEmpty';
|
||||||
|
|
||||||
import database from '../../lib/database';
|
|
||||||
import { CustomIcon } from '../../lib/Icons';
|
import { CustomIcon } from '../../lib/Icons';
|
||||||
import Status from '../../containers/Status';
|
import Status from '../../containers/Status';
|
||||||
import Avatar from '../../containers/Avatar';
|
import Avatar from '../../containers/Avatar';
|
||||||
|
|
@ -55,7 +54,8 @@ class RoomInfoView extends React.Component {
|
||||||
theme: PropTypes.string,
|
theme: PropTypes.string,
|
||||||
isMasterDetail: PropTypes.bool,
|
isMasterDetail: PropTypes.bool,
|
||||||
jitsiEnabled: PropTypes.bool,
|
jitsiEnabled: PropTypes.bool,
|
||||||
editRoomPermission: PropTypes.array
|
editRoomPermission: PropTypes.array,
|
||||||
|
roles: PropTypes.array
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
|
|
@ -133,18 +133,9 @@ class RoomInfoView extends React.Component {
|
||||||
return room.t === 'l';
|
return room.t === 'l';
|
||||||
}
|
}
|
||||||
|
|
||||||
getRoleDescription = async(id) => {
|
getRoleDescription = (id) => {
|
||||||
const db = database.active;
|
const { roles } = this.props;
|
||||||
try {
|
return roles[id];
|
||||||
const rolesCollection = db.get('roles');
|
|
||||||
const role = await rolesCollection.find(id);
|
|
||||||
if (role) {
|
|
||||||
return role.description;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
} catch (e) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
loadVisitor = async() => {
|
loadVisitor = async() => {
|
||||||
|
|
@ -378,7 +369,8 @@ const mapStateToProps = state => ({
|
||||||
rooms: state.room.rooms,
|
rooms: state.room.rooms,
|
||||||
isMasterDetail: state.app.isMasterDetail,
|
isMasterDetail: state.app.isMasterDetail,
|
||||||
jitsiEnabled: state.settings.Jitsi_Enabled || false,
|
jitsiEnabled: state.settings.Jitsi_Enabled || false,
|
||||||
editRoomPermission: state.permissions['edit-room']
|
editRoomPermission: state.permissions['edit-room'],
|
||||||
|
roles: state.roles
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(mapStateToProps)(withTheme(RoomInfoView));
|
export default connect(mapStateToProps)(withTheme(RoomInfoView));
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,8 @@ class RoomMembersView extends React.Component {
|
||||||
room: PropTypes.object,
|
room: PropTypes.object,
|
||||||
user: PropTypes.shape({
|
user: PropTypes.shape({
|
||||||
id: PropTypes.string,
|
id: PropTypes.string,
|
||||||
token: PropTypes.string
|
token: PropTypes.string,
|
||||||
|
roles: PropTypes.array
|
||||||
}),
|
}),
|
||||||
showActionSheet: PropTypes.func,
|
showActionSheet: PropTypes.func,
|
||||||
theme: PropTypes.string,
|
theme: PropTypes.string,
|
||||||
|
|
|
||||||
|
|
@ -269,7 +269,7 @@ class ListContainer extends React.Component {
|
||||||
const { listRef } = this.props;
|
const { listRef } = this.props;
|
||||||
const index = messages.findIndex(item => item.id === messageId);
|
const index = messages.findIndex(item => item.id === messageId);
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
listRef.current.getNode().scrollToIndex({ index, viewPosition: 0.5 });
|
listRef.current.getNode().scrollToIndex({ index, viewPosition: 0.5, viewOffset: 100 });
|
||||||
await new Promise(res => setTimeout(res, 300));
|
await new Promise(res => setTimeout(res, 300));
|
||||||
if (!this.viewableItems.map(vi => vi.key).includes(messageId)) {
|
if (!this.viewableItems.map(vi => vi.key).includes(messageId)) {
|
||||||
if (!this.jumping) {
|
if (!this.jumping) {
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ class SettingsView extends React.Component {
|
||||||
const usersCollection = db.get('users');
|
const usersCollection = db.get('users');
|
||||||
try {
|
try {
|
||||||
const userRecord = await usersCollection.find(user.id);
|
const userRecord = await usersCollection.find(user.id);
|
||||||
if (!userRecord.loginEmailPassword) {
|
if (userRecord.isFromWebView) {
|
||||||
showConfirmationAlert({
|
showConfirmationAlert({
|
||||||
title: I18n.t('Clear_cookies_alert'),
|
title: I18n.t('Clear_cookies_alert'),
|
||||||
message: I18n.t('Clear_cookies_desc'),
|
message: I18n.t('Clear_cookies_desc'),
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
const random = require('./helpers/random');
|
const random = require('./helpers/random');
|
||||||
|
|
||||||
const value = random(20);
|
const value = random(20);
|
||||||
const data = {
|
const data = {
|
||||||
server: 'https://mobile.rocket.chat',
|
server: 'https://mobile.rocket.chat',
|
||||||
|
|
@ -71,5 +72,5 @@ const data = {
|
||||||
email: `mobile+registeringfour${ value }@rocket.chat`
|
email: `mobile+registeringfour${ value }@rocket.chat`
|
||||||
},
|
},
|
||||||
random: value
|
random: value
|
||||||
}
|
};
|
||||||
module.exports = data;
|
module.exports = data;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
|
// eslint-disable-next-line import/no-unresolved
|
||||||
const random = require('./helpers/random');
|
const random = require('./helpers/random');
|
||||||
|
|
||||||
const value = random(20);
|
const value = random(20);
|
||||||
const data = {
|
const data = {
|
||||||
server: 'https://mobile.rocket.chat',
|
server: 'https://mobile.rocket.chat',
|
||||||
|
|
@ -68,5 +70,5 @@ const data = {
|
||||||
email: `mobile+registeringfour${ value }@rocket.chat`
|
email: `mobile+registeringfour${ value }@rocket.chat`
|
||||||
},
|
},
|
||||||
random: value
|
random: value
|
||||||
}
|
};
|
||||||
module.exports = data;
|
module.exports = data;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
|
// eslint-disable-next-line import/no-unresolved
|
||||||
const random = require('./helpers/random');
|
const random = require('./helpers/random');
|
||||||
|
|
||||||
const value = random(20);
|
const value = random(20);
|
||||||
const data = {
|
const data = {
|
||||||
server: 'http://localhost:3000',
|
server: 'http://localhost:3000',
|
||||||
|
|
@ -71,5 +73,5 @@ const data = {
|
||||||
email: `mobile+registeringfour${ value }@rocket.chat`
|
email: `mobile+registeringfour${ value }@rocket.chat`
|
||||||
},
|
},
|
||||||
random: value
|
random: value
|
||||||
}
|
};
|
||||||
module.exports = data;
|
module.exports = data;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../data');
|
const data = require('../data');
|
||||||
|
|
||||||
async function navigateToWorkspace(server = data.server) {
|
async function navigateToWorkspace(server = data.server) {
|
||||||
|
|
@ -52,27 +49,27 @@ async function logout() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function mockMessage(message, isThread = false) {
|
async function mockMessage(message, isThread = false) {
|
||||||
let input = isThread ? 'messagebox-input-thread' : 'messagebox-input';
|
const input = isThread ? 'messagebox-input-thread' : 'messagebox-input';
|
||||||
await element(by.id(input)).tap();
|
await element(by.id(input)).tap();
|
||||||
await element(by.id(input)).typeText(`${ data.random }${ message }`);
|
await element(by.id(input)).typeText(`${ data.random }${ message }`);
|
||||||
await element(by.id('messagebox-send-message')).tap();
|
await element(by.id('messagebox-send-message')).tap();
|
||||||
await waitFor(element(by.label(`${ data.random }${ message }`))).toExist().withTimeout(60000);
|
await waitFor(element(by.label(`${ data.random }${ message }`))).toExist().withTimeout(60000);
|
||||||
await expect(element(by.label(`${ data.random }${ message }`))).toExist();
|
await expect(element(by.label(`${ data.random }${ message }`))).toExist();
|
||||||
await element(by.label(`${ data.random }${ message }`)).atIndex(0).tap();
|
await element(by.label(`${ data.random }${ message }`)).atIndex(0).tap();
|
||||||
};
|
}
|
||||||
|
|
||||||
async function starMessage(message) {
|
async function starMessage(message) {
|
||||||
const messageLabel = `${ data.random }${ message }`
|
const messageLabel = `${ data.random }${ message }`;
|
||||||
await element(by.label(messageLabel)).atIndex(0).longPress();
|
await element(by.label(messageLabel)).atIndex(0).longPress();
|
||||||
await expect(element(by.id('action-sheet'))).toExist();
|
await expect(element(by.id('action-sheet'))).toExist();
|
||||||
await expect(element(by.id('action-sheet-handle'))).toBeVisible();
|
await expect(element(by.id('action-sheet-handle'))).toBeVisible();
|
||||||
await element(by.id('action-sheet-handle')).swipe('up', 'fast', 0.5);
|
await element(by.id('action-sheet-handle')).swipe('up', 'fast', 0.5);
|
||||||
await element(by.label('Star')).atIndex(0).tap();
|
await element(by.label('Star')).atIndex(0).tap();
|
||||||
await waitFor(element(by.id('action-sheet'))).not.toExist().withTimeout(5000);
|
await waitFor(element(by.id('action-sheet'))).not.toExist().withTimeout(5000);
|
||||||
};
|
}
|
||||||
|
|
||||||
async function pinMessage(message) {
|
async function pinMessage(message) {
|
||||||
const messageLabel = `${ data.random }${ message }`
|
const messageLabel = `${ data.random }${ message }`;
|
||||||
await waitFor(element(by.label(messageLabel)).atIndex(0)).toExist();
|
await waitFor(element(by.label(messageLabel)).atIndex(0)).toExist();
|
||||||
await element(by.label(messageLabel)).atIndex(0).longPress();
|
await element(by.label(messageLabel)).atIndex(0).longPress();
|
||||||
await expect(element(by.id('action-sheet'))).toExist();
|
await expect(element(by.id('action-sheet'))).toExist();
|
||||||
|
|
@ -91,7 +88,7 @@ async function tapBack() {
|
||||||
await element(by.id('header-back')).atIndex(0).tap();
|
await element(by.id('header-back')).atIndex(0).tap();
|
||||||
}
|
}
|
||||||
|
|
||||||
async function sleep(ms) {
|
function sleep(ms) {
|
||||||
return new Promise(res => setTimeout(res, ms));
|
return new Promise(res => setTimeout(res, ms));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -107,16 +104,16 @@ async function searchRoom(room) {
|
||||||
async function tryTapping(theElement, timeout, longtap = false) {
|
async function tryTapping(theElement, timeout, longtap = false) {
|
||||||
try {
|
try {
|
||||||
if (longtap) {
|
if (longtap) {
|
||||||
await theElement.longPress()
|
await theElement.longPress();
|
||||||
} else {
|
} else {
|
||||||
await theElement.tap()
|
await theElement.tap();
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (timeout <= 0) { // TODO: Maths. How closely has the timeout been honoured here?
|
if (timeout <= 0) { // TODO: Maths. How closely has the timeout been honoured here?
|
||||||
throw e
|
throw e;
|
||||||
}
|
}
|
||||||
await sleep(100)
|
await sleep(100);
|
||||||
await tryTapping(theElement, timeout - 100)
|
await tryTapping(theElement, timeout - 100);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -126,7 +123,7 @@ const checkServer = async(server) => {
|
||||||
await waitFor(element(by.id('sidebar-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('sidebar-view'))).toBeVisible().withTimeout(2000);
|
||||||
await waitFor(element(by.label(label))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.label(label))).toBeVisible().withTimeout(10000);
|
||||||
await element(by.id('sidebar-close-drawer')).tap();
|
await element(by.id('sidebar-close-drawer')).tap();
|
||||||
}
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
navigateToWorkspace,
|
navigateToWorkspace,
|
||||||
|
|
|
||||||
|
|
@ -6,99 +6,99 @@ const TEAM_TYPE = {
|
||||||
PRIVATE: 1
|
PRIVATE: 1
|
||||||
};
|
};
|
||||||
|
|
||||||
let server = data.server
|
const { server } = data;
|
||||||
|
|
||||||
const rocketchat = axios.create({
|
const rocketchat = axios.create({
|
||||||
baseURL: `${ server }/api/v1/`,
|
baseURL: `${ server }/api/v1/`,
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json;charset=UTF-8',
|
'Content-Type': 'application/json;charset=UTF-8'
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
const login = async(username, password) => {
|
const login = async(username, password) => {
|
||||||
console.log(`Logging in as user ${username}`)
|
console.log(`Logging in as user ${ username }`);
|
||||||
const response = await rocketchat.post('login', {
|
const response = await rocketchat.post('login', {
|
||||||
"user": username,
|
user: username,
|
||||||
"password": password
|
password
|
||||||
})
|
});
|
||||||
const userId = response.data.data.userId
|
const { userId } = response.data.data;
|
||||||
const authToken = response.data.data.authToken
|
const { authToken } = response.data.data;
|
||||||
rocketchat.defaults.headers.common['X-User-Id'] = userId
|
rocketchat.defaults.headers.common['X-User-Id'] = userId;
|
||||||
rocketchat.defaults.headers.common['X-Auth-Token'] = authToken
|
rocketchat.defaults.headers.common['X-Auth-Token'] = authToken;
|
||||||
return { authToken, userId };
|
return { authToken, userId };
|
||||||
}
|
};
|
||||||
|
|
||||||
const createUser = async(username, password, name, email) => {
|
const createUser = async(username, password, name, email) => {
|
||||||
console.log(`Creating user ${username}`)
|
console.log(`Creating user ${ username }`);
|
||||||
try {
|
try {
|
||||||
await rocketchat.post('users.create', {
|
await rocketchat.post('users.create', {
|
||||||
"username": username,
|
username,
|
||||||
"password": password,
|
password,
|
||||||
"name": name,
|
name,
|
||||||
"email": email
|
email
|
||||||
})
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(JSON.stringify(error))
|
console.log(JSON.stringify(error));
|
||||||
throw "Failed to create user"
|
throw new Error('Failed to create user');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const createChannelIfNotExists = async(channelname) => {
|
const createChannelIfNotExists = async(channelname) => {
|
||||||
console.log(`Creating public channel ${channelname}`)
|
console.log(`Creating public channel ${ channelname }`);
|
||||||
try {
|
try {
|
||||||
const room = await rocketchat.post('channels.create', {
|
const room = await rocketchat.post('channels.create', {
|
||||||
"name": channelname
|
name: channelname
|
||||||
})
|
});
|
||||||
return room
|
return room;
|
||||||
} catch (createError) {
|
} catch (createError) {
|
||||||
try { // Maybe it exists already?
|
try { // Maybe it exists already?
|
||||||
const room = rocketchat.get(`channels.info?roomName=${channelname}`)
|
const room = rocketchat.get(`channels.info?roomName=${ channelname }`);
|
||||||
return room
|
return room;
|
||||||
} catch (infoError) {
|
} catch (infoError) {
|
||||||
console.log(JSON.stringify(createError))
|
console.log(JSON.stringify(createError));
|
||||||
console.log(JSON.stringify(infoError))
|
console.log(JSON.stringify(infoError));
|
||||||
throw "Failed to find or create public channel"
|
throw new Error('Failed to find or create public channel');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const createTeamIfNotExists = async(teamname) => {
|
const createTeamIfNotExists = async(teamname) => {
|
||||||
console.log(`Creating private team ${teamname}`)
|
console.log(`Creating private team ${ teamname }`);
|
||||||
try {
|
try {
|
||||||
await rocketchat.post('teams.create', {
|
await rocketchat.post('teams.create', {
|
||||||
"name": teamname,
|
name: teamname,
|
||||||
"type": TEAM_TYPE.PRIVATE
|
type: TEAM_TYPE.PRIVATE
|
||||||
})
|
});
|
||||||
} catch (createError) {
|
} catch (createError) {
|
||||||
try { // Maybe it exists already?
|
try { // Maybe it exists already?
|
||||||
await rocketchat.get(`teams.info?teamName=${teamname}`)
|
await rocketchat.get(`teams.info?teamName=${ teamname }`);
|
||||||
} catch (infoError) {
|
} catch (infoError) {
|
||||||
console.log(JSON.stringify(createError))
|
console.log(JSON.stringify(createError));
|
||||||
console.log(JSON.stringify(infoError))
|
console.log(JSON.stringify(infoError));
|
||||||
throw "Failed to find or create private team"
|
throw new Error('Failed to find or create private team');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const createGroupIfNotExists = async(groupname) => {
|
const createGroupIfNotExists = async(groupname) => {
|
||||||
console.log(`Creating private group ${groupname}`)
|
console.log(`Creating private group ${ groupname }`);
|
||||||
try {
|
try {
|
||||||
await rocketchat.post('groups.create', {
|
await rocketchat.post('groups.create', {
|
||||||
"name": groupname
|
name: groupname
|
||||||
})
|
});
|
||||||
} catch (createError) {
|
} catch (createError) {
|
||||||
try { // Maybe it exists already?
|
try { // Maybe it exists already?
|
||||||
await rocketchat.get(`groups.info?roomName=${groupname}`)
|
await rocketchat.get(`groups.info?roomName=${ groupname }`);
|
||||||
} catch (infoError) {
|
} catch (infoError) {
|
||||||
console.log(JSON.stringify(createError))
|
console.log(JSON.stringify(createError));
|
||||||
console.log(JSON.stringify(infoError))
|
console.log(JSON.stringify(infoError));
|
||||||
throw "Failed to find or create private group"
|
throw new Error('Failed to find or create private group');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const changeChannelJoinCode = async(roomId, joinCode) => {
|
const changeChannelJoinCode = async(roomId, joinCode) => {
|
||||||
console.log(`Changing channel Join Code ${roomId}`)
|
console.log(`Changing channel Join Code ${ roomId }`);
|
||||||
try {
|
try {
|
||||||
await rocketchat.post('method.call/saveRoomSettings', {
|
await rocketchat.post('method.call/saveRoomSettings', {
|
||||||
message: JSON.stringify({
|
message: JSON.stringify({
|
||||||
|
|
@ -108,38 +108,38 @@ const changeChannelJoinCode = async (roomId, joinCode) => {
|
||||||
{ joinCode }
|
{ joinCode }
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
})
|
});
|
||||||
} catch (createError) {
|
} catch (createError) {
|
||||||
console.log(JSON.stringify(createError))
|
console.log(JSON.stringify(createError));
|
||||||
throw "Failed to create protected channel"
|
throw new Error('Failed to create protected channel');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const sendMessage = async(user, channel, msg) => {
|
const sendMessage = async(user, channel, msg) => {
|
||||||
console.log(`Sending message to ${channel}`)
|
console.log(`Sending message to ${ channel }`);
|
||||||
try {
|
try {
|
||||||
await login(user.username, user.password);
|
await login(user.username, user.password);
|
||||||
await rocketchat.post('chat.postMessage', { channel, msg });
|
await rocketchat.post('chat.postMessage', { channel, msg });
|
||||||
} catch (infoError) {
|
} catch (infoError) {
|
||||||
console.log(JSON.stringify(infoError))
|
console.log(JSON.stringify(infoError));
|
||||||
throw "Failed to find or create private group"
|
throw new Error('Failed to find or create private group');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const setup = async() => {
|
const setup = async() => {
|
||||||
await login(data.adminUser, data.adminPassword)
|
await login(data.adminUser, data.adminPassword);
|
||||||
|
|
||||||
for (var userKey in data.users) {
|
for (const userKey in data.users) {
|
||||||
if (data.users.hasOwnProperty(userKey)) {
|
if (Object.prototype.hasOwnProperty.call(data.users, userKey)) {
|
||||||
const user = data.users[userKey]
|
const user = data.users[userKey];
|
||||||
await createUser(user.username, user.password, user.username, user.email)
|
await createUser(user.username, user.password, user.username, user.email);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var channelKey in data.channels) {
|
for (const channelKey in data.channels) {
|
||||||
if (data.channels.hasOwnProperty(channelKey)) {
|
if (Object.prototype.hasOwnProperty.call(data.channels, channelKey)) {
|
||||||
const channel = data.channels[channelKey]
|
const channel = data.channels[channelKey];
|
||||||
const { data: { channel: { _id } } } = await createChannelIfNotExists(channel.name)
|
const { data: { channel: { _id } } } = await createChannelIfNotExists(channel.name);
|
||||||
|
|
||||||
if (channel.joinCode) {
|
if (channel.joinCode) {
|
||||||
await changeChannelJoinCode(_id, channel.joinCode);
|
await changeChannelJoinCode(_id, channel.joinCode);
|
||||||
|
|
@ -147,35 +147,33 @@ const setup = async () => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await login(data.users.regular.username, data.users.regular.password)
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
|
|
||||||
for (var groupKey in data.groups) {
|
for (const groupKey in data.groups) {
|
||||||
if (data.groups.hasOwnProperty(groupKey)) {
|
if (Object.prototype.hasOwnProperty.call(data.groups, groupKey)) {
|
||||||
const group = data.groups[groupKey]
|
const group = data.groups[groupKey];
|
||||||
await createGroupIfNotExists(group.name)
|
await createGroupIfNotExists(group.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var teamKey in data.teams) {
|
for (const teamKey in data.teams) {
|
||||||
if (data.teams.hasOwnProperty(teamKey)) {
|
if (Object.prototype.hasOwnProperty.call(data.teams, teamKey)) {
|
||||||
const team = data.teams[teamKey]
|
const team = data.teams[teamKey];
|
||||||
await createTeamIfNotExists(team.name)
|
await createTeamIfNotExists(team.name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
};
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const get = (endpoint) => {
|
const get = (endpoint) => {
|
||||||
console.log(`GET /${ endpoint }`)
|
console.log(`GET /${ endpoint }`);
|
||||||
return rocketchat.get(endpoint);
|
return rocketchat.get(endpoint);
|
||||||
}
|
};
|
||||||
|
|
||||||
const post = (endpoint, body) => {
|
const post = (endpoint, body) => {
|
||||||
console.log(`POST /${ endpoint } ${ JSON.stringify(body) }`)
|
console.log(`POST /${ endpoint } ${ JSON.stringify(body) }`);
|
||||||
return rocketchat.post(endpoint, body);
|
return rocketchat.post(endpoint, body);
|
||||||
}
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
setup, sendMessage, get, post, login
|
setup, sendMessage, get, post, login
|
||||||
}
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
const {
|
const {
|
||||||
expect, element, by, waitFor
|
navigateToLogin, login, sleep, tapBack, mockMessage, searchRoom, logout
|
||||||
} = require('detox');
|
} = require('../../helpers/app');
|
||||||
const { navigateToLogin, login, sleep, tapBack, mockMessage, searchRoom, logout } = require('../../helpers/app');
|
|
||||||
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
const testuser = data.users.regular
|
const testuser = data.users.regular;
|
||||||
const otheruser = data.users.alternate
|
const otheruser = data.users.alternate;
|
||||||
|
|
||||||
const checkServer = async(server) => {
|
const checkServer = async(server) => {
|
||||||
const label = `Connected to ${ server }`;
|
const label = `Connected to ${ server }`;
|
||||||
|
|
@ -14,11 +13,11 @@ const checkServer = async(server) => {
|
||||||
await waitFor(element(by.id('sidebar-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('sidebar-view'))).toBeVisible().withTimeout(2000);
|
||||||
await waitFor(element(by.label(label))).toBeVisible().withTimeout(60000);
|
await waitFor(element(by.label(label))).toBeVisible().withTimeout(60000);
|
||||||
await element(by.id('sidebar-close-drawer')).tap();
|
await element(by.id('sidebar-close-drawer')).tap();
|
||||||
}
|
};
|
||||||
|
|
||||||
const checkBanner = async() => {
|
const checkBanner = async() => {
|
||||||
await waitFor(element(by.id('listheader-encryption').withDescendant(by.label('Save Your Encryption Password')))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.id('listheader-encryption').withDescendant(by.label('Save Your Encryption Password')))).toBeVisible().withTimeout(10000);
|
||||||
}
|
};
|
||||||
|
|
||||||
async function navigateToRoom(roomName) {
|
async function navigateToRoom(roomName) {
|
||||||
await searchRoom(`${ roomName }`);
|
await searchRoom(`${ roomName }`);
|
||||||
|
|
@ -51,14 +50,14 @@ describe('E2E Encryption', () => {
|
||||||
await login(testuser.username, testuser.password);
|
await login(testuser.username, testuser.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Banner', async() => {
|
describe('Banner', () => {
|
||||||
describe('Render', async () => {
|
describe('Render', () => {
|
||||||
it('should have encryption badge', async() => {
|
it('should have encryption badge', async() => {
|
||||||
await checkBanner();
|
await checkBanner();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async () => {
|
describe('Usage', () => {
|
||||||
it('should tap encryption badge and open save password modal', async() => {
|
it('should tap encryption badge and open save password modal', async() => {
|
||||||
await element(by.id('listheader-encryption')).tap();
|
await element(by.id('listheader-encryption')).tap();
|
||||||
await waitFor(element(by.id('e2e-save-password-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('e2e-save-password-view'))).toBeVisible().withTimeout(2000);
|
||||||
|
|
@ -98,9 +97,9 @@ describe('E2E Encryption', () => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Security and Privacy', async() => {
|
describe('Security and Privacy', () => {
|
||||||
it('should navigate to security privacy', async() => {
|
it('should navigate to security privacy', async() => {
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
|
||||||
await element(by.id('rooms-list-view-sidebar')).tap();
|
await element(by.id('rooms-list-view-sidebar')).tap();
|
||||||
|
|
@ -120,7 +119,7 @@ describe('E2E Encryption', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('E2E Encryption Security', async() => {
|
describe('E2E Encryption Security', () => {
|
||||||
it('should navigate to e2e encryption security', async() => {
|
it('should navigate to e2e encryption security', async() => {
|
||||||
await element(by.id('security-privacy-view-e2e-encryption')).tap();
|
await element(by.id('security-privacy-view-e2e-encryption')).tap();
|
||||||
await waitFor(element(by.id('e2e-encryption-security-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('e2e-encryption-security-view'))).toBeVisible().withTimeout(2000);
|
||||||
|
|
@ -133,9 +132,9 @@ describe('E2E Encryption', () => {
|
||||||
await expect(element(by.id('e2e-encryption-security-view-change-password').and(by.label('Save Changes')))).toExist();
|
await expect(element(by.id('e2e-encryption-security-view-change-password').and(by.label('Save Changes')))).toExist();
|
||||||
await expect(element(by.id('e2e-encryption-security-view-reset-key').and(by.label('Reset E2E Key')))).toExist();
|
await expect(element(by.id('e2e-encryption-security-view-reset-key').and(by.label('Reset E2E Key')))).toExist();
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Change password', async() => {
|
describe('Change password', () => {
|
||||||
it('should change password', async() => {
|
it('should change password', async() => {
|
||||||
await element(by.id('e2e-encryption-security-view-password')).typeText(newPassword);
|
await element(by.id('e2e-encryption-security-view-password')).typeText(newPassword);
|
||||||
await element(by.id('e2e-encryption-security-view-change-password')).tap();
|
await element(by.id('e2e-encryption-security-view-change-password')).tap();
|
||||||
|
|
@ -184,7 +183,7 @@ describe('E2E Encryption', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Reset E2E key', async() => {
|
describe('Reset E2E key', () => {
|
||||||
it('should reset e2e key', async() => {
|
it('should reset e2e key', async() => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
|
||||||
|
|
@ -195,7 +194,7 @@ describe('E2E Encryption', () => {
|
||||||
await waitFor(element(by.text('Are you sure?'))).toExist().withTimeout(2000);
|
await waitFor(element(by.text('Are you sure?'))).toExist().withTimeout(2000);
|
||||||
await expect(element(by.text('You\'re going to be logged out.'))).toExist();
|
await expect(element(by.text('You\'re going to be logged out.'))).toExist();
|
||||||
await element(by.label('Yes, reset it').and(by.type('UILabel'))).tap();
|
await element(by.label('Yes, reset it').and(by.type('UILabel'))).tap();
|
||||||
await sleep(2000)
|
await sleep(2000);
|
||||||
await waitFor(element(by.id('workspace-view'))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.id('workspace-view'))).toBeVisible().withTimeout(10000);
|
||||||
await waitFor(element(by.text('You\'ve been logged out by the server. Please log in again.'))).toExist().withTimeout(2000);
|
await waitFor(element(by.text('You\'ve been logged out by the server. Please log in again.'))).toExist().withTimeout(2000);
|
||||||
await element(by.label('OK').and(by.type('_UIAlertControllerActionView'))).tap();
|
await element(by.label('OK').and(by.type('_UIAlertControllerActionView'))).tap();
|
||||||
|
|
@ -203,7 +202,7 @@ describe('E2E Encryption', () => {
|
||||||
await waitFor(element(by.id('login-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('login-view'))).toBeVisible().withTimeout(2000);
|
||||||
await login(testuser.username, testuser.password);
|
await login(testuser.username, testuser.password);
|
||||||
await waitFor(element(by.id('listheader-encryption').withDescendant(by.label('Save Your Encryption Password')))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('listheader-encryption').withDescendant(by.label('Save Your Encryption Password')))).toBeVisible().withTimeout(2000);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -211,7 +210,7 @@ describe('E2E Encryption', () => {
|
||||||
it('check save banner', async() => {
|
it('check save banner', async() => {
|
||||||
await checkServer(data.server);
|
await checkServer(data.server);
|
||||||
await checkBanner();
|
await checkBanner();
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should add server and create new user', async() => {
|
it('should add server and create new user', async() => {
|
||||||
await sleep(5000);
|
await sleep(5000);
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
|
// const OTP = require('otp.js');
|
||||||
|
// const GA = OTP.googleAuthenticator;
|
||||||
|
|
||||||
const {
|
const {
|
||||||
device, expect, element, by, waitFor
|
navigateToLogin, login, mockMessage, tapBack, searchRoom
|
||||||
} = require('detox');
|
} = require('../../helpers/app');
|
||||||
const OTP = require('otp.js');
|
|
||||||
const GA = OTP.googleAuthenticator;
|
|
||||||
const { navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom } = require('../../helpers/app');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
const testuser = data.users.regular
|
const testuser = data.users.regular;
|
||||||
const otheruser = data.users.alternate
|
const otheruser = data.users.alternate;
|
||||||
|
|
||||||
describe('Broadcast room', () => {
|
describe('Broadcast room', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToLogin, login, sleep } = require('../../helpers/app');
|
const { navigateToLogin, login, sleep } = require('../../helpers/app');
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
const profileChangeUser = data.users.profileChanges
|
const profileChangeUser = data.users.profileChanges;
|
||||||
|
|
||||||
const scrollDown = 200;
|
const scrollDown = 200;
|
||||||
|
|
||||||
|
|
@ -28,7 +25,7 @@ describe('Profile screen', () => {
|
||||||
await waitFor(element(by.id('profile-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('profile-view'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have profile view', async() => {
|
it('should have profile view', async() => {
|
||||||
await expect(element(by.id('profile-view'))).toBeVisible();
|
await expect(element(by.id('profile-view'))).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
@ -74,7 +71,7 @@ describe('Profile screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should change name and username', async() => {
|
it('should change name and username', async() => {
|
||||||
await element(by.id('profile-view-name')).replaceText(`${ profileChangeUser.username }new`);
|
await element(by.id('profile-view-name')).replaceText(`${ profileChangeUser.username }new`);
|
||||||
await element(by.id('profile-view-username')).typeText(`${ profileChangeUser.username }new`);
|
await element(by.id('profile-view-username')).typeText(`${ profileChangeUser.username }new`);
|
||||||
|
|
@ -87,7 +84,7 @@ describe('Profile screen', () => {
|
||||||
await element(by.id('profile-view-email')).replaceText(`mobile+profileChangesNew${ data.random }@rocket.chat`);
|
await element(by.id('profile-view-email')).replaceText(`mobile+profileChangesNew${ data.random }@rocket.chat`);
|
||||||
await element(by.id('profile-view-new-password')).replaceText(`${ profileChangeUser.password }new`);
|
await element(by.id('profile-view-new-password')).replaceText(`${ profileChangeUser.password }new`);
|
||||||
await element(by.id('profile-view-submit')).tap();
|
await element(by.id('profile-view-submit')).tap();
|
||||||
await element(by.type('_UIAlertControllerTextField')).typeText(`${ profileChangeUser.password }\n`)
|
await element(by.type('_UIAlertControllerTextField')).typeText(`${ profileChangeUser.password }\n`);
|
||||||
await waitForToast();
|
await waitForToast();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,8 @@
|
||||||
const {
|
const { navigateToLogin, login } = require('../../helpers/app');
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToLogin, login, tapBack } = require('../../helpers/app');
|
|
||||||
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
const testuser = data.users.regular
|
const testuser = data.users.regular;
|
||||||
|
|
||||||
describe('Settings screen', () => {
|
describe('Settings screen', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
|
|
@ -20,7 +17,7 @@ describe('Settings screen', () => {
|
||||||
await waitFor(element(by.id('settings-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('settings-view'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have settings view', async() => {
|
it('should have settings view', async() => {
|
||||||
await expect(element(by.id('settings-view'))).toBeVisible();
|
await expect(element(by.id('settings-view'))).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
@ -62,7 +59,7 @@ describe('Settings screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should tap clear cache and navigate to roomslistview', async() => {
|
it('should tap clear cache and navigate to roomslistview', async() => {
|
||||||
await waitFor(element(by.id('settings-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('settings-view'))).toBeVisible().withTimeout(2000);
|
||||||
await element(by.id('settings-view-clear-cache')).tap();
|
await element(by.id('settings-view-clear-cache')).tap();
|
||||||
|
|
@ -70,6 +67,6 @@ describe('Settings screen', () => {
|
||||||
await element(by.label('Clear').and(by.type('_UIAlertControllerActionView'))).tap();
|
await element(by.label('Clear').and(by.type('_UIAlertControllerActionView'))).tap();
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(5000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(5000);
|
||||||
await waitFor(element(by.id(`rooms-list-view-item-${ data.groups.private.name }`))).toExist().withTimeout(10000);
|
await waitFor(element(by.id(`rooms-list-view-item-${ data.groups.private.name }`))).toExist().withTimeout(10000);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, mockMessage, tapBack, searchRoom
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
const testuser = data.users.regular
|
const testuser = data.users.regular;
|
||||||
const room = data.channels.detoxpublic.name;
|
const room = data.channels.detoxpublic.name;
|
||||||
|
|
||||||
async function navigateToRoom() {
|
async function navigateToRoom() {
|
||||||
|
|
@ -26,7 +25,7 @@ describe('Join public room', () => {
|
||||||
await navigateToRoom();
|
await navigateToRoom();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have room screen', async() => {
|
it('should have room screen', async() => {
|
||||||
await expect(element(by.id('room-view'))).toBeVisible();
|
await expect(element(by.id('room-view'))).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
@ -36,14 +35,14 @@ describe('Join public room', () => {
|
||||||
// });
|
// });
|
||||||
|
|
||||||
// Render - Header
|
// Render - Header
|
||||||
describe('Header', async() => {
|
describe('Header', () => {
|
||||||
it('should have actions button ', async() => {
|
it('should have actions button ', async() => {
|
||||||
await expect(element(by.id('room-header'))).toBeVisible();
|
await expect(element(by.id('room-header'))).toBeVisible();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Render - Join
|
// Render - Join
|
||||||
describe('Join', async() => {
|
describe('Join', () => {
|
||||||
it('should have join', async() => {
|
it('should have join', async() => {
|
||||||
await expect(element(by.id('room-view-join'))).toBeVisible();
|
await expect(element(by.id('room-view-join'))).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
@ -61,7 +60,7 @@ describe('Join public room', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Room Actions', async() => {
|
describe('Room Actions', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await navigateToRoomActions();
|
await navigateToRoomActions();
|
||||||
});
|
});
|
||||||
|
|
@ -117,11 +116,11 @@ describe('Join public room', () => {
|
||||||
after(async() => {
|
after(async() => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(2000);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should join room', async() => {
|
it('should join room', async() => {
|
||||||
await element(by.id('room-view-join-button')).tap();
|
await element(by.id('room-view-join-button')).tap();
|
||||||
await tapBack();
|
await tapBack();
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
const {
|
|
||||||
expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToLogin, login, sleep } = require('../../helpers/app');
|
const { navigateToLogin, login, sleep } = require('../../helpers/app');
|
||||||
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const testuser = data.users.regular
|
|
||||||
|
const testuser = data.users.regular;
|
||||||
|
|
||||||
async function waitForToast() {
|
async function waitForToast() {
|
||||||
await sleep(300);
|
await sleep(300);
|
||||||
|
|
@ -24,7 +22,7 @@ describe('Status screen', () => {
|
||||||
await waitFor(element(by.id('status-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('status-view'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async () => {
|
describe('Render', () => {
|
||||||
it('should have status input', async() => {
|
it('should have status input', async() => {
|
||||||
await expect(element(by.id('status-view-input'))).toBeVisible();
|
await expect(element(by.id('status-view-input'))).toBeVisible();
|
||||||
await expect(element(by.id('status-view-online'))).toExist();
|
await expect(element(by.id('status-view-online'))).toExist();
|
||||||
|
|
@ -34,7 +32,7 @@ describe('Status screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async () => {
|
describe('Usage', () => {
|
||||||
it('should change status', async() => {
|
it('should change status', async() => {
|
||||||
await element(by.id('status-view-busy')).tap();
|
await element(by.id('status-view-busy')).tap();
|
||||||
await waitFor(element(by.id('status-view-current-busy'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('status-view-current-busy'))).toExist().withTimeout(2000);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, checkServer } = require('../../helpers/app');
|
const { navigateToLogin, login, checkServer } = require('../../helpers/app');
|
||||||
|
|
||||||
|
|
@ -8,7 +5,7 @@ const reopenAndCheckServer = async(server) => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' } });
|
await device.launchApp({ permissions: { notifications: 'YES' } });
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(6000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(6000);
|
||||||
await checkServer(server);
|
await checkServer(server);
|
||||||
}
|
};
|
||||||
|
|
||||||
describe('Change server', () => {
|
describe('Change server', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
|
|
@ -64,5 +61,5 @@ describe('Change server', () => {
|
||||||
|
|
||||||
it('should reopen the app and show main server', async() => {
|
it('should reopen the app and show main server', async() => {
|
||||||
await reopenAndCheckServer(data.server);
|
await reopenAndCheckServer(data.server);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, mockMessage, searchRoom
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
const testuser = data.users.regular
|
const testuser = data.users.regular;
|
||||||
const room = data.channels.detoxpublicprotected.name
|
const room = data.channels.detoxpublicprotected.name;
|
||||||
const joinCode = data.channels.detoxpublicprotected.joinCode
|
const { joinCode } = data.channels.detoxpublicprotected;
|
||||||
|
|
||||||
async function navigateToRoom() {
|
async function navigateToRoom() {
|
||||||
await searchRoom(room);
|
await searchRoom(room);
|
||||||
|
|
@ -27,10 +26,10 @@ describe('Join protected room', () => {
|
||||||
await navigateToRoom();
|
await navigateToRoom();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should tap join and ask for join code', async() => {
|
it('should tap join and ask for join code', async() => {
|
||||||
await openJoinCode();
|
await openJoinCode();
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should cancel join room', async() => {
|
it('should cancel join room', async() => {
|
||||||
await element(by.id('join-code-cancel')).tap();
|
await element(by.id('join-code-cancel')).tap();
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, tapBack, sleep } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, tapBack, sleep
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
const testuser = data.users.regular
|
const testuser = data.users.regular;
|
||||||
|
|
||||||
async function navigateToRoom(search) {
|
async function navigateToRoom(search) {
|
||||||
await element(by.id('directory-view-search')).replaceText(search);
|
await element(by.id('directory-view-search')).replaceText(search);
|
||||||
|
|
@ -22,15 +21,15 @@ describe('Join room from directory', () => {
|
||||||
await login(testuser.username, testuser.password);
|
await login(testuser.username, testuser.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should tap directory', async() => {
|
it('should tap directory', async() => {
|
||||||
await element(by.id('rooms-list-view-directory')).tap();
|
await element(by.id('rooms-list-view-directory')).tap();
|
||||||
await waitFor(element(by.id('directory-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('directory-view'))).toExist().withTimeout(2000);
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should search public channel and navigate', async() => {
|
it('should search public channel and navigate', async() => {
|
||||||
await navigateToRoom(data.channels.detoxpublic.name);
|
await navigateToRoom(data.channels.detoxpublic.name);
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should search user and navigate', async() => {
|
it('should search user and navigate', async() => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
|
|
@ -40,7 +39,7 @@ describe('Join room from directory', () => {
|
||||||
await element(by.label('Users')).tap();
|
await element(by.label('Users')).tap();
|
||||||
await element(by.label('Search by')).tap();
|
await element(by.label('Search by')).tap();
|
||||||
await navigateToRoom(data.users.alternate.username);
|
await navigateToRoom(data.users.alternate.username);
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should search user and navigate', async() => {
|
it('should search user and navigate', async() => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
|
|
@ -50,6 +49,6 @@ describe('Join room from directory', () => {
|
||||||
await element(by.label('Teams')).tap();
|
await element(by.label('Teams')).tap();
|
||||||
await element(by.label('Search by')).tap();
|
await element(by.label('Search by')).tap();
|
||||||
await navigateToRoom(data.teams.private.name);
|
await navigateToRoom(data.teams.private.name);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { sleep, navigateToLogin, login, checkServer } = require('../../helpers/app');
|
const {
|
||||||
|
sleep, navigateToLogin, login, checkServer
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
describe('Delete server', () => {
|
describe('Delete server', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
|
|
@ -13,7 +12,7 @@ describe('Delete server', () => {
|
||||||
|
|
||||||
it('should be logged in main server', async() => {
|
it('should be logged in main server', async() => {
|
||||||
await checkServer(data.server);
|
await checkServer(data.server);
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should add server', async() => {
|
it('should add server', async() => {
|
||||||
await sleep(5000);
|
await sleep(5000);
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
const {
|
|
||||||
device, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { tapBack, checkServer, navigateToRegister } = require('../../helpers/app');
|
const { tapBack, checkServer, navigateToRegister } = require('../../helpers/app');
|
||||||
const { post, get, login } = require('../../helpers/data_setup');
|
const { get, login } = require('../../helpers/data_setup');
|
||||||
|
|
||||||
const DEEPLINK_METHODS = { AUTH: 'auth', ROOM: 'room' };
|
const DEEPLINK_METHODS = { AUTH: 'auth', ROOM: 'room' };
|
||||||
const getDeepLink = (method, server, params) => {
|
const getDeepLink = (method, server, params) => {
|
||||||
|
|
@ -43,7 +40,7 @@ describe('Deep linking', () => {
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(10000);
|
||||||
await checkServer(data.server);
|
await checkServer(data.server);
|
||||||
await waitFor(element(by.id(`rooms-list-view-item-${ data.groups.private.name }`))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id(`rooms-list-view-item-${ data.groups.private.name }`))).toBeVisible().withTimeout(2000);
|
||||||
}
|
};
|
||||||
|
|
||||||
it('should authenticate and navigate', async() => {
|
it('should authenticate and navigate', async() => {
|
||||||
await authAndNavigate();
|
await authAndNavigate();
|
||||||
|
|
@ -63,7 +60,7 @@ describe('Deep linking', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Room', () => {
|
describe('Room', () => {
|
||||||
describe('While logged in', async() => {
|
describe('While logged in', () => {
|
||||||
it('should navigate to the room using path', async() => {
|
it('should navigate to the room using path', async() => {
|
||||||
await device.launchApp({
|
await device.launchApp({
|
||||||
permissions: { notifications: 'YES' },
|
permissions: { notifications: 'YES' },
|
||||||
|
|
@ -75,7 +72,7 @@ describe('Deep linking', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should navigate to the room using rid', async() => {
|
it('should navigate to the room using rid', async() => {
|
||||||
const roomResult = await get(`groups.info?roomName=${ data.groups.private.name }`)
|
const roomResult = await get(`groups.info?roomName=${ data.groups.private.name }`);
|
||||||
await device.launchApp({
|
await device.launchApp({
|
||||||
permissions: { notifications: 'YES' },
|
permissions: { notifications: 'YES' },
|
||||||
newInstance: true,
|
newInstance: true,
|
||||||
|
|
@ -87,7 +84,7 @@ describe('Deep linking', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Others', async() => {
|
describe('Others', () => {
|
||||||
it('should change server', async() => {
|
it('should change server', async() => {
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(2000);
|
||||||
await element(by.id('rooms-list-header-server-dropdown-button')).tap();
|
await element(by.id('rooms-list-header-server-dropdown-button')).tap();
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,9 @@
|
||||||
const {
|
|
||||||
device, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToLogin, login, sleep } = require('../../helpers/app');
|
const { navigateToLogin, login, sleep } = require('../../helpers/app');
|
||||||
const { post } = require('../../helpers/data_setup');
|
const { post } = require('../../helpers/data_setup');
|
||||||
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const testuser = data.users.regular
|
|
||||||
|
const testuser = data.users.regular;
|
||||||
const defaultLaunchArgs = { permissions: { notifications: 'YES' } };
|
const defaultLaunchArgs = { permissions: { notifications: 'YES' } };
|
||||||
|
|
||||||
const navToLanguage = async() => {
|
const navToLanguage = async() => {
|
||||||
|
|
@ -25,8 +23,8 @@ describe('i18n', () => {
|
||||||
await device.launchApp({
|
await device.launchApp({
|
||||||
...defaultLaunchArgs,
|
...defaultLaunchArgs,
|
||||||
languageAndLocale: {
|
languageAndLocale: {
|
||||||
language: "en",
|
language: 'en',
|
||||||
locale: "en"
|
locale: 'en'
|
||||||
},
|
},
|
||||||
delete: true
|
delete: true
|
||||||
});
|
});
|
||||||
|
|
@ -39,8 +37,8 @@ describe('i18n', () => {
|
||||||
await device.launchApp({
|
await device.launchApp({
|
||||||
...defaultLaunchArgs,
|
...defaultLaunchArgs,
|
||||||
languageAndLocale: {
|
languageAndLocale: {
|
||||||
language: "es-MX",
|
language: 'es-MX',
|
||||||
locale: "es-MX"
|
locale: 'es-MX'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
await waitFor(element(by.id('onboarding-view'))).toBeVisible().withTimeout(20000);
|
await waitFor(element(by.id('onboarding-view'))).toBeVisible().withTimeout(20000);
|
||||||
|
|
@ -110,5 +108,5 @@ describe('i18n', () => {
|
||||||
await expect(element(by.id('sidebar-settings').withDescendant(by.label('Settings')))).toBeVisible();
|
await expect(element(by.id('sidebar-settings').withDescendant(by.label('Settings')))).toBeVisible();
|
||||||
await post('users.setPreferences', { data: { language: 'en' } }); // Set back to english
|
await post('users.setPreferences', { data: { language: 'en' } }); // Set back to english
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
const detox = require('detox');
|
const detox = require('detox');
|
||||||
const config = require('../../package.json').detox;
|
|
||||||
const { setup } = require('../helpers/data_setup')
|
|
||||||
const adapter = require('detox/runners/mocha/adapter');
|
const adapter = require('detox/runners/mocha/adapter');
|
||||||
|
const config = require('../../package.json').detox;
|
||||||
|
const { setup } = require('../helpers/data_setup');
|
||||||
|
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await Promise.all([setup(), detox.init(config, { launchApp: false })])
|
await Promise.all([setup(), detox.init(config, { launchApp: false })]);
|
||||||
// await dataSetup()
|
// await dataSetup()
|
||||||
// await detox.init(config, { launchApp: false });
|
// await detox.init(config, { launchApp: false });
|
||||||
// await device.launchApp({ permissions: { notifications: 'YES' } });
|
// await device.launchApp({ permissions: { notifications: 'YES' } });
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
describe('Onboarding', () => {
|
describe('Onboarding', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToRegister, navigateToLogin } = require('../../helpers/app');
|
const { navigateToRegister, navigateToLogin } = require('../../helpers/app');
|
||||||
|
|
||||||
describe('Legal screen', () => {
|
describe('Legal screen', () => {
|
||||||
|
|
||||||
describe('From Login', () => {
|
describe('From Login', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
||||||
|
|
@ -18,7 +14,7 @@ describe('Legal screen', () => {
|
||||||
it('should navigate to legal from login', async() => {
|
it('should navigate to legal from login', async() => {
|
||||||
await expect(element(by.id('login-view-more'))).toBeVisible();
|
await expect(element(by.id('login-view-more'))).toBeVisible();
|
||||||
await element(by.id('login-view-more')).tap();
|
await element(by.id('login-view-more')).tap();
|
||||||
await waitFor(element(by.id('legal-view'))).toBeVisible().withTimeout(4000)
|
await waitFor(element(by.id('legal-view'))).toBeVisible().withTimeout(4000);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin } = require('../../helpers/app');
|
const { navigateToLogin } = require('../../helpers/app');
|
||||||
|
|
||||||
|
|
@ -12,7 +9,7 @@ describe('Forgot password screen', () => {
|
||||||
await waitFor(element(by.id('forgot-password-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('forgot-password-view'))).toExist().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have forgot password screen', async() => {
|
it('should have forgot password screen', async() => {
|
||||||
await expect(element(by.id('forgot-password-view'))).toExist();
|
await expect(element(by.id('forgot-password-view'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -26,7 +23,7 @@ describe('Forgot password screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should reset password and navigate to login', async() => {
|
it('should reset password and navigate to login', async() => {
|
||||||
await element(by.id('forgot-password-view-email')).replaceText(data.users.existing.email);
|
await element(by.id('forgot-password-view-email')).replaceText(data.users.existing.email);
|
||||||
await element(by.id('forgot-password-view-submit')).tap();
|
await element(by.id('forgot-password-view-submit')).tap();
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
const {
|
const { navigateToRegister } = require('../../helpers/app');
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToRegister, sleep } = require('../../helpers/app');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
describe('Create user screen', () => {
|
describe('Create user screen', () => {
|
||||||
|
|
@ -37,7 +34,6 @@ describe('Create user screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', () => {
|
describe('Usage', () => {
|
||||||
|
|
||||||
// FIXME: Detox isn't able to check if it's tappable: https://github.com/wix/Detox/issues/246
|
// FIXME: Detox isn't able to check if it's tappable: https://github.com/wix/Detox/issues/246
|
||||||
// it('should submit invalid email and do nothing', async() => {
|
// it('should submit invalid email and do nothing', async() => {
|
||||||
// const invalidEmail = 'invalidemail';
|
// const invalidEmail = 'invalidemail';
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
const {
|
const { navigateToLogin, tapBack } = require('../../helpers/app');
|
||||||
expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const { navigateToLogin, tapBack, sleep } = require('../../helpers/app');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
describe('Login screen', () => {
|
describe('Login screen', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
||||||
const {
|
const {
|
||||||
device, expect, element, by, waitFor
|
login, navigateToLogin, logout, tapBack, searchRoom
|
||||||
} = require('detox');
|
} = require('../../helpers/app');
|
||||||
const { login, navigateToLogin, logout, tapBack, sleep, searchRoom } = require('../../helpers/app');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
describe('Rooms list screen', () => {
|
describe('Rooms list screen', () => {
|
||||||
|
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true, delete: true });
|
||||||
await navigateToLogin();
|
await navigateToLogin();
|
||||||
await login(data.users.regular.username, data.users.regular.password)
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', () => {
|
describe('Render', () => {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
const {
|
const {
|
||||||
device, expect, element, by, waitFor
|
login, navigateToLogin, logout, tapBack
|
||||||
} = require('detox');
|
} = require('../../helpers/app');
|
||||||
const { login, navigateToLogin, logout, tapBack } = require('../../helpers/app');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
describe('Server history', () => {
|
describe('Server history', () => {
|
||||||
|
|
@ -16,7 +15,7 @@ describe('Server history', () => {
|
||||||
await logout();
|
await logout();
|
||||||
await element(by.id('join-workspace')).tap();
|
await element(by.id('join-workspace')).tap();
|
||||||
await waitFor(element(by.id('new-server-view'))).toBeVisible().withTimeout(60000);
|
await waitFor(element(by.id('new-server-view'))).toBeVisible().withTimeout(60000);
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should show servers history', async() => {
|
it('should show servers history', async() => {
|
||||||
await element(by.id('new-server-view-input')).tap();
|
await element(by.id('new-server-view-input')).tap();
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { tapBack, sleep, navigateToLogin, login, tryTapping } = require('../../helpers/app');
|
const {
|
||||||
|
tapBack, navigateToLogin, login, tryTapping
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
describe('Create room screen', () => {
|
describe('Create room screen', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
|
|
@ -13,12 +10,12 @@ describe('Create room screen', () => {
|
||||||
await login(data.users.regular.username, data.users.regular.password);
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('New Message', async() => {
|
describe('New Message', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await element(by.id('rooms-list-view-create-channel')).tap();
|
await element(by.id('rooms-list-view-create-channel')).tap();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have new message screen', async() => {
|
it('should have new message screen', async() => {
|
||||||
await waitFor(element(by.id('new-message-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('new-message-view'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
@ -26,9 +23,9 @@ describe('Create room screen', () => {
|
||||||
it('should have search input', async() => {
|
it('should have search input', async() => {
|
||||||
await waitFor(element(by.id('new-message-view-search'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('new-message-view-search'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should back to rooms list', async() => {
|
it('should back to rooms list', async() => {
|
||||||
await waitFor(element(by.id('new-message-view-close'))).toBeVisible().withTimeout(5000);
|
await waitFor(element(by.id('new-message-view-close'))).toBeVisible().withTimeout(5000);
|
||||||
await element(by.id('new-message-view-close')).tap();
|
await element(by.id('new-message-view-close')).tap();
|
||||||
|
|
@ -56,13 +53,13 @@ describe('Create room screen', () => {
|
||||||
await element(by.id('new-message-view-create-channel')).tap();
|
await element(by.id('new-message-view-create-channel')).tap();
|
||||||
await waitFor(element(by.id('select-users-view'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('select-users-view'))).toExist().withTimeout(5000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Select Users', async() => {
|
describe('Select Users', () => {
|
||||||
it('should search users', async() => {
|
it('should search users', async() => {
|
||||||
await element(by.id('select-users-view-search')).replaceText('rocket.cat');
|
await element(by.id('select-users-view-search')).replaceText('rocket.cat');
|
||||||
await waitFor(element(by.id(`select-users-view-item-rocket.cat`))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.id('select-users-view-item-rocket.cat'))).toBeVisible().withTimeout(10000);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should select/unselect user', async() => {
|
it('should select/unselect user', async() => {
|
||||||
|
|
@ -80,24 +77,24 @@ describe('Create room screen', () => {
|
||||||
await element(by.id('selected-users-view-submit')).tap();
|
await element(by.id('selected-users-view-submit')).tap();
|
||||||
await waitFor(element(by.id('create-channel-view'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('create-channel-view'))).toExist().withTimeout(10000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Create Channel', async() => {
|
describe('Create Channel', () => {
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should render all fields', async() => {
|
it('should render all fields', async() => {
|
||||||
await expect(element(by.id('create-channel-name'))).toBeVisible();
|
await expect(element(by.id('create-channel-name'))).toBeVisible();
|
||||||
await expect(element(by.id('create-channel-type'))).toBeVisible();
|
await expect(element(by.id('create-channel-type'))).toBeVisible();
|
||||||
await expect(element(by.id('create-channel-readonly'))).toBeVisible();
|
await expect(element(by.id('create-channel-readonly'))).toBeVisible();
|
||||||
await expect(element(by.id('create-channel-broadcast'))).toBeVisible();
|
await expect(element(by.id('create-channel-broadcast'))).toBeVisible();
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should get invalid room', async() => {
|
it('should get invalid room', async() => {
|
||||||
await element(by.id('create-channel-name')).typeText('general');
|
await element(by.id('create-channel-name')).typeText('general');
|
||||||
await element(by.id('create-channel-submit')).tap();
|
await element(by.id('create-channel-submit')).tap();
|
||||||
await waitFor(element(by.text(`A channel with name general exists`))).toExist().withTimeout(60000);
|
await waitFor(element(by.text('A channel with name general exists'))).toExist().withTimeout(60000);
|
||||||
await expect(element(by.text(`A channel with name general exists`))).toExist();
|
await expect(element(by.text('A channel with name general exists'))).toExist();
|
||||||
await element(by.text('OK')).tap();
|
await element(by.text('OK')).tap();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -161,6 +158,6 @@ describe('Create room screen', () => {
|
||||||
await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toExist().withTimeout(60000);
|
await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toExist().withTimeout(60000);
|
||||||
await expect(element(by.id(`rooms-list-view-item-${ room }`))).toExist();
|
await expect(element(by.id(`rooms-list-view-item-${ room }`))).toExist();
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom, starMessage, pinMessage, dismissReviewNag, tryTapping, logout } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom, starMessage, pinMessage, dismissReviewNag, tryTapping
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
async function navigateToRoom(roomName) {
|
async function navigateToRoom(roomName) {
|
||||||
await searchRoom(`${ roomName }`);
|
await searchRoom(`${ roomName }`);
|
||||||
|
|
@ -20,14 +19,14 @@ describe('Room screen', () => {
|
||||||
await navigateToRoom(mainRoom);
|
await navigateToRoom(mainRoom);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have room screen', async() => {
|
it('should have room screen', async() => {
|
||||||
await expect(element(by.id('room-view'))).toExist();
|
await expect(element(by.id('room-view'))).toExist();
|
||||||
await waitFor(element(by.id(`room-view-title-${ mainRoom }`))).toExist().withTimeout(5000);
|
await waitFor(element(by.id(`room-view-title-${ mainRoom }`))).toExist().withTimeout(5000);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Render - Header
|
// Render - Header
|
||||||
describe('Header', async() => {
|
describe('Header', () => {
|
||||||
it('should have actions button ', async() => {
|
it('should have actions button ', async() => {
|
||||||
await expect(element(by.id('room-header'))).toExist();
|
await expect(element(by.id('room-header'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -38,7 +37,7 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Render - Messagebox
|
// Render - Messagebox
|
||||||
describe('Messagebox', async() => {
|
describe('Messagebox', () => {
|
||||||
it('should have messagebox', async() => {
|
it('should have messagebox', async() => {
|
||||||
await expect(element(by.id('messagebox'))).toExist();
|
await expect(element(by.id('messagebox'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -63,10 +62,10 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
describe('Messagebox', async() => {
|
describe('Messagebox', () => {
|
||||||
it('should send message', async() => {
|
it('should send message', async() => {
|
||||||
await mockMessage('message')
|
await mockMessage('message');
|
||||||
await expect(element(by.label(`${ data.random }message`)).atIndex(0)).toExist();
|
await expect(element(by.label(`${ data.random }message`)).atIndex(0)).toExist();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -111,14 +110,14 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show and tap on user autocomplete and send mention', async() => {
|
it('should show and tap on user autocomplete and send mention', async() => {
|
||||||
const username = data.users.regular.username
|
const { username } = data.users.regular;
|
||||||
await element(by.id('messagebox-input')).tap();
|
await element(by.id('messagebox-input')).tap();
|
||||||
await element(by.id('messagebox-input')).typeText(`@${ username }`);
|
await element(by.id('messagebox-input')).typeText(`@${ username }`);
|
||||||
await waitFor(element(by.id('messagebox-container'))).toExist().withTimeout(4000);
|
await waitFor(element(by.id('messagebox-container'))).toExist().withTimeout(4000);
|
||||||
await waitFor(element(by.id(`mention-item-${ username }`))).toBeVisible().withTimeout(4000)
|
await waitFor(element(by.id(`mention-item-${ username }`))).toBeVisible().withTimeout(4000);
|
||||||
await tryTapping(element(by.id(`mention-item-${ username }`)), 2000, true);
|
await tryTapping(element(by.id(`mention-item-${ username }`)), 2000, true);
|
||||||
await expect(element(by.id('messagebox-input'))).toHaveText(`@${ username } `);
|
await expect(element(by.id('messagebox-input'))).toHaveText(`@${ username } `);
|
||||||
await tryTapping(element(by.id('messagebox-input')), 2000)
|
await tryTapping(element(by.id('messagebox-input')), 2000);
|
||||||
await element(by.id('messagebox-input')).typeText(`${ data.random }mention`);
|
await element(by.id('messagebox-input')).typeText(`${ data.random }mention`);
|
||||||
await element(by.id('messagebox-send-message')).tap();
|
await element(by.id('messagebox-send-message')).tap();
|
||||||
// await waitFor(element(by.label(`@${ data.user } ${ data.random }mention`)).atIndex(0)).toExist().withTimeout(60000);
|
// await waitFor(element(by.label(`@${ data.user } ${ data.random }mention`)).atIndex(0)).toExist().withTimeout(60000);
|
||||||
|
|
@ -126,7 +125,7 @@ describe('Room screen', () => {
|
||||||
|
|
||||||
it('should not show user autocomplete on @ in the middle of a string', async() => {
|
it('should not show user autocomplete on @ in the middle of a string', async() => {
|
||||||
await element(by.id('messagebox-input')).tap();
|
await element(by.id('messagebox-input')).tap();
|
||||||
await element(by.id('messagebox-input')).typeText(`email@gmail`);
|
await element(by.id('messagebox-input')).typeText('email@gmail');
|
||||||
await waitFor(element(by.id('messagebox-container'))).toNotExist().withTimeout(4000);
|
await waitFor(element(by.id('messagebox-container'))).toNotExist().withTimeout(4000);
|
||||||
await element(by.id('messagebox-input')).clearText();
|
await element(by.id('messagebox-input')).clearText();
|
||||||
});
|
});
|
||||||
|
|
@ -136,7 +135,7 @@ describe('Room screen', () => {
|
||||||
await element(by.id('messagebox-input')).typeText('#general');
|
await element(by.id('messagebox-input')).typeText('#general');
|
||||||
// await waitFor(element(by.id('messagebox-container'))).toExist().withTimeout(4000);
|
// await waitFor(element(by.id('messagebox-container'))).toExist().withTimeout(4000);
|
||||||
await waitFor(element(by.id('mention-item-general'))).toBeVisible().withTimeout(4000);
|
await waitFor(element(by.id('mention-item-general'))).toBeVisible().withTimeout(4000);
|
||||||
await tryTapping(element(by.id('mention-item-general')), 2000, true)
|
await tryTapping(element(by.id('mention-item-general')), 2000, true);
|
||||||
await expect(element(by.id('messagebox-input'))).toHaveText('#general ');
|
await expect(element(by.id('messagebox-input'))).toHaveText('#general ');
|
||||||
await element(by.id('messagebox-input')).clearText();
|
await element(by.id('messagebox-input')).clearText();
|
||||||
});
|
});
|
||||||
|
|
@ -162,7 +161,7 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Message', async() => {
|
describe('Message', () => {
|
||||||
it('should copy permalink', async() => {
|
it('should copy permalink', async() => {
|
||||||
await element(by.label(`${ data.random }message`)).atIndex(0).longPress();
|
await element(by.label(`${ data.random }message`)).atIndex(0).longPress();
|
||||||
await expect(element(by.id('action-sheet'))).toExist();
|
await expect(element(by.id('action-sheet'))).toExist();
|
||||||
|
|
@ -184,9 +183,9 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should star message', async() => {
|
it('should star message', async() => {
|
||||||
await starMessage('message')
|
await starMessage('message');
|
||||||
|
|
||||||
await sleep(1000) //https://github.com/RocketChat/Rocket.Chat.ReactNative/issues/2324
|
await sleep(1000); // https://github.com/RocketChat/Rocket.Chat.ReactNative/issues/2324
|
||||||
await element(by.label(`${ data.random }message`)).atIndex(0).longPress();
|
await element(by.label(`${ data.random }message`)).atIndex(0).longPress();
|
||||||
await expect(element(by.id('action-sheet'))).toExist();
|
await expect(element(by.id('action-sheet'))).toExist();
|
||||||
await expect(element(by.id('action-sheet-handle'))).toBeVisible();
|
await expect(element(by.id('action-sheet-handle'))).toBeVisible();
|
||||||
|
|
@ -229,8 +228,8 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should ask for review', async() => {
|
it('should ask for review', async() => {
|
||||||
await dismissReviewNag() //TODO: Create a proper test for this elsewhere.
|
await dismissReviewNag(); // TODO: Create a proper test for this elsewhere.
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should remove reaction', async() => {
|
it('should remove reaction', async() => {
|
||||||
await element(by.id('message-reaction-:grinning:')).tap();
|
await element(by.id('message-reaction-:grinning:')).tap();
|
||||||
|
|
@ -263,8 +262,8 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should pin message', async() => {
|
it('should pin message', async() => {
|
||||||
await mockMessage('pin')
|
await mockMessage('pin');
|
||||||
await pinMessage('pin')
|
await pinMessage('pin');
|
||||||
|
|
||||||
await waitFor(element(by.label(`${ data.random }pin`)).atIndex(0)).toExist().withTimeout(5000);
|
await waitFor(element(by.label(`${ data.random }pin`)).atIndex(0)).toExist().withTimeout(5000);
|
||||||
await waitFor(element(by.label(`${ data.users.regular.username } Message pinned`)).atIndex(0)).toExist().withTimeout(5000);
|
await waitFor(element(by.label(`${ data.users.regular.username } Message pinned`)).atIndex(0)).toExist().withTimeout(5000);
|
||||||
|
|
@ -277,7 +276,7 @@ describe('Room screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should delete message', async() => {
|
it('should delete message', async() => {
|
||||||
await mockMessage('delete')
|
await mockMessage('delete');
|
||||||
|
|
||||||
await waitFor(element(by.label(`${ data.random }delete`)).atIndex(0)).toBeVisible();
|
await waitFor(element(by.label(`${ data.random }delete`)).atIndex(0)).toBeVisible();
|
||||||
await element(by.label(`${ data.random }delete`)).atIndex(0).longPress();
|
await element(by.label(`${ data.random }delete`)).atIndex(0).longPress();
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, tapBack, sleep, searchRoom, mockMessage, starMessage, pinMessage } = require('../../helpers/app');
|
const {
|
||||||
const { sendMessage } = require('../../helpers/data_setup')
|
navigateToLogin, login, tapBack, sleep, searchRoom, mockMessage, starMessage, pinMessage
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
const { sendMessage } = require('../../helpers/data_setup');
|
||||||
|
|
||||||
async function navigateToRoomActions(type) {
|
async function navigateToRoomActions(type) {
|
||||||
let room;
|
let room;
|
||||||
|
|
@ -36,15 +35,14 @@ async function waitForToast() {
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('Room actions screen', () => {
|
describe('Room actions screen', () => {
|
||||||
|
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
||||||
await navigateToLogin();
|
await navigateToLogin();
|
||||||
await login(data.users.regular.username, data.users.regular.password);
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
describe('Direct', async() => {
|
describe('Direct', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await navigateToRoomActions('d');
|
await navigateToRoomActions('d');
|
||||||
});
|
});
|
||||||
|
|
@ -102,7 +100,7 @@ describe('Room actions screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Channel/Group', async() => {
|
describe('Channel/Group', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await navigateToRoomActions('c');
|
await navigateToRoomActions('c');
|
||||||
});
|
});
|
||||||
|
|
@ -165,7 +163,7 @@ describe('Room actions screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
describe('TDB', async() => {
|
describe('TDB', async() => {
|
||||||
// TODO: test into a jitsi call
|
// TODO: test into a jitsi call
|
||||||
// it('should NOT navigate to voice call', async() => {
|
// it('should NOT navigate to voice call', async() => {
|
||||||
|
|
@ -191,7 +189,7 @@ describe('Room actions screen', () => {
|
||||||
// });
|
// });
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Common', async() => {
|
describe('Common', () => {
|
||||||
it('should show mentioned messages', async() => {
|
it('should show mentioned messages', async() => {
|
||||||
await element(by.id('room-actions-mentioned')).tap();
|
await element(by.id('room-actions-mentioned')).tap();
|
||||||
await waitFor(element(by.id('mentioned-messages-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('mentioned-messages-view'))).toExist().withTimeout(2000);
|
||||||
|
|
@ -200,13 +198,12 @@ describe('Room actions screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show starred message and unstar it', async() => {
|
it('should show starred message and unstar it', async() => {
|
||||||
|
|
||||||
// Go back to room and send a message
|
// Go back to room and send a message
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await mockMessage('messageToStar');
|
await mockMessage('messageToStar');
|
||||||
|
|
||||||
// Star the message
|
// Star the message
|
||||||
await starMessage('messageToStar')
|
await starMessage('messageToStar');
|
||||||
|
|
||||||
// Back into Room Actions
|
// Back into Room Actions
|
||||||
await element(by.id('room-header')).tap();
|
await element(by.id('room-header')).tap();
|
||||||
|
|
@ -228,13 +225,12 @@ describe('Room actions screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show pinned message and unpin it', async() => {
|
it('should show pinned message and unpin it', async() => {
|
||||||
|
|
||||||
// Go back to room and send a message
|
// Go back to room and send a message
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await mockMessage('messageToPin');
|
await mockMessage('messageToPin');
|
||||||
|
|
||||||
// Pin the message
|
// Pin the message
|
||||||
await pinMessage('messageToPin')
|
await pinMessage('messageToPin');
|
||||||
|
|
||||||
// Back into Room Actions
|
// Back into Room Actions
|
||||||
await element(by.id('room-header')).tap();
|
await element(by.id('room-header')).tap();
|
||||||
|
|
@ -273,7 +269,7 @@ describe('Room actions screen', () => {
|
||||||
// });
|
// });
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Notification', async() => {
|
describe('Notification', () => {
|
||||||
it('should navigate to notification preference view', async() => {
|
it('should navigate to notification preference view', async() => {
|
||||||
await element(by.id('room-actions-scrollview')).scrollTo('bottom');
|
await element(by.id('room-actions-scrollview')).scrollTo('bottom');
|
||||||
await waitFor(element(by.id('room-actions-notifications'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('room-actions-notifications'))).toExist().withTimeout(2000);
|
||||||
|
|
@ -318,13 +314,13 @@ describe('Room actions screen', () => {
|
||||||
after(async() => {
|
after(async() => {
|
||||||
await backToActions();
|
await backToActions();
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Channel/Group', async() => {
|
describe('Channel/Group', () => {
|
||||||
// Currently, there's no way to add more owners to the room
|
// Currently, there's no way to add more owners to the room
|
||||||
// So we test only for the 'You are the last owner...' message
|
// So we test only for the 'You are the last owner...' message
|
||||||
|
|
||||||
const user = data.users.alternate
|
const user = data.users.alternate;
|
||||||
|
|
||||||
it('should tap on leave channel and raise alert', async() => {
|
it('should tap on leave channel and raise alert', async() => {
|
||||||
await element(by.id('room-actions-scrollview')).scrollTo('bottom');
|
await element(by.id('room-actions-scrollview')).scrollTo('bottom');
|
||||||
|
|
@ -363,12 +359,24 @@ describe('Room actions screen', () => {
|
||||||
await backToActions();
|
await backToActions();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Room Members', async() => {
|
describe('Room Members', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await element(by.id('room-actions-members')).tap();
|
await element(by.id('room-actions-members')).tap();
|
||||||
await waitFor(element(by.id('room-members-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('room-members-view'))).toExist().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const openActionSheet = async(username) => {
|
||||||
|
await waitFor(element(by.id(`room-members-view-item-${ username }`))).toExist().withTimeout(5000);
|
||||||
|
await element(by.id(`room-members-view-item-${ username }`)).tap();
|
||||||
|
await sleep(300);
|
||||||
|
await expect(element(by.id('action-sheet'))).toExist();
|
||||||
|
await expect(element(by.id('action-sheet-handle'))).toBeVisible();
|
||||||
|
};
|
||||||
|
|
||||||
|
const closeActionSheet = async() => {
|
||||||
|
await element(by.id('action-sheet-handle')).swipe('down', 'fast', 0.6);
|
||||||
|
};
|
||||||
|
|
||||||
it('should show all users', async() => {
|
it('should show all users', async() => {
|
||||||
await element(by.id('room-members-view-toggle-status')).tap();
|
await element(by.id('room-members-view-toggle-status')).tap();
|
||||||
await waitFor(element(by.id(`room-members-view-item-${ user.username }`))).toExist().withTimeout(60000);
|
await waitFor(element(by.id(`room-members-view-item-${ user.username }`))).toExist().withTimeout(60000);
|
||||||
|
|
@ -397,18 +405,6 @@ describe('Room actions screen', () => {
|
||||||
await waitFor(element(by.id(`room-members-view-item-${ user.username }`))).toExist().withTimeout(60000);
|
await waitFor(element(by.id(`room-members-view-item-${ user.username }`))).toExist().withTimeout(60000);
|
||||||
});
|
});
|
||||||
|
|
||||||
const openActionSheet = async(username) => {
|
|
||||||
await waitFor(element(by.id(`room-members-view-item-${ username }`))).toExist().withTimeout(5000);
|
|
||||||
await element(by.id(`room-members-view-item-${ username }`)).tap();
|
|
||||||
await sleep(300);
|
|
||||||
await expect(element(by.id('action-sheet'))).toExist();
|
|
||||||
await expect(element(by.id('action-sheet-handle'))).toBeVisible();
|
|
||||||
}
|
|
||||||
|
|
||||||
const closeActionSheet = async() => {
|
|
||||||
await element(by.id('action-sheet-handle')).swipe('down', 'fast', 0.6);
|
|
||||||
}
|
|
||||||
|
|
||||||
it('should set/remove as owner', async() => {
|
it('should set/remove as owner', async() => {
|
||||||
await openActionSheet(user.username);
|
await openActionSheet(user.username);
|
||||||
await element(by.id('action-sheet-set-owner')).tap();
|
await element(by.id('action-sheet-set-owner')).tap();
|
||||||
|
|
@ -504,9 +500,9 @@ describe('Room actions screen', () => {
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('rooms-list-view'))).toExist().withTimeout(2000);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Direct', async() => {
|
describe('Direct', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await navigateToRoomActions('d');
|
await navigateToRoomActions('d');
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
const {
|
const {
|
||||||
expect, element, by, waitFor
|
navigateToLogin, login, mockMessage, tapBack, searchRoom
|
||||||
} = require('detox');
|
} = require('../../helpers/app');
|
||||||
const { navigateToLogin, login, mockMessage, tapBack, searchRoom } = require('../../helpers/app');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
|
|
||||||
const channel = data.groups.private.name;
|
const channel = data.groups.private.name;
|
||||||
|
|
@ -10,13 +9,13 @@ const navigateToRoom = async() => {
|
||||||
await searchRoom(channel);
|
await searchRoom(channel);
|
||||||
await element(by.id(`rooms-list-view-item-${ channel }`)).tap();
|
await element(by.id(`rooms-list-view-item-${ channel }`)).tap();
|
||||||
await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000);
|
await waitFor(element(by.id('room-view'))).toBeVisible().withTimeout(5000);
|
||||||
}
|
};
|
||||||
|
|
||||||
describe('Discussion', () => {
|
describe('Discussion', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true, delete: true });
|
||||||
await navigateToLogin();
|
await navigateToLogin();
|
||||||
await login(data.users.regular.username, data.users.regular.password)
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create discussion from NewMessageView', async() => {
|
it('should create discussion from NewMessageView', async() => {
|
||||||
|
|
@ -31,7 +30,7 @@ describe('Discussion', () => {
|
||||||
await waitFor(element(by.id(`multi-select-item-${ channel }`))).toExist().withTimeout(10000);
|
await waitFor(element(by.id(`multi-select-item-${ channel }`))).toExist().withTimeout(10000);
|
||||||
await element(by.id(`multi-select-item-${ channel }`)).tap();
|
await element(by.id(`multi-select-item-${ channel }`)).tap();
|
||||||
await element(by.id('multi-select-discussion-name')).replaceText(discussionName);
|
await element(by.id('multi-select-discussion-name')).replaceText(discussionName);
|
||||||
await waitFor(element(by.id(`create-discussion-submit`))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('create-discussion-submit'))).toExist().withTimeout(10000);
|
||||||
await element(by.id('create-discussion-submit')).tap();
|
await element(by.id('create-discussion-submit')).tap();
|
||||||
await waitFor(element(by.id('room-view'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('room-view'))).toExist().withTimeout(10000);
|
||||||
await waitFor(element(by.id(`room-view-title-${ discussionName }`))).toExist().withTimeout(5000);
|
await waitFor(element(by.id(`room-view-title-${ discussionName }`))).toExist().withTimeout(5000);
|
||||||
|
|
@ -47,13 +46,13 @@ describe('Discussion', () => {
|
||||||
await element(by.label('Create Discussion')).atIndex(0).tap();
|
await element(by.label('Create Discussion')).atIndex(0).tap();
|
||||||
await waitFor(element(by.id('create-discussion-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('create-discussion-view'))).toExist().withTimeout(2000);
|
||||||
await element(by.id('multi-select-discussion-name')).replaceText(discussionName);
|
await element(by.id('multi-select-discussion-name')).replaceText(discussionName);
|
||||||
await waitFor(element(by.id(`create-discussion-submit`))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('create-discussion-submit'))).toExist().withTimeout(10000);
|
||||||
await element(by.id('create-discussion-submit')).tap();
|
await element(by.id('create-discussion-submit')).tap();
|
||||||
await waitFor(element(by.id('room-view'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('room-view'))).toExist().withTimeout(10000);
|
||||||
await waitFor(element(by.id(`room-view-title-${ discussionName }`))).toExist().withTimeout(5000);
|
await waitFor(element(by.id(`room-view-title-${ discussionName }`))).toExist().withTimeout(5000);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Create Discussion from action sheet', async() => {
|
describe('Create Discussion from action sheet', () => {
|
||||||
it('should send a message', async() => {
|
it('should send a message', async() => {
|
||||||
await waitFor(element(by.id('messagebox'))).toBeVisible().withTimeout(60000);
|
await waitFor(element(by.id('messagebox'))).toBeVisible().withTimeout(60000);
|
||||||
await mockMessage('message');
|
await mockMessage('message');
|
||||||
|
|
@ -63,7 +62,7 @@ describe('Discussion', () => {
|
||||||
const discussionName = `${ data.random }message`;
|
const discussionName = `${ data.random }message`;
|
||||||
await element(by.label(discussionName)).atIndex(0).longPress();
|
await element(by.label(discussionName)).atIndex(0).longPress();
|
||||||
await waitFor(element(by.id('action-sheet'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('action-sheet'))).toExist().withTimeout(2000);
|
||||||
await element(by.label(`Start a Discussion`)).atIndex(0).tap();
|
await element(by.label('Start a Discussion')).atIndex(0).tap();
|
||||||
await waitFor(element(by.id('create-discussion-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('create-discussion-view'))).toExist().withTimeout(2000);
|
||||||
await element(by.id('create-discussion-submit')).tap();
|
await element(by.id('create-discussion-submit')).tap();
|
||||||
await waitFor(element(by.id('room-view'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('room-view'))).toExist().withTimeout(10000);
|
||||||
|
|
@ -71,7 +70,7 @@ describe('Discussion', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Check RoomActionsView render', async() => {
|
describe('Check RoomActionsView render', () => {
|
||||||
it('should navigete to RoomActionsView', async() => {
|
it('should navigete to RoomActionsView', async() => {
|
||||||
await waitFor(element(by.id('room-header'))).toBeVisible().withTimeout(5000);
|
await waitFor(element(by.id('room-header'))).toBeVisible().withTimeout(5000);
|
||||||
await element(by.id('room-header')).tap();
|
await element(by.id('room-header')).tap();
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom, starMessage, pinMessage, dismissReviewNag, tryTapping } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, mockMessage, tapBack, sleep, searchRoom, dismissReviewNag
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
async function navigateToRoom(roomName) {
|
async function navigateToRoom(roomName) {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
||||||
|
|
@ -20,14 +19,14 @@ describe('Threads', () => {
|
||||||
await navigateToRoom(mainRoom);
|
await navigateToRoom(mainRoom);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have room screen', async() => {
|
it('should have room screen', async() => {
|
||||||
await expect(element(by.id('room-view'))).toExist();
|
await expect(element(by.id('room-view'))).toExist();
|
||||||
await waitFor(element(by.id(`room-view-title-${ mainRoom }`))).toExist().withTimeout(5000);
|
await waitFor(element(by.id(`room-view-title-${ mainRoom }`))).toExist().withTimeout(5000);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Render - Header
|
// Render - Header
|
||||||
describe('Header', async() => {
|
describe('Header', () => {
|
||||||
it('should have actions button ', async() => {
|
it('should have actions button ', async() => {
|
||||||
await expect(element(by.id('room-header'))).toExist();
|
await expect(element(by.id('room-header'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -38,7 +37,7 @@ describe('Threads', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Render - Messagebox
|
// Render - Messagebox
|
||||||
describe('Messagebox', async() => {
|
describe('Messagebox', () => {
|
||||||
it('should have messagebox', async() => {
|
it('should have messagebox', async() => {
|
||||||
await expect(element(by.id('messagebox'))).toExist();
|
await expect(element(by.id('messagebox'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -63,8 +62,8 @@ describe('Threads', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
describe('Thread', async() => {
|
describe('Thread', () => {
|
||||||
const thread = `${ data.random }thread`;
|
const thread = `${ data.random }thread`;
|
||||||
it('should create thread', async() => {
|
it('should create thread', async() => {
|
||||||
await mockMessage('thread');
|
await mockMessage('thread');
|
||||||
|
|
@ -106,7 +105,7 @@ describe('Threads', () => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await waitFor(element(by.id('room-header').and(by.label(`${ mainRoom }`)))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('room-header').and(by.label(`${ mainRoom }`)))).toBeVisible().withTimeout(2000);
|
||||||
await waitFor(element(by.id('room-header').and(by.label(`${ data.random }thread`)))).toBeNotVisible().withTimeout(2000);
|
await waitFor(element(by.id('room-header').and(by.label(`${ data.random }thread`)))).toBeNotVisible().withTimeout(2000);
|
||||||
await sleep(500) //TODO: Find a better way to wait for the animation to finish and the messagebox-input to be available and usable :(
|
await sleep(500); // TODO: Find a better way to wait for the animation to finish and the messagebox-input to be available and usable :(
|
||||||
await waitFor(element(by.label(`${ data.random }${ messageText }`)).atIndex(0)).toNotExist().withTimeout(2000);
|
await waitFor(element(by.label(`${ data.random }${ messageText }`)).atIndex(0)).toNotExist().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -119,14 +118,14 @@ describe('Threads', () => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await waitFor(element(by.id('room-header').and(by.label(`${ mainRoom }`)))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('room-header').and(by.label(`${ mainRoom }`)))).toBeVisible().withTimeout(2000);
|
||||||
await waitFor(element(by.id('room-header').and(by.label(`${ data.random }thread`)))).toBeNotVisible().withTimeout(2000);
|
await waitFor(element(by.id('room-header').and(by.label(`${ data.random }thread`)))).toBeNotVisible().withTimeout(2000);
|
||||||
await sleep(500) //TODO: Find a better way to wait for the animation to finish and the messagebox-input to be available and usable :(
|
await sleep(500); // TODO: Find a better way to wait for the animation to finish and the messagebox-input to be available and usable :(
|
||||||
await waitFor(element(by.label(messageText)).atIndex(0)).toExist().withTimeout(2000);
|
await waitFor(element(by.label(messageText)).atIndex(0)).toExist().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should navigate to thread from thread name', async() => {
|
it('should navigate to thread from thread name', async() => {
|
||||||
const messageText = 'navthreadname';
|
const messageText = 'navthreadname';
|
||||||
await mockMessage('dummymessagebetweenthethread');
|
await mockMessage('dummymessagebetweenthethread');
|
||||||
await dismissReviewNag() //TODO: Create a proper test for this elsewhere.
|
await dismissReviewNag(); // TODO: Create a proper test for this elsewhere.
|
||||||
await element(by.id(`message-thread-button-${ thread }`)).tap();
|
await element(by.id(`message-thread-button-${ thread }`)).tap();
|
||||||
await element(by.id('messagebox-input-thread')).typeText(messageText);
|
await element(by.id('messagebox-input-thread')).typeText(messageText);
|
||||||
await element(by.id('messagebox-send-to-channel')).tap();
|
await element(by.id('messagebox-send-to-channel')).tap();
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { tapBack, sleep, navigateToLogin, login, tryTapping } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -13,12 +12,12 @@ describe('Group DM', () => {
|
||||||
await login(data.users.regular.username, data.users.regular.password);
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Create Group DM', async() => {
|
describe('Create Group DM', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await element(by.id('rooms-list-view-create-channel')).tap();
|
await element(by.id('rooms-list-view-create-channel')).tap();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have new message screen', async() => {
|
it('should have new message screen', async() => {
|
||||||
await waitFor(element(by.id('new-message-view'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('new-message-view'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
@ -26,16 +25,16 @@ describe('Group DM', () => {
|
||||||
it('should have search input', async() => {
|
it('should have search input', async() => {
|
||||||
await waitFor(element(by.id('new-message-view-search'))).toBeVisible().withTimeout(2000);
|
await waitFor(element(by.id('new-message-view-search'))).toBeVisible().withTimeout(2000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should navigate to create DM', async() => {
|
it('should navigate to create DM', async() => {
|
||||||
await element(by.label('Create Direct Messages')).tap();
|
await element(by.label('Create Direct Messages')).tap();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should add users', async() => {
|
it('should add users', async() => {
|
||||||
await element(by.id('select-users-view-search')).replaceText('rocket.cat');
|
await element(by.id('select-users-view-search')).replaceText('rocket.cat');
|
||||||
await waitFor(element(by.id(`select-users-view-item-rocket.cat`))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.id('select-users-view-item-rocket.cat'))).toBeVisible().withTimeout(10000);
|
||||||
await element(by.id('select-users-view-item-rocket.cat')).tap();
|
await element(by.id('select-users-view-item-rocket.cat')).tap();
|
||||||
await element(by.id('select-users-view-search')).replaceText(data.users.existing.username);
|
await element(by.id('select-users-view-search')).replaceText(data.users.existing.username);
|
||||||
await waitFor(element(by.id(`select-users-view-item-${ data.users.existing.username }`))).toBeVisible().withTimeout(10000);
|
await waitFor(element(by.id(`select-users-view-item-${ data.users.existing.username }`))).toBeVisible().withTimeout(10000);
|
||||||
|
|
@ -46,8 +45,6 @@ describe('Group DM', () => {
|
||||||
it('check Group DM exist', async() => {
|
it('check Group DM exist', async() => {
|
||||||
await waitFor(element(by.id(`room-view-title-${ data.users.existing.username }, rocket.cat`))).toExist().withTimeout(10000);
|
await waitFor(element(by.id(`room-view-title-${ data.users.existing.username }, rocket.cat`))).toExist().withTimeout(10000);
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, searchRoom, sleep } = require('../../helpers/app');
|
const {
|
||||||
const { sendMessage } = require('../../helpers/data_setup')
|
navigateToLogin, login, searchRoom, sleep
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
const { sendMessage } = require('../../helpers/data_setup');
|
||||||
|
|
||||||
async function navigateToRoom(user) {
|
async function navigateToRoom(user) {
|
||||||
await searchRoom(`${ user }`);
|
await searchRoom(`${ user }`);
|
||||||
|
|
@ -12,7 +11,7 @@ async function navigateToRoom(user) {
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('Mark as unread', () => {
|
describe('Mark as unread', () => {
|
||||||
const user = data.users.alternate.username
|
const user = data.users.alternate.username;
|
||||||
|
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
||||||
|
|
@ -21,9 +20,8 @@ describe('Mark as unread', () => {
|
||||||
await navigateToRoom(user);
|
await navigateToRoom(user);
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO: Fix flakiness. If it fails, run it solo.
|
describe('Usage', () => {
|
||||||
describe('Usage', async() => {
|
describe('Mark message as unread', () => {
|
||||||
describe('Mark message as unread', async() => {
|
|
||||||
it('should mark message as unread', async() => {
|
it('should mark message as unread', async() => {
|
||||||
const message = `${ data.random }message-mark-as-unread`;
|
const message = `${ data.random }message-mark-as-unread`;
|
||||||
const channelName = `@${ data.users.regular.username }`;
|
const channelName = `@${ data.users.regular.username }`;
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, tapBack, sleep, searchRoom } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, tapBack, sleep, searchRoom
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
const privateRoomName = data.groups.private.name
|
const privateRoomName = data.groups.private.name;
|
||||||
|
|
||||||
async function navigateToRoomInfo(type) {
|
async function navigateToRoomInfo(type) {
|
||||||
let room;
|
let room;
|
||||||
|
|
@ -31,14 +30,13 @@ async function waitForToast() {
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('Room info screen', () => {
|
describe('Room info screen', () => {
|
||||||
|
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
|
||||||
await navigateToLogin();
|
await navigateToLogin();
|
||||||
await login(data.users.regular.username, data.users.regular.password);
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Direct', async() => {
|
describe('Direct', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await navigateToRoomInfo('d');
|
await navigateToRoomInfo('d');
|
||||||
});
|
});
|
||||||
|
|
@ -49,18 +47,18 @@ describe('Room info screen', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
after(async() => {
|
after(async() => {
|
||||||
await tapBack()
|
await tapBack();
|
||||||
await tapBack()
|
await tapBack();
|
||||||
await tapBack()
|
await tapBack();
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Channel/Group', async() => {
|
describe('Channel/Group', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await navigateToRoomInfo('c');
|
await navigateToRoomInfo('c');
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render', async() => {
|
describe('Render', () => {
|
||||||
it('should have room info view', async() => {
|
it('should have room info view', async() => {
|
||||||
await expect(element(by.id('room-info-view'))).toExist();
|
await expect(element(by.id('room-info-view'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -86,7 +84,7 @@ describe('Room info screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Render Edit', async() => {
|
describe('Render Edit', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await waitFor(element(by.id('room-info-view-edit-button'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('room-info-view-edit-button'))).toExist().withTimeout(10000);
|
||||||
await element(by.id('room-info-view-edit-button')).tap();
|
await element(by.id('room-info-view-edit-button')).tap();
|
||||||
|
|
@ -149,7 +147,7 @@ describe('Room info screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
// it('should enter "invalid name" and get error', async() => {
|
// it('should enter "invalid name" and get error', async() => {
|
||||||
// await element(by.type('UIScrollView')).atIndex(1).swipe('down');
|
// await element(by.type('UIScrollView')).atIndex(1).swipe('down');
|
||||||
// await element(by.id('room-info-edit-view-name')).replaceText('invalid name');
|
// await element(by.id('room-info-edit-view-name')).replaceText('invalid name');
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, mockMessage, tapBack, login, sleep, searchRoom } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, tapBack, login, searchRoom
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
async function navigateToRoom(roomName) {
|
async function navigateToRoom(roomName) {
|
||||||
await searchRoom(`${ roomName }`);
|
await searchRoom(`${ roomName }`);
|
||||||
|
|
@ -22,7 +21,7 @@ async function clearCache() {
|
||||||
await waitFor(element(by.text('This will clear all your offline data.'))).toExist().withTimeout(2000);
|
await waitFor(element(by.text('This will clear all your offline data.'))).toExist().withTimeout(2000);
|
||||||
await element(by.label('Clear').and(by.type('_UIAlertControllerActionView'))).tap();
|
await element(by.label('Clear').and(by.type('_UIAlertControllerActionView'))).tap();
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(5000);
|
await waitFor(element(by.id('rooms-list-view'))).toBeVisible().withTimeout(5000);
|
||||||
await waitFor(element(by.id(`rooms-list-view-item-jumping`))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('rooms-list-view-item-jumping'))).toExist().withTimeout(10000);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitForLoading() {
|
async function waitForLoading() {
|
||||||
|
|
@ -51,7 +50,7 @@ describe('Room', () => {
|
||||||
await element(by.id('nav-jump-to-bottom')).tap();
|
await element(by.id('nav-jump-to-bottom')).tap();
|
||||||
await waitFor(element(by.label('Quote first message'))).toExist().withTimeout(5000);
|
await waitFor(element(by.label('Quote first message'))).toExist().withTimeout(5000);
|
||||||
await clearCache();
|
await clearCache();
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should load messages on scroll', async() => {
|
it('should load messages on scroll', async() => {
|
||||||
await navigateToRoom('jumping');
|
await navigateToRoom('jumping');
|
||||||
|
|
@ -64,6 +63,7 @@ describe('Room', () => {
|
||||||
await expect(element(by.label('249'))).toExist();
|
await expect(element(by.label('249'))).toExist();
|
||||||
found = true;
|
found = true;
|
||||||
} catch {
|
} catch {
|
||||||
|
//
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await clearCache();
|
await clearCache();
|
||||||
|
|
@ -80,7 +80,7 @@ describe('Room', () => {
|
||||||
await expect(element(by.label('30'))).toExist();
|
await expect(element(by.label('30'))).toExist();
|
||||||
await expect(element(by.label('31'))).toExist();
|
await expect(element(by.label('31'))).toExist();
|
||||||
await expect(element(by.label('32'))).toExist();
|
await expect(element(by.label('32'))).toExist();
|
||||||
})
|
});
|
||||||
|
|
||||||
it('should load newer and older messages', async() => {
|
it('should load newer and older messages', async() => {
|
||||||
await element(by.id('room-view-messages')).atIndex(0).swipe('down', 'fast', 0.8);
|
await element(by.id('room-view-messages')).atIndex(0).swipe('down', 'fast', 0.8);
|
||||||
|
|
@ -114,9 +114,9 @@ describe('Room', () => {
|
||||||
const expectThreadMessages = async(message) => {
|
const expectThreadMessages = async(message) => {
|
||||||
await waitFor(element(by.id('room-view-title-jumping-thread'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('room-view-title-jumping-thread'))).toExist().withTimeout(5000);
|
||||||
await expect(element(by.label(message))).toExist();
|
await expect(element(by.label(message))).toExist();
|
||||||
}
|
};
|
||||||
|
|
||||||
describe('Threads', async() => {
|
describe('Threads', () => {
|
||||||
it('should navigate to a thread from another room', async() => {
|
it('should navigate to a thread from another room', async() => {
|
||||||
await navigateToRoom('jumping');
|
await navigateToRoom('jumping');
|
||||||
await waitFor(element(by.label('Go to jumping-thread\'s thread')).atIndex(0)).toExist().withTimeout(5000);
|
await waitFor(element(by.label('Go to jumping-thread\'s thread')).atIndex(0)).toExist().withTimeout(5000);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login } = require('../../helpers/app');
|
const { navigateToLogin, login } = require('../../helpers/app');
|
||||||
|
|
||||||
|
|
@ -13,7 +10,7 @@ describe('Create team screen', () => {
|
||||||
await login(data.users.regular.username, data.users.regular.password);
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('New Message', async() => {
|
describe('New Message', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await element(by.id('rooms-list-view-create-channel')).tap();
|
await element(by.id('rooms-list-view-create-channel')).tap();
|
||||||
});
|
});
|
||||||
|
|
@ -28,15 +25,15 @@ describe('Create team screen', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Select Users', async() => {
|
describe('Select Users', () => {
|
||||||
it('should nav to create team', async() => {
|
it('should nav to create team', async() => {
|
||||||
await element(by.id('selected-users-view-submit')).tap();
|
await element(by.id('selected-users-view-submit')).tap();
|
||||||
await waitFor(element(by.id('create-channel-view'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('create-channel-view'))).toExist().withTimeout(10000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Create Team', async() => {
|
describe('Create Team', () => {
|
||||||
describe('Usage', async() => {
|
describe('Usage', () => {
|
||||||
it('should get invalid team name', async() => {
|
it('should get invalid team name', async() => {
|
||||||
await element(by.id('create-channel-name')).typeText(`${ data.teams.private.name }`);
|
await element(by.id('create-channel-name')).typeText(`${ data.teams.private.name }`);
|
||||||
await element(by.id('create-channel-submit')).tap();
|
await element(by.id('create-channel-submit')).tap();
|
||||||
|
|
@ -52,10 +49,10 @@ describe('Create team screen', () => {
|
||||||
await waitFor(element(by.id(`room-view-title-${ teamName }`))).toExist().withTimeout(6000);
|
await waitFor(element(by.id(`room-view-title-${ teamName }`))).toExist().withTimeout(6000);
|
||||||
await expect(element(by.id(`room-view-title-${ teamName }`))).toExist();
|
await expect(element(by.id(`room-view-title-${ teamName }`))).toExist();
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Delete Team', async() => {
|
describe('Delete Team', () => {
|
||||||
it('should navigate to room info edit view', async() => {
|
it('should navigate to room info edit view', async() => {
|
||||||
await element(by.id('room-header')).tap();
|
await element(by.id('room-header')).tap();
|
||||||
await waitFor(element(by.id('room-actions-view'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('room-actions-view'))).toExist().withTimeout(5000);
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, tapBack, sleep, searchRoom } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, tapBack, sleep, searchRoom
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
async function navigateToRoom(roomName) {
|
async function navigateToRoom(roomName) {
|
||||||
await searchRoom(`${ roomName }`);
|
await searchRoom(`${ roomName }`);
|
||||||
|
|
@ -49,8 +48,8 @@ describe('Team', () => {
|
||||||
await navigateToRoom(team);
|
await navigateToRoom(team);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Team Room', async() => {
|
describe('Team Room', () => {
|
||||||
describe('Team Header', async() => {
|
describe('Team Header', () => {
|
||||||
it('should have actions button ', async() => {
|
it('should have actions button ', async() => {
|
||||||
await expect(element(by.id('room-header'))).toExist();
|
await expect(element(by.id('room-header'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -69,14 +68,14 @@ describe('Team', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Team Header Usage', async() => {
|
describe('Team Header Usage', () => {
|
||||||
it('should navigate to team channels view', async() => {
|
it('should navigate to team channels view', async() => {
|
||||||
await element(by.id('room-view-header-team-channels')).tap();
|
await element(by.id('room-view-header-team-channels')).tap();
|
||||||
await waitFor(element(by.id('team-channels-view'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('team-channels-view'))).toExist().withTimeout(5000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Team Channels Header', async() => {
|
describe('Team Channels Header', () => {
|
||||||
it('should have actions button ', async() => {
|
it('should have actions button ', async() => {
|
||||||
await expect(element(by.id('room-header'))).toExist();
|
await expect(element(by.id('room-header'))).toExist();
|
||||||
});
|
});
|
||||||
|
|
@ -90,7 +89,7 @@ describe('Team', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Team Channels Header Usage', async() => {
|
describe('Team Channels Header Usage', () => {
|
||||||
it('should navigate to add team channels view', async() => {
|
it('should navigate to add team channels view', async() => {
|
||||||
await element(by.id('team-channels-view-create')).tap();
|
await element(by.id('team-channels-view-create')).tap();
|
||||||
await waitFor(element(by.id('add-channel-team-view'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('add-channel-team-view'))).toExist().withTimeout(5000);
|
||||||
|
|
@ -103,11 +102,10 @@ describe('Team', () => {
|
||||||
it('should add existing button', async() => {
|
it('should add existing button', async() => {
|
||||||
await waitFor(element(by.id('add-channel-team-view-add-existing'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('add-channel-team-view-add-existing'))).toExist().withTimeout(5000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Channels', async() => {
|
describe('Channels', () => {
|
||||||
it('should create new channel for team', async() => {
|
it('should create new channel for team', async() => {
|
||||||
|
|
||||||
await element(by.id('add-channel-team-view-create-channel')).tap();
|
await element(by.id('add-channel-team-view-create-channel')).tap();
|
||||||
|
|
||||||
await element(by.id('select-users-view-search')).replaceText('rocket.cat');
|
await element(by.id('select-users-view-search')).replaceText('rocket.cat');
|
||||||
|
|
@ -138,12 +136,11 @@ describe('Team', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should add existing channel to team', async() => {
|
it('should add existing channel to team', async() => {
|
||||||
|
|
||||||
await element(by.id('team-channels-view-create')).tap();
|
await element(by.id('team-channels-view-create')).tap();
|
||||||
await waitFor(element(by.id('add-channel-team-view'))).toExist().withTimeout(5000);
|
await waitFor(element(by.id('add-channel-team-view'))).toExist().withTimeout(5000);
|
||||||
|
|
||||||
await element(by.id('add-channel-team-view-add-existing')).tap();
|
await element(by.id('add-channel-team-view-add-existing')).tap();
|
||||||
await waitFor(element(by.id('add-existing-channel-view'))).toExist().withTimeout(60000)
|
await waitFor(element(by.id('add-existing-channel-view'))).toExist().withTimeout(60000);
|
||||||
await expect(element(by.id(`add-existing-channel-view-item-${ existingRoom }`))).toExist();
|
await expect(element(by.id(`add-existing-channel-view-item-${ existingRoom }`))).toExist();
|
||||||
await element(by.id(`add-existing-channel-view-item-${ existingRoom }`)).tap();
|
await element(by.id(`add-existing-channel-view-item-${ existingRoom }`)).tap();
|
||||||
await waitFor(element(by.id('add-existing-channel-view-submit'))).toExist().withTimeout(6000);
|
await waitFor(element(by.id('add-existing-channel-view-submit'))).toExist().withTimeout(6000);
|
||||||
|
|
@ -174,7 +171,7 @@ describe('Team', () => {
|
||||||
await waitFor(element(by.id('auto-join-tag'))).toBeNotVisible().withTimeout(5000);
|
await waitFor(element(by.id('auto-join-tag'))).toBeNotVisible().withTimeout(5000);
|
||||||
await waitFor(element(by.id(`rooms-list-view-item-${ existingRoom }`))).toExist().withTimeout(6000);
|
await waitFor(element(by.id(`rooms-list-view-item-${ existingRoom }`))).toExist().withTimeout(6000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
|
|
||||||
describe('Team actions', () => {
|
describe('Team actions', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
|
|
@ -228,7 +225,7 @@ describe('Team', () => {
|
||||||
await waitFor(element(by.id('room-actions-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('room-actions-view'))).toExist().withTimeout(2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Room Members', async() => {
|
describe('Room Members', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await element(by.id('room-actions-members')).tap();
|
await element(by.id('room-actions-members')).tap();
|
||||||
await waitFor(element(by.id('room-members-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('room-members-view'))).toExist().withTimeout(2000);
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
const {
|
|
||||||
device, expect, element, by, waitFor
|
|
||||||
} = require('detox');
|
|
||||||
const data = require('../../data');
|
const data = require('../../data');
|
||||||
const { navigateToLogin, login, tapBack, searchRoom, sleep } = require('../../helpers/app');
|
const {
|
||||||
|
navigateToLogin, login, tapBack, searchRoom, sleep
|
||||||
|
} = require('../../helpers/app');
|
||||||
|
|
||||||
const toBeConverted = `to-be-converted-${ data.random }`;
|
const toBeConverted = `to-be-converted-${ data.random }`;
|
||||||
const toBeMoved = `to-be-moved-${ data.random }`;
|
const toBeMoved = `to-be-moved-${ data.random }`;
|
||||||
|
|
@ -21,7 +20,7 @@ const createChannel = async(room) => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('rooms-list-view'))).toExist().withTimeout(2000);
|
||||||
await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toExist().withTimeout(60000);
|
await waitFor(element(by.id(`rooms-list-view-item-${ room }`))).toExist().withTimeout(60000);
|
||||||
}
|
};
|
||||||
|
|
||||||
async function navigateToRoom(room) {
|
async function navigateToRoom(room) {
|
||||||
await searchRoom(`${ room }`);
|
await searchRoom(`${ room }`);
|
||||||
|
|
@ -42,7 +41,7 @@ describe('Move/Convert Team', () => {
|
||||||
await login(data.users.regular.username, data.users.regular.password);
|
await login(data.users.regular.username, data.users.regular.password);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Convert', async() => {
|
describe('Convert', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await createChannel(toBeConverted);
|
await createChannel(toBeConverted);
|
||||||
});
|
});
|
||||||
|
|
@ -61,10 +60,10 @@ describe('Move/Convert Team', () => {
|
||||||
after(async() => {
|
after(async() => {
|
||||||
await tapBack();
|
await tapBack();
|
||||||
await waitFor(element(by.id('rooms-list-view'))).toExist().withTimeout(2000);
|
await waitFor(element(by.id('rooms-list-view'))).toExist().withTimeout(2000);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Move', async() => {
|
describe('Move', () => {
|
||||||
before(async() => {
|
before(async() => {
|
||||||
await createChannel(toBeMoved);
|
await createChannel(toBeMoved);
|
||||||
});
|
});
|
||||||
|
|
@ -85,5 +84,5 @@ describe('Move/Convert Team', () => {
|
||||||
await element(by.text('Yes, move it!')).tap();
|
await element(by.text('Yes, move it!')).tap();
|
||||||
await waitFor(element(by.id('room-view-header-team-channels'))).toExist().withTimeout(10000);
|
await waitFor(element(by.id('room-view-header-team-channels'))).toExist().withTimeout(10000);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue