Merge remote-tracking branch 'origin/latest-version'

This commit is contained in:
Andrei Hutusoru 2013-06-18 16:16:49 +03:00
Родитель 83158fc8a8 6e46c6ed98
Коммит 9792ce7679
5 изменённых файлов: 17 добавлений и 17 удалений

Просмотреть файл

@ -1,4 +1,4 @@
selenium.version = 2.31.0
selenium.version = 2.33.0
production.hostnames.regex = qa(\-selenium[0-9]*\.mv\.mozilla\.com|[0-9]*\-\w+)
nonaddressable.hostnames.regex = qa[0-9]*\-\w+
production.hub.host = qa-selenium.mv.mozilla.com

Просмотреть файл

@ -10,15 +10,15 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "18",
"firefox_binary": "/Applications/Firefox 18.app/Contents/MacOS/firefox-bin",
"version": "20",
"firefox_binary": "/Applications/Firefox 20.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "19",
"firefox_binary": "/Applications/Firefox 19.app/Contents/MacOS/firefox-bin",
"version": "21",
"firefox_binary": "/Applications/Firefox 21.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"

Просмотреть файл

@ -10,15 +10,15 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "18",
"firefox_binary": "/Applications/Firefox 18.app/Contents/MacOS/firefox-bin",
"version": "20",
"firefox_binary": "/Applications/Firefox 20.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "19",
"firefox_binary": "/Applications/Firefox 19.app/Contents/MacOS/firefox-bin",
"version": "21",
"firefox_binary": "/Applications/Firefox 21.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"

Просмотреть файл

@ -10,15 +10,15 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "18",
"firefox_binary": "C:/Program Files/Mozilla Firefox 18/firefox.exe",
"version": "20",
"firefox_binary": "C:/Program Files/Mozilla Firefox 20/firefox.exe",
"platform": "WINDOWS",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "19",
"firefox_binary": "C:/Program Files/Mozilla Firefox 19/firefox.exe",
"version": "21",
"firefox_binary": "C:/Program Files/Mozilla Firefox 21/firefox.exe",
"platform": "WINDOWS",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"

Просмотреть файл

@ -10,15 +10,15 @@
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "18",
"firefox_binary": "C:/Program Files/Mozilla Firefox 18/firefox.exe",
"version": "20",
"firefox_binary": "C:/Program Files/Mozilla Firefox 20/firefox.exe",
"platform": "WINDOWS",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "19",
"firefox_binary": "C:/Program Files/Mozilla Firefox 19/firefox.exe",
"version": "21",
"firefox_binary": "C:/Program Files/Mozilla Firefox 21/firefox.exe",
"platform": "WINDOWS",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"