Merge pull request grails-samples#22 from caseyscarborough/master

Fix adding/editing pets and add functional tests
rdmueller · Aug 29, 2014 · 2568b73 · 2568b73
2 parents 5d8b835 + 36dfa36
commit 2568b73
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 5 deletions.
diff --git a/grails-app/controllers/org/grails/samples/PetController.groovy b/grails-app/controllers/org/grails/samples/PetController.groovy
@@ -9,8 +9,8 @@ class PetController {
 			return [pet: new Pet(owner: Owner.get(params.owner?.id)), types: PetType.list()]
 		}
 
-		def pet = petclinicService.createPet(params.pet?.name, params.pet?.birthDate,
-			(params.pet?.type?.id ?: 0) as Long, (params.pet?.owner?.id ?: 0) as Long)
+		def pet = petclinicService.createPet(params.pet_name, params.pet?.birthDate,
+			(params.pet?.type?.id ?: 0) as Long, (params.pet_owner_id ?: 0) as Long)
 
 		if (pet.hasErrors()) {
 			return [pet: pet, types: PetType.list()]
@@ -27,8 +27,8 @@ class PetController {
 
 		def pet = Pet.get(params.id)
 
-		petclinicService.updatePet(pet, params.pet?.name, params.pet?.birthDate,
-			(params.pet?.type?.id ?: 0) as Long, (params.pet?.owner?.id ?: 0) as Long)
+		petclinicService.updatePet(pet, params.pet_name, params.pet?.birthDate,
+			(params.pet?.type?.id ?: 0) as Long, (params.pet_owner_id ?: 0) as Long)
 
 		if (pet.hasErrors()) {
 			render view: 'add', model: [pet: pet, types: PetType.list()]

diff --git a/grails-app/views/pet/add.gsp b/grails-app/views/pet/add.gsp
@@ -14,7 +14,7 @@
 			<g:if test="${pet.id}">
 				<g:hiddenField name="id" value="${pet.id}" />
 			</g:if>
-			<g:hiddenField name="pet.owner.id" value="${pet.owner.id}"></g:hiddenField>
+			<g:hiddenField name="pet_owner_id" value="${pet.owner.id}"></g:hiddenField>
 			<table>
 				<tr>
 					<th>

diff --git a/test/functional/org/grails/samples/AddPetSpec.groovy b/test/functional/org/grails/samples/AddPetSpec.groovy
@@ -0,0 +1,52 @@
+package org.grails.samples
+
+import org.grails.samples.pages.AddPetPage
+import org.grails.samples.pages.AddOwnerPage
+import org.grails.samples.pages.ShowOwnerPage
+import spock.lang.Shared
+
+class AddPetSpec extends PetclinicSpecs {
+
+  @Shared
+  def ownerId
+
+  def setupSpec() {
+    addOwner()
+  }
+
+  def setup() {
+    to AddPetPage, "?owner.id=${ownerId}"
+  }
+
+  def 'can NOT add an invalid Pet'() {
+    when:
+    addPet.click()
+
+    then:
+    at AddPetPage
+    errors.size() == 3
+  }
+
+  def 'can add a valid Pet'() {
+    given:
+    name.value 'Fido'
+    id.value ownerId
+
+    when:
+    addPet.click()
+
+    then:
+    at ShowOwnerPage
+  }
+
+  protected void addOwner() {
+    to AddOwnerPage
+    firstName.value 'Sally'
+    lastName.value 'Jones'
+    address.value '987 State St.'
+    city.value 'MSN'
+    telephone.value '1234567890'
+    addOwner.click()
+    ownerId = $("form").find("input", name: "owner.id").value()
+  }
+}
diff --git a/test/functional/org/grails/samples/EditPetSpec.groovy b/test/functional/org/grails/samples/EditPetSpec.groovy
@@ -0,0 +1,62 @@
+package org.grails.samples
+
+import org.grails.samples.pages.AddOwnerPage
+import org.grails.samples.pages.AddPetPage
+import org.grails.samples.pages.EditPetPage
+import org.grails.samples.pages.ShowOwnerPage
+import spock.lang.Shared
+
+class EditPetSpec extends PetclinicSpecs {
+
+  @Shared
+  def ownerId
+
+  def setupSpec() {
+    addOwner()
+    addPetToOwner(ownerId)
+  }
+
+  def setup() {
+    to EditPetPage, 1
+  }
+
+  def 'can NOT edit an invalid Pet'() {
+    when:
+    name.value ''
+    editPet.click()
+
+    then:
+    at EditPetPage
+    errors.size() == 3
+  }
+
+  def 'can edit a valid Pet'() {
+    given:
+    name.value 'Fido'
+    id.value ownerId
+
+    when:
+    editPet.click()
+
+    then:
+    at ShowOwnerPage
+  }
+
+  protected void addOwner() {
+    to AddOwnerPage
+    firstName.value 'Sally'
+    lastName.value 'Jones'
+    address.value '987 State St.'
+    city.value 'MSN'
+    telephone.value '1234567890'
+    addOwner.click()
+    ownerId = $("form").find("input", name: "owner.id").value()
+  }
+
+  protected void addPetToOwner(ownerId) {
+    to AddPetPage, "?owner.id=${ownerId}"
+    name.value 'Fido'
+    id.value ownerId
+    addPet.click()
+  }
+}
diff --git a/test/functional/org/grails/samples/pages/AddPetPage.groovy b/test/functional/org/grails/samples/pages/AddPetPage.groovy
@@ -0,0 +1,17 @@
+package org.grails.samples.pages
+
+class AddPetPage extends PageWithFooter {
+
+  static url = '/petclinic/pet/add'
+
+  static at = {
+    title == 'Add Pet'
+  }
+
+  static content = {
+    name { $('#pet_name') }
+    id { $('#pet_owner_id') }
+    addPet { $('input', type: 'submit') }
+    errors(required: false) { $('.errors') }
+  }
+}
diff --git a/test/functional/org/grails/samples/pages/EditPetPage.groovy b/test/functional/org/grails/samples/pages/EditPetPage.groovy
@@ -0,0 +1,17 @@
+package org.grails.samples.pages
+
+class EditPetPage extends PageWithFooter {
+
+  static url = '/petclinic/pet/edit'
+
+  static at = {
+    title == 'Update Pet'
+  }
+
+  static content = {
+    name { $('#pet_name') }
+    id { $('#pet_owner_id') }
+    editPet { $('input', type: 'submit') }
+    errors(required: false) { $('.errors') }
+  }
+}