diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html index 80fa873f..10e17ce7 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateOrganization.html @@ -431,7 +431,7 @@ assertTitle - Primate College of America + Edit diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html index 291f4fe0..501d9243 100644 --- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html +++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html @@ -66,7 +66,7 @@ clickAndWait - link=Search + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html index db09f129..791eeb12 100644 --- a/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html +++ b/utilities/acceptance-tests/suites/AddPublications/SearchPublications.html @@ -71,7 +71,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -206,7 +206,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -301,7 +301,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -376,7 +376,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -456,7 +456,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -511,7 +511,7 @@ clickAndWait - link=Search + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html index b25b9ec8..b667af2f 100644 --- a/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html +++ b/utilities/acceptance-tests/suites/AddRoles/VerifyAllRolesSearchable.html @@ -66,7 +66,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -141,7 +141,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -241,7 +241,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -341,7 +341,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -396,7 +396,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -426,7 +426,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -456,7 +456,7 @@ clickAndWait - link=Search + //input[@value='Search'] @@ -526,7 +526,7 @@ clickAndWait - link=Search + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html index 074dd0d6..2a5bba9f 100644 --- a/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html +++ b/utilities/acceptance-tests/suites/CreatePeople/UploadNonPersonImage.html @@ -306,7 +306,7 @@ clickAndWait - link=edit + //div[@id='dprop-vitro-image']/div/div/div/span/a[1] @@ -371,7 +371,7 @@ clickAndWait - link=edit + //div[@id='dprop-vitro-image']/div/div/div/span/a[1] @@ -382,7 +382,7 @@ type datafile - C:\VIVO\vivo-code\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg + C:\VIVO\vivo\utilities\acceptance-tests\suites\CreatePeople\germany2.jpg clickAndWait diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html index 7841568b..e3aaeed2 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/AddEducationBackground.html @@ -179,11 +179,6 @@ This field must not be empty. - - verifyTextPresent - Must either select an existing organization or create a new one. - - comment Verify entering just degree is not valid @@ -191,7 +186,7 @@ select - degreeUri + degree label=B.S. Bachelor of Science @@ -209,11 +204,6 @@ This field must not be empty. - - verifyTextPresent - Must either select an existing organization or create a new one. - - comment Verify entering just degree and major is not valid @@ -221,7 +211,7 @@ select - degreeUri + degree label=B.S. Bachelor of Science @@ -241,7 +231,7 @@ verifyTextPresent - Must either select an existing organization or create a new one. + This field must not be empty. @@ -251,7 +241,7 @@ select - degreeUri + degree label=B.S. Bachelor of Science @@ -266,7 +256,7 @@ type - year + dateTime.year 1980 @@ -281,114 +271,24 @@ verifyTextPresent - Must either select an existing organization or create a new one. + This field must not be empty. comment - Select to add new organization but cancel before doing so - - - - clickAndWait - link=add a new organization - - - - clickAndWait - link=cancel - - - - comment - Select to add new organization but leave field blank - - - - clickAndWait - link=add a new organization - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Must specify an organization. - - - - click - link=add a new organization - - - - comment - Enter in new organization name but leave type blank - - - - type - newOrgName - Carroll College - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Must select a type for the new organization. - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - comment - Enter everything in correctly + Enter in new organization name select - newOrgType + typeSelector label=College + + type + relatedIndLabel + Carroll College + clickAndWait submit @@ -476,7 +376,7 @@ select - degreeUri + degree label=M.B.A. Master of Business Administration @@ -486,13 +386,18 @@ type - year + dateTime.year 2000 select - organizationUri - label=Carroll College + typeSelector + label=College + + + type + relatedIndLabel + Carroll College type @@ -541,7 +446,7 @@ select - degreeUri + degree label=M.Ed. Master of Education @@ -551,24 +456,19 @@ type - year + dateTime.year 2005 - click - link=add a new organization - + select + typeSelector + label=University type - newOrgName + relatedIndLabel University of Wisconsin - - select - newOrgType - label=University - type info diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html index d60f81b0..cf265757 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/ChangeEducationBackground.html @@ -171,7 +171,7 @@ type - year + dateTime.year 1981 @@ -249,11 +249,6 @@ Edit - - click - link=add a new organization - - type newOrgName diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html index 3bd9d261..1171b675 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/DeleteEducationalBackground.html @@ -241,12 +241,12 @@ type - search + querytext carroll college clickAndWait - submit + //input[@value='Search'] @@ -306,12 +306,12 @@ type - search + querytext carroll college clickAndWait - submit + //input[@value='Search'] @@ -326,12 +326,12 @@ type - search + querytext wisconsin clickAndWait - submit + //input[@value='Search'] @@ -391,12 +391,12 @@ type - search + querytext wisconsin clickAndWait - submit + //input[@value='Search'] @@ -411,12 +411,12 @@ type - search + querytext illinois clickAndWait - submit + //input[@value='Search'] @@ -476,12 +476,12 @@ type - search + querytext illinois clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html index fc25297d..01eb7b93 100644 --- a/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationForm/SearchEducationBackground.html @@ -56,12 +56,12 @@ type - search + querytext carroll college clickAndWait - submit + //input[@value='Search'] @@ -76,12 +76,12 @@ type - search + querytext wisconsin clickAndWait - submit + //input[@value='Search'] @@ -96,12 +96,12 @@ type - search + querytext illinois clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html index 12347855..e3aaeed2 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/AddEducationBackground.html @@ -256,7 +256,7 @@ type - year + dateTime.year 1980 @@ -271,114 +271,24 @@ verifyTextPresent - Must either select an existing organization or create a new one. + This field must not be empty. comment - Select to add new organization but cancel before doing so - - - - clickAndWait - link=add a new organization - - - - clickAndWait - link=cancel - - - - comment - Select to add new organization but leave field blank - - - - clickAndWait - link=add a new organization - - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Must specify an organization. - - - - click - link=add a new organization - - - - comment - Enter in new organization name but leave type blank - - - - type - newOrgName - Carroll College - - - clickAndWait - submit - - - - assertTitle - Edit - - - - verifyTextPresent - Must select a type for the new organization. - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - refreshAndWait - 10000 - - - - comment - Enter everything in correctly + Enter in new organization name select - newOrgType + typeSelector label=College + + type + relatedIndLabel + Carroll College + clickAndWait submit @@ -466,7 +376,7 @@ select - degreeUri + degree label=M.B.A. Master of Business Administration @@ -476,13 +386,18 @@ type - year + dateTime.year 2000 select - organizationUri - label=Carroll College + typeSelector + label=College + + + type + relatedIndLabel + Carroll College type @@ -531,7 +446,7 @@ select - degreeUri + degree label=M.Ed. Master of Education @@ -541,24 +456,19 @@ type - year + dateTime.year 2005 - click - link=add a new organization - + select + typeSelector + label=University type - newOrgName + relatedIndLabel University of Wisconsin - - select - newOrgType - label=University - type info diff --git a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html index d60f81b0..cf265757 100644 --- a/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html +++ b/utilities/acceptance-tests/suites/CustomEducationFormVB/ChangeEducationBackground.html @@ -171,7 +171,7 @@ type - year + dateTime.year 1981 @@ -249,11 +249,6 @@ Edit - - click - link=add a new organization - - type newOrgName diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html index 87732345..f594ee87 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/AddPositions.html @@ -277,7 +277,7 @@ type relatedIndLabel - Carro + Carroll College click diff --git a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html index c4a75422..6b78bf8f 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsForm/SearchPositions.html @@ -56,12 +56,12 @@ type - search + querytext lecturer clickAndWait - submit + //input[@value='Search'] @@ -121,12 +121,12 @@ type - search + querytext professor clickAndWait - submit + //input[@value='Search'] @@ -186,12 +186,12 @@ type - search + querytext carroll clickAndWait - submit + //input[@value='Search'] @@ -246,12 +246,12 @@ type - search + querytext carroll clickAndWait - submit + //input[@value='Search'] @@ -296,12 +296,12 @@ type - search + querytext university clickAndWait - submit + //input[@value='Search'] diff --git a/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html b/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html index 87732345..f594ee87 100644 --- a/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html +++ b/utilities/acceptance-tests/suites/CustomPositionsFormVB/AddPositions.html @@ -277,7 +277,7 @@ type relatedIndLabel - Carro + Carroll College click