From 4e62bf69bab11c7212d8c8b587e732af74bcdeae Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 9 Jul 2012 19:01:20 +0000 Subject: [PATCH] Holly made some changes to the more manual test suites... --- .../OpenSocialGadgets/CheckGadgets.html | 33 +++++-------------- .../SearchBoost/TestIndividualBoost.html | 14 ++++---- .../suites/ShortViews/CheckResults.html | 15 +++++++++ .../ShortViews/DeleteTestDepartments.html | 15 +++++++++ 4 files changed, 46 insertions(+), 31 deletions(-) diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html index 7cb30a61..0b8f2d13 100644 --- a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html +++ b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html @@ -136,17 +136,7 @@ verifyTextPresent - private - - - - click - link=Featured Presentations - - - - verifyTextPresent - private + Featured Presentations @@ -154,9 +144,14 @@ Hello RDF! + + comment + Try each one + + click - link=Websites + id=gadgets-gadget-title-image-0 @@ -176,7 +171,7 @@ click - link=Featured Presentations + id=gadgets-gadget-title-image-1 @@ -206,12 +201,7 @@ verifyTextPresent - Ontology - - - - verifyTextPresent - vivo-core-public-1.4 + Ontology @@ -274,11 +264,6 @@ remote_iframe_0 - - verifyTextPresent - profile, publications, research topics, and co-authors. - - comment Log out diff --git a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html b/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html index 58a6632e..52252721 100644 --- a/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html +++ b/utilities/acceptance-tests/suites/SearchBoost/TestIndividualBoost.html @@ -187,7 +187,7 @@ type name=rdfStream - C:\Users\hlm7.CORNELL\Desktop\BoostIndividual.txt + C:\VIVO\vivo\utilities\acceptance-tests\suites\SearchBoost\BoostIndividual.txt select @@ -282,18 +282,18 @@ type name=rdfStream - C:\Users\hlm7.CORNELL\Desktop\BoostIndividual.txt - - - click - xpath=(//input[@name='mode'])[3] - + C:\VIVO\vivo\utilities\acceptance-tests\suites\SearchBoost\BoostIndividual.txt select name=language label=N3 + + click + xpath=(//input[@name='mode'])[3] + + clickAndWait id=submit diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html index 789762eb..340e273a 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html +++ b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html @@ -279,6 +279,21 @@ Foxtrot, Echo + + verifyElementPresent + link=Henry, George + + + + verifyTextPresent + Henry, George + + + + verifyElementNotPresent + link=Jenkins, Iris + + comment Check Browse view of Person diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html b/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html index 483bad92..7a878bc4 100644 --- a/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html +++ b/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html @@ -149,6 +149,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration @@ -214,6 +219,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration @@ -279,6 +289,11 @@ Are you SURE you want to delete this individual? If in doubt, CANCEL. + + waitForPageToLoad + 5000 + + assertTitle VIVO Site Administration