Merge pull request #41 from mozilla/latest-version

Move 19 into master

default.properties

@@ -1,4 +1,4 @@
-selenium.version=2.17.0
+selenium.version=2.19.0
 mozilla.hub.host=qa-selenium.mv.mozilla.com
 hub.port=4444
 node.configuration.file=mac.json

grid_configuration.yml

@@ -8,6 +8,8 @@ hub:
          browser: "*firefox /Applications/Firefox 8.app/Contents/MacOS/firefox-bin"
        - name: "Firefox 9 on Mac OS X"
          browser: "*firefox /Applications/Firefox 9.app/Contents/MacOS/firefox-bin"
+       - name: "Firefox 10 on Mac OS X"
+         browser: "*firefox /Applications/Firefox 10.app/Contents/MacOS/firefox-bin"
        - name: "Firefox Beta on Mac OS X"
          browser: "*firefox /Applications/Firefox Beta.app/Contents/MacOS/firefox-bin"
        - name: "Firefox Aurora on Mac OS X"
@@ -22,6 +24,8 @@ hub:
          browser: "*firefox C:/Program Files/Mozilla Firefox 8/firefox.exe"
        - name: "Firefox 9 on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox 9/firefox.exe"
+       - name: "Firefox 10 on Windows Vista"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
        - name: "Firefox Beta on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows Vista"
@@ -40,6 +44,8 @@ hub:
          browser: "*firefox C:/Program Files/Mozilla Firefox 8/firefox.exe"
        - name: "Firefox 9 on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox 9/firefox.exe"
+       - name: "Firefox 10 on Windows 7"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
        - name: "Firefox Beta on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows 7"

mac.json

@@ -17,6 +17,10 @@
                 "browserName": "Firefox 9 on Mac OS X",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 10 on Mac OS X",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Mac OS X",
                 "maxInstances": 5,
@@ -57,6 +61,13 @@
                 "platform": "MAC",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "10",
+                "firefox_binary": "/Applications/Firefox 10.app/Contents/MacOS/firefox-bin",
+                "platform": "MAC",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",

win7.json

@@ -17,6 +17,10 @@
                 "browserName": "Firefox 9 on Windows 7",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 10 on Windows 7",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Windows 7",
                 "maxInstances": 5,
@@ -61,6 +65,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "10",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 10/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",

winvista.json

@@ -17,6 +17,10 @@
                 "browserName": "Firefox 9 on Windows Vista",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 10 on Windows Vista",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Windows Vista",
                 "maxInstances": 5,
@@ -61,6 +65,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "10",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 10/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",