Commit bf43d587 authored by Saturnino Abril's avatar Saturnino Abril Committed by Joram Wilander
Browse files

update selenium and browser's drivers and fix selector IDs (#1262)


Signed-off-by: default avatarSaturnino Abril <saturnino.abril@gmail.com>
parent 2aa19427
......@@ -3,25 +3,25 @@
module.exports = {
baseURL: 'https://selenium-release.storage.googleapis.com',
version: '3.4.0',
version: '3.8.1',
drivers: {
chrome: {
version: '2.31',
version: '2.37',
arch: process.arch,
baseURL: 'https://chromedriver.storage.googleapis.com',
},
ie: {
version: '3.4.0',
version: '3.9.0',
arch: process.arch,
baseURL: 'https://selenium-release.storage.googleapis.com',
},
firefox: {
version: '0.17.0',
version: '0.20.1',
arch: process.arch,
baseURL: 'https://github.com/mozilla/geckodriver/releases/download',
},
edge: {
version: '15063',
version: '16299',
},
},
};
......@@ -40,27 +40,30 @@ const displaySettings = {
selector: '#displaySettings',
elements: {
displaySettingsTitle: {selector: '#displaySettingsTitle'},
themeTitle: {selector: '#ThemeTitle'},
themeEdit: {selector: '#ThemeEdit'},
themeDesc: {selector: '#ThemeDesc'},
clockTitle: {selector: '#Clock_DisplayTitle'},
clockEdit: {selector: '#Clock_DisplayEdit'},
clockDesc: {selector: '#Clock_DisplayDesc'},
linkPreviewTitle: {selector: '#Website_Link_PreviewsTitle'},
linkPreviewEdit: {selector: '#Website_Link_PreviewsEdit'},
linkPreviewDesc: {selector: '#Website_Link_PreviewsDesc'},
collapseTitle: {selector: '#Default_appearance_of_image_link_previewsTitle'},
collapseEdit: {selector: '#Default_appearance_of_image_link_previewsEdit'},
collapseDesc: {selector: '#Default_appearance_of_image_link_previewsDesc'},
messageDisplayTitle: {selector: '#Message_DisplayTitle'},
messageDisplayEdit: {selector: '#Message_DisplayEdit'},
messageDisplayDesc: {selector: '#Message_DisplayDesc'},
channelDisplayModeTitle: {selector: '#Channel_Display_ModeTitle'},
channelDisplayModeEdit: {selector: '#Channel_Display_ModeEdit'},
channelDisplayModeDesc: {selector: '#Channel_Display_ModeDesc'},
languageTitle: {selector: '#LanguageTitle'},
languageEdit: {selector: '#LanguageEdit'},
languageDesc: {selector: '#LanguageDesc'},
themeTitle: {selector: '#themeTitle'},
themeEdit: {selector: '#themeEdit'},
themeDesc: {selector: '#themeDesc'},
clockTitle: {selector: '#clockTitle'},
clockEdit: {selector: '#clockEdit'},
clockDesc: {selector: '#clockDesc'},
teammateNameDisplayTitle: {selector: '#name_formatTitle'},
teammateNameDisplayEdit: {selector: '#name_formatEdit'},
teammateNameDisplayDesc: {selector: '#name_formatDesc'},
linkPreviewTitle: {selector: '#linkpreviewTitle'},
linkPreviewEdit: {selector: '#linkpreviewEdit'},
linkPreviewDesc: {selector: '#linkpreviewDesc'},
collapseTitle: {selector: '#collapseTitle'},
collapseEdit: {selector: '#collapseEdit'},
collapseDesc: {selector: '#collapseDesc'},
messageDisplayTitle: {selector: '#message_displayTitle'},
messageDisplayEdit: {selector: '#message_displayEdit'},
messageDisplayDesc: {selector: '#message_displayDesc'},
channelDisplayModeTitle: {selector: '#channel_display_modeTitle'},
channelDisplayModeEdit: {selector: '#channel_display_modeEdit'},
channelDisplayModeDesc: {selector: '#channel_display_modeDesc'},
languageTitle: {selector: '#languagesTitle'},
languageEdit: {selector: '#languagesEdit'},
languageDesc: {selector: '#languagesDesc'},
},
};
......
......@@ -48,7 +48,7 @@ function local_setup {
function add_test_users {
message "Adding test users..."
cd ../mattermost-server
PLATFORM_FILES=$( ls -1 ./cmd/platform/*.go | grep -v _test.go)
PLATFORM_FILES="./cmd/mattermost/main.go"
echo "reset the database"
go run $PLATFORM_FILES reset --confirm true
......
......@@ -44,9 +44,9 @@ module.exports = {
waitForElementVisible('#clockFormatB', Constants.DEFAULT_WAIT).
waitForElementVisible('#saveSetting', Constants.DEFAULT_WAIT).
assert.containsText('#saveSetting', 'Save').
waitForElementVisible('#Clock_DisplayCancel', Constants.DEFAULT_WAIT).
assert.containsText('#Clock_DisplayCancel', 'Cancel').
click('#Clock_DisplayCancel').
waitForElementVisible('#cancelSetting', Constants.DEFAULT_WAIT).
assert.containsText('#cancelSetting', 'Cancel').
click('#cancelSetting').
assert.containsText('@clockDesc', '12-hour clock (example: 4:00 PM)');
// save/change setting to 24-hour clock
......@@ -89,9 +89,9 @@ module.exports = {
waitForElementVisible('#linkpreviewFormatB', Constants.DEFAULT_WAIT).
waitForElementVisible('#saveSetting', Constants.DEFAULT_WAIT).
assert.containsText('#saveSetting', 'Save').
waitForElementVisible('#Website_Link_PreviewsCancel', Constants.DEFAULT_WAIT).
assert.containsText('#Website_Link_PreviewsCancel', 'Cancel').
click('#Website_Link_PreviewsCancel').
waitForElementVisible('#cancelSetting', Constants.DEFAULT_WAIT).
assert.containsText('#cancelSetting', 'Cancel').
click('#cancelSetting').
assert.containsText('@linkPreviewDesc', 'On');
// save/change setting to Off link previews
......@@ -134,9 +134,9 @@ module.exports = {
waitForElementVisible('#collapseFormatB', Constants.DEFAULT_WAIT).
waitForElementVisible('#saveSetting', Constants.DEFAULT_WAIT).
assert.containsText('#saveSetting', 'Save').
waitForElementVisible('#Default_appearance_of_image_link_previewsCancel', Constants.DEFAULT_WAIT).
assert.containsText('#Default_appearance_of_image_link_previewsCancel', 'Cancel').
click('#Default_appearance_of_image_link_previewsCancel').
waitForElementVisible('#cancelSetting', Constants.DEFAULT_WAIT).
assert.containsText('#cancelSetting', 'Cancel').
click('#cancelSetting').
assert.containsText('@collapseDesc', 'Expanded');
// save/change setting to Expanded
......
......@@ -88,6 +88,11 @@ module.exports = {
assert.visible('@clockEdit').
assert.visible('@clockDesc').
assert.containsText('@clockDesc', '12-hour clock (example: 4:00 PM)').
assert.visible('@teammateNameDisplayTitle').
assert.containsText('@teammateNameDisplayTitle', 'Teammate Name Display').
assert.visible('@teammateNameDisplayEdit').
assert.visible('@teammateNameDisplayDesc').
assert.containsText('@teammateNameDisplayDesc', 'Show username').
assert.visible('@linkPreviewTitle').
assert.containsText('@linkPreviewTitle', 'Website Link Previews').
assert.visible('@linkPreviewEdit').
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment