Merge pull request #95 from mozilla/latest-version

Latest version => master Selenium 2.29
This commit is contained in:
Zac 2013-02-14 01:30:25 -08:00
Родитель ff0429e56b 04ee5edd3b
Коммит a8b735baba
6 изменённых файлов: 19 добавлений и 17 удалений

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

@ -113,6 +113,8 @@
failonerror="true">
<arg value="-role"/>
<arg value="node"/>
<arg value="-id"/>
<arg value="${env.HOSTNAME}"/>
<arg value="-hub"/>
<arg value="http://${hub.host}:${hub.port}/grid/register"/>
<arg value="-host"/>

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

@ -1,4 +1,4 @@
selenium.version = 2.28.0
selenium.version = 2.29.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": "16",
"firefox_binary": "/Applications/Firefox 16.app/Contents/MacOS/firefox-bin",
"version": "17",
"firefox_binary": "/Applications/Firefox 17.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"
}, {
"browserName": "firefox",
"version": "17",
"firefox_binary": "/Applications/Firefox 17.app/Contents/MacOS/firefox-bin",
"version": "18",
"firefox_binary": "/Applications/Firefox 18.app/Contents/MacOS/firefox-bin",
"platform": "MAC",
"maxInstances": 1,
"seleniumProtocol": "WebDriver"

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

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

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

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

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

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