diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index ada91ae7..74aabac3 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -198,11 +198,6 @@ Primate College of America - - selectWindow - null - - click //div[@id='wrapper-content']/ul/li[14] @@ -210,7 +205,7 @@ clickAndWait - //h3[@id='offersDegree']/a/img + css=a.add-offers > img.add-individual diff --git a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html index 4a623e13..eba90b20 100644 --- a/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html +++ b/utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html @@ -86,11 +86,6 @@ - - selectWindow - null - - click //div[@id='wrapper-content']/ul/li[20] @@ -108,12 +103,17 @@ verifyTextPresent - Featured Presentations + Hello RDF! verifyTextPresent - Hello RDF! + Tweets + + + + verifyTextPresent + Featured Presentations @@ -150,12 +150,7 @@ verifyTextPresent - Google site search: full text search results - - - - verifyTextPresent - First 20 UCSF Profile Pages found + KNODE Search Results diff --git a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html index 5657ada2..38fae457 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CheckResults.html +++ b/utilities/acceptance-tests/suites/ShortViews/CheckResults.html @@ -115,11 +115,21 @@ link=Foxtrot, Echo + + verifyTextPresent + Foxtrot, Echo Member of Department B + + verifyElementPresent link=Henry, George + + verifyTextPresent + Henry, George + + clickAndWait @@ -168,7 +178,7 @@ verifyTextPresent - Foxtrot, Echo Faculty Member + Foxtrot, Echo Faculty Member Member of Department B @@ -186,6 +196,11 @@ link=Henry, George + + verifyTextPresent + Jenkins, Iris + + verifyElementPresent link=Jenkins, Iris @@ -234,7 +249,7 @@ verifyTextPresent - Foxtrot, Echo + Member of Department B @@ -293,6 +308,11 @@ Faculty Member + + verifyTextPresent + Member of Department B + + verifyElementPresent link=Henry, George @@ -326,22 +346,7 @@ verifyTextPresent - Jenkins, Iris Person - - - - verifyElementPresent - link=Jenkins, Iris - - - - verifyTextPresent - Baker, Able Professor - - - - verifyElementPresent - link=Baker, Able + Search results for 'person' @@ -356,7 +361,17 @@ verifyTextPresent - Foxtrot, Echo Faculty Member + Baker, Able Professor + + + + verifyElementPresent + link=Baker, Able + + + + verifyTextPresent + Foxtrot, Echo Faculty Member Member of Department B @@ -364,6 +379,16 @@ link=Foxtrot, Echo + + verifyTextPresent + Jenkins, Iris Person + + + + verifyElementPresent + link=Jenkins, Iris + + verifyTextPresent Henry, George Faculty Member @@ -400,11 +425,6 @@ Academic Department - - selectWindow - null - - verifyTextPresent Department A Located in Building A diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html index cc333708..29210b35 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestDepartments.html @@ -100,9 +100,14 @@ Department A + + click + //div[@id='wrapper-content']/ul/li[14] + + clickAndWait - css=a.add-hasGeographicLocation > img.add-individual + css=a.add-RO_0001025 > img.add-individual @@ -197,11 +202,21 @@ Academic Department + + verifyTextPresent + Department A Located in Building A + + verifyElementPresent link=Department A + + verifyTextPresent + Department B + + verifyElementPresent link=Department B @@ -219,12 +234,12 @@ clickAndWait - link=Building + link=Campus assertTitle - Building + Campus @@ -232,6 +247,21 @@ link=Building A + + clickAndWait + link=Building A + + + + assertTitle + Building A + + + + verifyElementPresent + link=Department A + + clickAndWait diff --git a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html index a36dd32e..2a9c9612 100644 --- a/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html +++ b/utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html @@ -270,7 +270,7 @@ clickAndWait - xpath=(//img[@alt='add'])[9] + css=a.add-RO_0000053 > img.add-individual @@ -437,11 +437,21 @@ Faculty Member (4) + + verifyElementPresent + link=Faculty Member + + verifyTextPresent Person (5) + + verifyElementPresent + link=Person + + clickAndWait link=Faculty Member @@ -457,21 +467,41 @@ Faculty Member + + verifyTextPresent + Baker, Able Professor + + verifyElementPresent link=Baker, Able + + verifyTextPresent + Dog, Charlie Member of Department A + + verifyElementPresent link=Dog, Charlie + + verifyTextPresent + Foxtrot, Echo Member of Department B + + verifyElementPresent link=Foxtrot, Echo + + verifyTextPresent + Henry, George + + verifyElementPresent link=Henry, George @@ -502,26 +532,51 @@ Person + + verifyTextPresent + Baker, Able Professor + + verifyElementPresent link=Baker, Able + + verifyTextPresent + Dog, Charlie Faculty Member Member of Department A + + verifyElementPresent link=Dog, Charlie + + verifyTextPresent + Foxtrot, Echo Faculty Member Member of Department B + + verifyElementPresent link=Foxtrot, Echo + + verifyTextPresent + Henry, George Faculty Member + + verifyElementPresent link=Henry, George + + verifyTextPresent + Jenkins, Iris + + verifyElementPresent link=Jenkins, Iris diff --git a/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html b/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html index 45c496ca..7feddd78 100644 --- a/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html +++ b/utilities/acceptance-tests/suites/ShortViews/DeleteTestDepartments.html @@ -207,12 +207,12 @@ clickAndWait - link=Building + link=Campus assertTitle - Building + Campus