Merge branch 'master' into latest-version

mozilla · Apr 11, 2012 · 45acc20 · 45acc20
2 parents 39da857 + 2b41e41
commit 45acc20
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/grid_configuration.yml b/grid_configuration.yml
@@ -10,6 +10,8 @@ hub:
          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 11 on Mac OS X"
+         browser: "*firefox /Applications/Firefox 11.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"
@@ -26,6 +28,8 @@ hub:
          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 11 on Windows Vista"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
        - name: "Firefox Beta on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows Vista"
@@ -46,6 +50,8 @@ hub:
          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 11 on Windows 7"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"         
        - name: "Firefox Beta on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows 7"

diff --git a/mac.json b/mac.json
@@ -21,6 +21,10 @@
                 "browserName": "Firefox 10 on Mac OS X",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 11 on Mac OS X",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Mac OS X",
                 "maxInstances": 5,
@@ -68,6 +72,13 @@
                 "platform": "MAC",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "11",
+                "firefox_binary": "/Applications/Firefox 11.app/Contents/MacOS/firefox-bin",
+                "platform": "MAC",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",

diff --git a/win7.json b/win7.json
@@ -21,6 +21,10 @@
                 "browserName": "Firefox 10 on Windows 7",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 11 on Windows 7",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Windows 7",
                 "maxInstances": 5,
@@ -72,6 +76,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "11",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 11/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",

diff --git a/winvista.json b/winvista.json
@@ -21,6 +21,10 @@
                 "browserName": "Firefox 10 on Windows Vista",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 11 on Windows Vista",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Windows Vista",
                 "maxInstances": 5,
@@ -72,6 +76,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "11",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 11/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",