From 2fd48bf8437abc8747dd7a091fc74a149c7cc1b6 Mon Sep 17 00:00:00 2001 From: Mika Petteri Korhonen Date: Tue, 20 Dec 2011 14:31:54 +0200 Subject: [PATCH 1/4] Added the get text since it is allso in the original seleniumLibrary and it brakes my tests without it :) --- src/Selenium2Library/keywords/_element.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Selenium2Library/keywords/_element.py b/src/Selenium2Library/keywords/_element.py index 1fd2b764a..c3376050b 100644 --- a/src/Selenium2Library/keywords/_element.py +++ b/src/Selenium2Library/keywords/_element.py @@ -228,7 +228,14 @@ def get_value(self, locator): See `introduction` for details about locating elements. """ return self._get_value(locator) + + def get_text(self, locator): + """Returns the text value of element identified by `locator`. + See `introduction` for details about locating elements. + """ + return self._get_text(locator) + def get_vertical_position(self, locator): """Returns vertical position of element identified by `locator`. From d259be17694fbfa39ffe2f2fb2e7b35919da920e Mon Sep 17 00:00:00 2001 From: Mika Petteri Korhonen Date: Wed, 21 Dec 2011 12:20:32 +0200 Subject: [PATCH 2/4] https://github.com/adwu73/robotframework-selenium2library/commit/dbd2e3c691dc8068fecdcc459e6a04a20842714d --- src/Selenium2Library/keywords/_element.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Selenium2Library/keywords/_element.py b/src/Selenium2Library/keywords/_element.py index c3376050b..f76a73f3d 100644 --- a/src/Selenium2Library/keywords/_element.py +++ b/src/Selenium2Library/keywords/_element.py @@ -228,14 +228,7 @@ def get_value(self, locator): See `introduction` for details about locating elements. """ return self._get_value(locator) - - def get_text(self, locator): - """Returns the text value of element identified by `locator`. - See `introduction` for details about locating elements. - """ - return self._get_text(locator) - def get_vertical_position(self, locator): """Returns vertical position of element identified by `locator`. @@ -514,7 +507,10 @@ def _element_find(self, locator, first_only, required, tag=None): def _frame_contains(self, locator, text): browser = self._current_browser() - element = self._element_find(locator, True, True, 'frame') + try: + element = self._element_find(locator, True, True, tag='iframe') + except ValueError: + element = self._element_find(locator, True, True, tag='frame') browser.switch_to_frame(element) self._info("Searching for text from frame '%s'." % locator) found = self._is_text_present(text) @@ -595,7 +591,10 @@ def _page_contains(self, text): if self._is_text_present(text): return True - subframes = self._element_find("tag=frame", False, False, 'frame') + try: + subframes = self._element_find("tag=iframe", False, False, 'iframe') + except ValueError: + subframes = self._element_find("tag=frame", False, False, 'frame') self._debug('Current frame has %d subframes' % len(subframes)) for frame in subframes: browser.switch_to_frame(frame) @@ -626,4 +625,3 @@ def _page_should_not_contain_element(self, locator, tag, message, loglevel): raise AssertionError(message) self._info("Current page does not contain %s '%s'." % (element_name, locator)) - From 836b58c3f4de94e002cc66201955b2675b254c09 Mon Sep 17 00:00:00 2001 From: Mika Petteri Korhonen Date: Wed, 21 Dec 2011 12:24:56 +0200 Subject: [PATCH 3/4] added the get_text back. --- src/Selenium2Library/keywords/_element.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Selenium2Library/keywords/_element.py b/src/Selenium2Library/keywords/_element.py index f76a73f3d..1a6cdc469 100644 --- a/src/Selenium2Library/keywords/_element.py +++ b/src/Selenium2Library/keywords/_element.py @@ -228,6 +228,13 @@ def get_value(self, locator): See `introduction` for details about locating elements. """ return self._get_value(locator) + + def get_text(self, locator): + """Returns the text value of element identified by `locator`. + + See `introduction` for details about locating elements. + """ + return self._get_text(locator) def get_vertical_position(self, locator): """Returns vertical position of element identified by `locator`. From 6416133c5b9dd5806fccc8b1636dbcac45a63979 Mon Sep 17 00:00:00 2001 From: Mika Petteri Korhonen Date: Wed, 21 Dec 2011 12:26:04 +0200 Subject: [PATCH 4/4] https://github.com/adwu73/robotframework-selenium2library/blob/c126cef041df22114f7c3a0d3e5e314ced35ad54/src/Selenium2Library/keywords/_browsermanagement.py --- src/Selenium2Library/keywords/_browsermanagement.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Selenium2Library/keywords/_browsermanagement.py b/src/Selenium2Library/keywords/_browsermanagement.py index 6101fe41d..6fbc74b83 100644 --- a/src/Selenium2Library/keywords/_browsermanagement.py +++ b/src/Selenium2Library/keywords/_browsermanagement.py @@ -154,7 +154,10 @@ def select_frame(self, locator): details about locating elements. """ self._info("Selecting frame '%s'." % locator) - element = self._element_find(locator, True, True, tag='frame') + try: + element = self._element_find(locator, True, True, tag='iframe') + except ValueError: + element = self._element_find(locator, True, True, tag='frame') self._current_browser().switch_to_frame(element) def select_window(self, locator=None): @@ -366,4 +369,3 @@ def _make_browser(self, browser_name): browser.set_script_timeout(self._timeout_in_secs) return browser -