From 0309f9bb4d7bf45fe0c6fb6d8a78a0f40c467a85 Mon Sep 17 00:00:00 2001 From: "Weitz, Eric" Date: Fri, 15 Aug 2014 17:07:15 -0400 Subject: [PATCH 1/5] QAR-48273: Fixed build failure caused by extra content in output.xml --- test/acceptance/create_webdriver.txt | 2 +- .../keywords/content_assertions.txt | 22 +++++++++---------- test/acceptance/keywords/screenshots.txt | 2 +- test/run_tests.py | 2 ++ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/test/acceptance/create_webdriver.txt b/test/acceptance/create_webdriver.txt index 7aba6256e..6f7fe2134 100644 --- a/test/acceptance/create_webdriver.txt +++ b/test/acceptance/create_webdriver.txt @@ -4,7 +4,7 @@ Library Collections *Test Cases* Create Webdriver Creates Functioning WebDriver - [Documentation] LOG 2:1 INFO REGEXP: Creating an instance of the \\w+ WebDriver LOG 2:3 DEBUG REGEXP: Created \\w+ WebDriver instance with session id (\\w|-)+ + [Documentation] LOG 2:1 INFO REGEXP: Creating an instance of the \\w+ WebDriver LOG 2:4 DEBUG REGEXP: Created \\w+ WebDriver instance with session id (\\w|-)+ [Setup] Set Driver Variables Create Webdriver ${DRIVER_NAME} kwargs=${KWARGS} Go To ${FRONT PAGE} diff --git a/test/acceptance/keywords/content_assertions.txt b/test/acceptance/keywords/content_assertions.txt index fec2d1d35..d7a546a95 100644 --- a/test/acceptance/keywords/content_assertions.txt +++ b/test/acceptance/keywords/content_assertions.txt @@ -6,28 +6,28 @@ Resource ../resource.txt *** Test Cases *** Location Should Be - [Documentation] LOG 2:2 Current location is '${FRONT PAGE}'. + [Documentation] LOG 2:3 Current location is '${FRONT PAGE}'. Location Should Be ${FRONT PAGE} Run Keyword And Expect Error Location should have been 'non existing' but was '${FRONT PAGE}' Location Should Be non existing Location Should Contain - [Documentation] LOG 2:2 Current location contains 'html'. + [Documentation] LOG 2:3 Current location contains 'html'. Location Should Contain html Run Keyword And Expect Error Location should have contained 'not a location' but it was '${FRONT PAGE}'. Location Should Contain not a location Title Should Be - [Documentation] LOG 2:2 Page title is '(root)/index.html'. + [Documentation] LOG 2:3 Page title is '(root)/index.html'. Title Should Be (root)/index.html Run Keyword And Expect Error Title should have been 'not a title' but was '(root)/index.html' Title Should Be not a title Page Should Contain - [Documentation] LOG 2:3 Current page contains text 'needle'. LOG 4.1:6 REGEXP: (?i) + [Documentation] LOG 2:5 Current page contains text 'needle'. LOG 4.1:10 REGEXP: (?i) Page Should Contain needle Page Should Contain This is the haystack Run Keyword And Expect Error Page should have contained text 'non existing text' but did not Page Should Contain non existing text Page Should Contain With Custom Log Level - [Documentation] LOG 2.1:6 DEBUG REGEXP: (?i) + [Documentation] LOG 2.1:10 DEBUG REGEXP: (?i) Run Keyword And Expect Error Page should have contained text 'non existing text' but did not Page Should Contain non existing text DEBUG Page Should Contain With Disabling Source Logging @@ -41,12 +41,12 @@ Page Should Contain With Frames Page Should Contain You're looking at right. Page Should Not Contain - [Documentation] LOG 2:5 Current page does not contain text 'non existing text'. LOG 3.1:4 REGEXP: (?i) + [Documentation] LOG 2:8 Current page does not contain text 'non existing text'. LOG 3.1:7 REGEXP: (?i) Page Should Not Contain non existing text Run Keyword And Expect Error Page should not have contained text 'needle' Page Should Not Contain needle Page Should Not Contain With Custom Log Level - [Documentation] LOG 2.1:4 DEBUG REGEXP: (?i) + [Documentation] LOG 2.1:7 DEBUG REGEXP: (?i) Run Keyword And Expect Error Page should not have contained text 'needle' Page Should Not Contain needle DEBUG Page Should Not Contain With Disabling Source Logging @@ -103,14 +103,14 @@ Element Should Not Be Visible Run Keyword And Expect Error The element 'i_am_visible' should not be visible, but it is. Element Should Not Be Visible i_am_visible Page Should Contain Checkbox - [Documentation] LOG 2:3 Current page contains checkbox 'can_send_email'. + [Documentation] LOG 2:5 Current page contains checkbox 'can_send_email'. [Setup] Go To Page "forms/prefilled_email_form.html" Page Should Contain Checkbox can_send_email Page Should Contain Checkbox xpath=//input[@type='checkbox' and @name='can_send_sms'] Run Keyword And Expect Error Page should have contained checkbox 'non-existing' but did not Page Should Contain Checkbox non-existing Page Should Not Contain Checkbox - [Documentation] LOG 2:3 Current page does not contain checkbox 'non-existing'. + [Documentation] LOG 2:5 Current page does not contain checkbox 'non-existing'. [Setup] Go To Page "forms/prefilled_email_form.html" Page Should Not Contain Checkbox non-existing Run Keyword And Expect Error Page should not have contained checkbox 'can_send_email' Page Should Not Contain Checkbox can_send_email @@ -169,7 +169,7 @@ Page Should Not Contain Text Field Run Keyword And Expect Error Page should not have contained text field 'name' Page Should Not Contain Text Field name TextField Should Contain - [Documentation] LOG 2:4 Text field 'name' contains text ''. + [Documentation] LOG 2:7 Text field 'name' contains text ''. [Setup] Go To Page "forms/email_form.html" TextField Should contain name ${EMPTY} Input Text name my name @@ -177,7 +177,7 @@ TextField Should Contain Run Keyword And Expect Error Text field 'name' should have contained text 'non-existing' but it contained 'my name' TextField Should contain name non-existing TextField Value Should Be - [Documentation] LOG 2:4 Content of text field 'name' is ''. + [Documentation] LOG 2:7 Content of text field 'name' is ''. [Setup] Go To Page "forms/email_form.html" textfield Value Should Be name ${EMPTY} Input Text name my name diff --git a/test/acceptance/keywords/screenshots.txt b/test/acceptance/keywords/screenshots.txt index cf3d86844..95c95f7ba 100644 --- a/test/acceptance/keywords/screenshots.txt +++ b/test/acceptance/keywords/screenshots.txt @@ -6,7 +6,7 @@ Suite Setup Go To Page "links.html" * Test Cases * Capture page screenshot to default location - [Documentation] LOG 2:2 REGEXP: + [Documentation] LOG 2:3 REGEXP: [Setup] Remove Files ${OUTPUTDIR}/selenium-screenshot-*.png Capture Page Screenshot ${count} = Count Files In Directory ${OUTPUTDIR} selenium-screenshot-*.png diff --git a/test/run_tests.py b/test/run_tests.py index 61929296d..e8e009744 100755 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -63,6 +63,8 @@ def process_output(args): rebot = 'rebot' if os.sep == '/' else 'rebot.bat' rebot_cmd = [rebot] + [ arg % ARG_VALUES for arg in REBOT_ARGS ] + args + \ [os.path.join(ARG_VALUES['outdir'], 'output.xml') ] + print '' + print 'Starting output processing with command:\n' + ' '.join(rebot_cmd) rc = call(rebot_cmd, env=os.environ) if rc == 0: print 'All critical tests passed' From f7835852e40ecb35399ac9fdbeee8c706706b542 Mon Sep 17 00:00:00 2001 From: "Weitz, Eric" Date: Fri, 15 Aug 2014 17:33:17 -0400 Subject: [PATCH 2/5] QAR-48273: Applied fix for 'Choose File' bug, from Helio Guilherme (532295cbce) --- test/acceptance/keywords/forms_and_buttons.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/acceptance/keywords/forms_and_buttons.txt b/test/acceptance/keywords/forms_and_buttons.txt index 73deadf02..5eea3965d 100644 --- a/test/acceptance/keywords/forms_and_buttons.txt +++ b/test/acceptance/keywords/forms_and_buttons.txt @@ -52,10 +52,11 @@ Click button created with