Merge branch 'add-safari-browser'

emanlove · Nov 5, 2013 · fd68fc5 · fd68fc5
2 parents cf971d9 + 3cd5ba2
commit fd68fc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+1.5 (unreleased)
+----------------
+- Added Safari Browser.
+  [zmlpjuran]
+
 1.4
 ---
 - Added keywords for verifying text entered into textarea elements.

diff --git a/src/Selenium2Library/keywords/_browsermanagement.py b/src/Selenium2Library/keywords/_browsermanagement.py
@@ -21,7 +21,8 @@
                  'htmlunit' : "_make_htmlunit",
                  'htmlunitwithjs' : "_make_htmlunitwithjs",
                  'android': "_make_android",
-                 'iphone': "_make_iphone"
+                 'iphone': "_make_iphone",
+                 'safari': "_make_safari"
                 }
 
 class _BrowserManagementKeywords(KeywordGroup):
@@ -82,6 +83,7 @@ def open_browser(self, url, browser='firefox', alias=None,remote_url=False,
         | htmlunitwithjs   | HTMLUnit with Javascipt support |
         | android          | Android       |
         | iphone           | Iphone        |
+        | safari           | Safari        |
 
 
         Note, that you will encounter strange behavior, if you open
@@ -477,6 +479,9 @@ def _make_iphone(self , remote , desired_capabilities , profile_dir):
         return self._generic_make_browser(webdriver.Remote,
                 webdriver.DesiredCapabilities.IPHONE, remote, desired_capabilities)
 
+    def _make_safari(self , remote , desired_capabilities , profile_dir):
+        return self._generic_make_browser(webdriver.Safari,
+                webdriver.DesiredCapabilities.SAFARI, remote, desired_capabilities)
 
     def _generic_make_browser(self, webdriver_type , desired_cap_type, remote_url, desired_caps):
         '''most of the make browser functions just call this function which creates the