From 72438886823d6092c69e63cc6d96fa1160766407 Mon Sep 17 00:00:00 2001 From: Sergiu QA Date: Mon, 24 Oct 2016 17:42:17 +0300 Subject: [PATCH 01/12] Adding method to get browser logs --- src/Selenium2Library/keywords/_browsermanagement.py | 8 ++++++++ test/acceptance/keywords/javascript.robot | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/Selenium2Library/keywords/_browsermanagement.py b/src/Selenium2Library/keywords/_browsermanagement.py index a4fbc7a65..3debeee2f 100644 --- a/src/Selenium2Library/keywords/_browsermanagement.py +++ b/src/Selenium2Library/keywords/_browsermanagement.py @@ -331,6 +331,14 @@ def select_window(self, locator=None): pass finally: self._window_manager.select(self._current_browser(), locator) + + def get_log(self, log_type): + """Get the log for a given selenium log type + + The `log_type` argument defines which logs to get. Possible values are: + `browser`, `driver`, `client` or `server` + """ + return self._current_browser().get_log(log_type) def list_windows(self): """Return all current window handles as a list""" diff --git a/test/acceptance/keywords/javascript.robot b/test/acceptance/keywords/javascript.robot index 552b3c44b..760f045ea 100644 --- a/test/acceptance/keywords/javascript.robot +++ b/test/acceptance/keywords/javascript.robot @@ -107,3 +107,12 @@ Drag and Drop by Offset Element Text Should Be id=droppable Drop here Drag and Drop by Offset id=draggable ${100} ${20} Element Text Should Be id=droppable Dropped! + +Verify Console Log Can be Caucht + ${message} Set Variable Sample Console Error + Execute Javascript console.error("${message}") + ${logs}= Get Log browser + ${length}= Get Length ${logs} + ${last pos}= Evaluate ${length}-1 + &{err}= Set Variable @{logs}[${last pos}] + Should Contain ${err.message} ${message} \ No newline at end of file From 5d6cfa044f5eba7f46608671f87c622d2f85567e Mon Sep 17 00:00:00 2001 From: Sergiu QA Date: Mon, 24 Oct 2016 18:03:21 +0300 Subject: [PATCH 02/12] Fixing a typo --- test/acceptance/keywords/javascript.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/acceptance/keywords/javascript.robot b/test/acceptance/keywords/javascript.robot index 760f045ea..49ed1c19a 100644 --- a/test/acceptance/keywords/javascript.robot +++ b/test/acceptance/keywords/javascript.robot @@ -108,7 +108,7 @@ Drag and Drop by Offset Drag and Drop by Offset id=draggable ${100} ${20} Element Text Should Be id=droppable Dropped! -Verify Console Log Can be Caucht +Verify Console Log Can be Caught ${message} Set Variable Sample Console Error Execute Javascript console.error("${message}") ${logs}= Get Log browser From 54aca860d3e6da07ffbaa6857de0111dc7af2369 Mon Sep 17 00:00:00 2001 From: Sergiu QA Date: Mon, 24 Oct 2016 21:59:41 +0300 Subject: [PATCH 03/12] It seems like double quote doesn't work on CI --- test/acceptance/keywords/javascript.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/acceptance/keywords/javascript.robot b/test/acceptance/keywords/javascript.robot index 49ed1c19a..4245f75d2 100644 --- a/test/acceptance/keywords/javascript.robot +++ b/test/acceptance/keywords/javascript.robot @@ -110,7 +110,7 @@ Drag and Drop by Offset Verify Console Log Can be Caught ${message} Set Variable Sample Console Error - Execute Javascript console.error("${message}") + Execute Javascript console.error('${message}') ${logs}= Get Log browser ${length}= Get Length ${logs} ${last pos}= Evaluate ${length}-1 From 41311554023060ccaef35b224b5ac3bac9a2c58a Mon Sep 17 00:00:00 2001 From: Sergiu QA Date: Tue, 25 Oct 2016 15:43:30 +0300 Subject: [PATCH 04/12] Improvements after runing on Travis CI --- src/Selenium2Library/keywords/_browsermanagement.py | 4 ++++ test/acceptance/keywords/javascript.robot | 2 +- test/resources/html/javascript/dynamic_content.html | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Selenium2Library/keywords/_browsermanagement.py b/src/Selenium2Library/keywords/_browsermanagement.py index 3debeee2f..418e29ea5 100644 --- a/src/Selenium2Library/keywords/_browsermanagement.py +++ b/src/Selenium2Library/keywords/_browsermanagement.py @@ -338,6 +338,10 @@ def get_log(self, log_type): The `log_type` argument defines which logs to get. Possible values are: `browser`, `driver`, `client` or `server` """ + available_types = ["browser", "driver", "client" , "server"] + if log_type not in available_types: + raise ValueErrorValueError(log_type + " is not a supported type") + return self._current_browser().get_log(log_type) def list_windows(self): diff --git a/test/acceptance/keywords/javascript.robot b/test/acceptance/keywords/javascript.robot index 4245f75d2..b1a414c76 100644 --- a/test/acceptance/keywords/javascript.robot +++ b/test/acceptance/keywords/javascript.robot @@ -115,4 +115,4 @@ Verify Console Log Can be Caught ${length}= Get Length ${logs} ${last pos}= Evaluate ${length}-1 &{err}= Set Variable @{logs}[${last pos}] - Should Contain ${err.message} ${message} \ No newline at end of file + Should Contain ${err.message} ${message} diff --git a/test/resources/html/javascript/dynamic_content.html b/test/resources/html/javascript/dynamic_content.html index 4229fcf54..7e397f87a 100644 --- a/test/resources/html/javascript/dynamic_content.html +++ b/test/resources/html/javascript/dynamic_content.html @@ -1,4 +1,5 @@ + Original