Merge with master

Author: just-be-dev

CHANGES.rst

@@ -5,8 +5,17 @@ Release Notes
 ----------------
 - Added an argument called screenshot_root_directory that can be passed into S2L's
   constructor to specify where to store screenshots.
+- Added new keyword 'set_screenshot_directory' which can be used to set the output
+  of screenshots.
   [zephraph]
 
+- Added new keyword Input Text Into Prompt
+- Modified 'get_alert_message' to accept a parameter 'dismiss' (defaults to true) which can be
+  used to prevent closing the alert message and instead will just return the alerts text.
+  Also created new keyword 'dismiss_alert' to dismiss (default) or confirm the alert without
+  reading the text of the alert.
+  [KingWarin]
+
 - Added new keyword Input Text Into Prompt
   [boakley][ekasteel]
 

src/Selenium2Library/keywords/_javascript.py

@@ -120,28 +120,59 @@ def execute_async_javascript(self, *code):
         self._info("Executing Asynchronous JavaScript:\n%s" % js)
         return self._current_browser().execute_async_script(js)
 
-    def get_alert_message(self):
+    def get_alert_message(self, dismiss=True):
         """Returns the text of current JavaScript alert.
 
+        By default the current JavaScript alert will be dismissed.
         This keyword will fail if no alert is present. Note that
         following keywords will fail unless the alert is
         dismissed by this keyword or another like `Get Alert Message`.
         """
-        return self._close_alert()
+        if dismiss:
+            return self._close_alert()
+        else:
+            return self._read_alert()
+
+    def dismiss_alert(self, accept=True):
+        """ Returns true if alert was confirmed, false if it was dismissed
+
+        This keyword will fail if no alert is present. Note that
+        following keywords will fail unless the alert is
+        dismissed by this keyword or another like `Get Alert Message`.
+        """
+        return self._handle_alert(accept)
 
     # Private
 
-    def _close_alert(self, confirm=False):
+    def _close_alert(self, confirm=True):
+        try:
+            text = self._read_alert()
+            alert = self._handle_alert(confirm)
+            return text
+        except WebDriverException:
+            raise RuntimeError('There were no alerts')
+
+    def _read_alert(self):
         alert = None
         try:
             alert = self._current_browser().switch_to_alert()
             text = ' '.join(alert.text.splitlines()) # collapse new lines chars
-            if not confirm: alert.dismiss()
-            else: alert.accept()
             return text
         except WebDriverException:
             raise RuntimeError('There were no alerts')
 
+    def _handle_alert(self, confirm=True):
+        try:
+            alert = self._current_browser().switch_to_alert()
+            if not confirm:
+                alert.dismiss()
+                return False
+            else:
+                alert.accept()
+                return True
+        except WebDriverException:
+            raise RuntimeError('There were no alerts')
+
     def _get_javascript_to_execute(self, code):
         codepath = code.replace('/', os.sep)
         if not (os.path.isabs(codepath) and os.path.isfile(codepath)):

test/acceptance/keywords/javascript.robot

@@ -24,6 +24,14 @@ Get Alert Message
     Should Be Equal  ${msg}  ALERT!
     Run Keyword And Expect Error  There were no alerts  Get Alert Message
 
+Read Alert Message
+    [Setup]  Go To Page "javascript/alert.html"
+    Click Link  Click Me!
+    ${msg} =  Get Alert Message  ${FALSE}
+    Should Be Equal  ${msg}  ALERT!
+    Dismiss Alert
+    Run Keyword And Expect Error  There were no alerts  Get Alert Message
+
 Mouse Down On Link
     [TAGS]  Known Issue - Firefox
     [Setup]  Go To Page "javascript/mouse_events.html"