From bedfc943d528a157cb28e59c6955c079aee4f0a9 Mon Sep 17 00:00:00 2001
From: Benjamin Stein <ben@liatrio.com>
Date: Tue, 19 Sep 2017 13:29:58 -0700
Subject: [PATCH 1/4] run mvn test from regression suite directory

---
 jenkinsfiles/full-demo | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/jenkinsfiles/full-demo b/jenkinsfiles/full-demo
index 1072f6fc0..1e597e6ff 100644
--- a/jenkinsfiles/full-demo
+++ b/jenkinsfiles/full-demo
@@ -73,8 +73,7 @@ pipeline {
             }
           }
           steps {
-            sh "cd regression-suite"
-            sh "mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat:8080/petclinic/"
+            sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat:8080/petclinic/"
           }
         }
         stage('Stop local container') {
@@ -120,8 +119,7 @@ pipeline {
             }
           }
           steps {
-            sh "cd regression-suite"
-            sh "mvn clean -B test -DPETCLINIC_URL=https://dev-petclinic.liatr.io/petclinic"
+            sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://dev-petclinic.liatr.io/petclinic"
             echo "Should be accessible at https://dev-petclinic.liatr.io/petclinic"
           }
         }
@@ -145,8 +143,7 @@ pipeline {
             }
           }
           steps {
-            sh "cd regression-suite"
-            sh "mvn clean -B test -DPETCLINIC_URL=https://qa-petclinic.liatr.io/petclinic"
+            sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://qa-petclinic.liatr.io/petclinic"
             echo "Should be accessible at https://qa-petclinic.liatr.io/petclinic"
             input 'Deploy to Prod?'
           }
@@ -171,8 +168,7 @@ pipeline {
             }
           }
           steps {
-            sh "cd regression-suite"
-            sh "mvn clean -B test -DPETCLINIC_URL=https://petclinic.liatr.io/petclinic"
+            sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://petclinic.liatr.io/petclinic"
           }
         }
       }

From c90ba72d7060ad038bad5dccc3e2937bb8982484 Mon Sep 17 00:00:00 2001
From: Benjamin Stein <ben@liatrio.com>
Date: Tue, 19 Sep 2017 14:08:30 -0700
Subject: [PATCH 2/4] bumping up cucumber to fix bug

---
 regression-suite/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regression-suite/pom.xml b/regression-suite/pom.xml
index 620ed7f9a..1baac90b7 100644
--- a/regression-suite/pom.xml
+++ b/regression-suite/pom.xml
@@ -17,7 +17,7 @@
 	  <dependency>
             <groupId>info.cukes</groupId>
             <artifactId>cucumber-java</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 4a86eaff287383a1d1833c7cfc2580aa97b21dfb Mon Sep 17 00:00:00 2001
From: Benjamin Stein <ben@liatrio.com>
Date: Tue, 19 Sep 2017 14:19:45 -0700
Subject: [PATCH 3/4] put correct title in find vets: veternarians

---
 src/main/webapp/WEB-INF/jsp/vets/vetList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
index e757e1f3b..1c57ea93c 100644
--- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
@@ -15,7 +15,7 @@
 <div class="container">
     <jsp:include page="../fragments/bodyHeader.jsp"/>
 
-    <h2>Vets</h2>
+    <h2>Veterinarians</h2>
 
     <datatables:table id="vets" data="${vets.vetList}" row="vet" theme="bootstrap2" cssClass="table table-striped"
                       pageable="false" info="false">

From 7c3ee459144ce0c33bdfe6b551bc4ef9aeeeb160 Mon Sep 17 00:00:00 2001
From: Benjamin Stein <ben@liatrio.com>
Date: Tue, 19 Sep 2017 14:26:05 -0700
Subject: [PATCH 4/4] fix url for the container running petclinic

---
 jenkinsfiles/full-demo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfiles/full-demo b/jenkinsfiles/full-demo
index 1e597e6ff..d4fba0280 100644
--- a/jenkinsfiles/full-demo
+++ b/jenkinsfiles/full-demo
@@ -73,7 +73,7 @@ pipeline {
             }
           }
           steps {
-            sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat:8080/petclinic/"
+            sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat-temp:8080/petclinic/"
           }
         }
         stage('Stop local container') {