[FIX] Merge mistake on single-server (#3330)
This commit is contained in:
parent
ea46ae8469
commit
84b269546e
|
@ -174,16 +174,6 @@ const post = (endpoint, body) => {
|
||||||
return rocketchat.post(endpoint, body);
|
return rocketchat.post(endpoint, body);
|
||||||
};
|
};
|
||||||
|
|
||||||
const get = (endpoint) => {
|
|
||||||
console.log(`GET /${ endpoint }`)
|
|
||||||
return rocketchat.get(endpoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
const post = (endpoint, body) => {
|
|
||||||
console.log(`POST /${ endpoint } ${ JSON.stringify(body) }`)
|
|
||||||
return rocketchat.post(endpoint, body);
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
setup, sendMessage, get, post, login
|
setup, sendMessage, get, post, login
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,18 +19,6 @@ 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);
|
||||||
};
|
};
|
||||||
|
|
||||||
const checkServer = async(server) => {
|
|
||||||
const label = `Connected to ${ server }`;
|
|
||||||
await element(by.id('rooms-list-view-sidebar')).tap();
|
|
||||||
await waitFor(element(by.id('sidebar-view'))).toBeVisible().withTimeout(2000);
|
|
||||||
await waitFor(element(by.label(label))).toBeVisible().withTimeout(60000);
|
|
||||||
await element(by.id('sidebar-close-drawer')).tap();
|
|
||||||
}
|
|
||||||
|
|
||||||
const checkBanner = async() => {
|
|
||||||
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 }`);
|
||||||
await element(by.id(`rooms-list-view-item-${ roomName }`)).tap();
|
await element(by.id(`rooms-list-view-item-${ roomName }`)).tap();
|
||||||
|
|
Loading…
Reference in New Issue