[robotframework] 2 new revisions pushed by pekka.klarck on 2013-10-21 12:13 GMT

[robotframework]

2 new revisions:

Revision: 90f2a3f85abb
Branch:   default
Author:   Pekka Klärck
Date:     Mon Oct 21 12:10:51 2013 UTC
Log:      fixed tests broken by escaping '</script>' like '\x3c/script>' in  
js
http://code.google.com/p/robotframework/source/detail?r=90f2a3f85abb
Revision: 853a2e803d4f
Branch:   default
Author:   Pekka Klärck
Date:     Mon Oct 21 12:13:25 2013 UTC
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=853a2e803d4f

==============================================================================
Revision: 90f2a3f85abb
Branch:   default
Author:   Pekka Klärck
Date:     Mon Oct 21 12:10:51 2013 UTC
Log:      fixed tests broken by escaping '</script>' like '\x3c/script>' in  
js
http://code.google.com/p/robotframework/source/detail?r=90f2a3f85abb

Modified:
 /atest/robot/libdoc/LibDocLib.py
 /atest/robot/running/html_error_message.txt

=======================================
--- /atest/robot/libdoc/LibDocLib.py    Thu Oct  4 13:30:03 2012 UTC
+++ /atest/robot/libdoc/LibDocLib.py    Mon Oct 21 12:10:51 2013 UTC
@@ -30,7 +30,7 @@
     def get_libdoc_model_from_html(self, path):
         with open(path) as html_file:
             model_string = self._find_model(html_file)
-        model = json.loads(model_string)
+        model = json.loads(model_string.replace('\\x3c/', '</'))
         logger.info(pprint.pformat(model))
         return model

=======================================
--- /atest/robot/running/html_error_message.txt Wed May  8 08:36:35 2013 UTC
+++ /atest/robot/running/html_error_message.txt Mon Oct 21 12:10:51 2013 UTC
@@ -9,14 +9,14 @@

 *** Test Cases ***
 HTML message in log
-    ${content} =         Get File   ${OUTDIR}/log.html
-    Should Contain       ${content}   ${FAILURE}
-    Should Contain       ${content}   ${MESSAGE}
+    ${content} =    Get File   ${OUTDIR}/log.html
+    Should Contain Escaped    ${content}    ${FAILURE}
+    Should Contain Escaped    ${content}    ${MESSAGE}

 HTML message in report
-    ${content} =         Get File   ${OUTDIR}/report.html
-    Should Contain       ${content}   ${FAILURE}
-    Should Contain       ${content}   ${MESSAGE}
+    ${content} =    Get File   ${OUTDIR}/report.html
+    Should Contain Escaped    ${content}    ${FAILURE}
+    Should Contain Escaped    ${content}    ${MESSAGE}

 Failure message in log uses HTML
     ${tc} =    Check Test Case    HTML Failure
@@ -25,3 +25,8 @@
 `Set Test Message` keyword logs using HTML
     ${tc} =    Check Test Case    Set Test Message
     Check Log Message    ${tc.kws[0].msgs[0]}    Set test message  
to:\n${MESSAGE}    html=True
+
+*** Keywords ***
+Should Contain Escaped
+    [Arguments]    ${content}    ${expected}
+    Should Contain    ${content}    ${expected.replace('</', '\\x3c/')}

==============================================================================
Revision: 853a2e803d4f
Branch:   default
Author:   Pekka Klärck
Date:     Mon Oct 21 12:13:25 2013 UTC
Log:      Automated merge with https://code.google.com/p/robotframework/
http://code.google.com/p/robotframework/source/detail?r=853a2e803d4f


--

--- 
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.