From 7bce17b055a3b07c3e4ef701eaa2b07b23091b4e Mon Sep 17 00:00:00 2001
From: Tom Hombergs <tom.hombergs@gmail.com>
Date: Tue, 2 Jan 2018 23:01:38 +0100
Subject: [PATCH] upgraded pact-web and pact-jvm-provider-spring

---
 pact-angular/package-lock.json                 | 12 ++++++------
 pact-angular/package.json                      |  2 +-
 pact-angular/src/app/user.service.pact.spec.ts | 10 +++++-----
 pact-spring-provider/build.gradle              |  2 +-
 settings.gradle                                |  1 +
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pact-angular/package-lock.json b/pact-angular/package-lock.json
index f85e661..6aedc1b 100644
--- a/pact-angular/package-lock.json
+++ b/pact-angular/package-lock.json
@@ -264,6 +264,12 @@
         "bunyan-prettystream": "0.1.3"
       }
     },
+    "@pact-foundation/pact-web": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@pact-foundation/pact-web/-/pact-web-5.3.0.tgz",
+      "integrity": "sha512-8nSX7fFdfUm/ApbACBFCU+aYF0xom7goIHOCn7MUvE+zIgmSUnX1Gl82SiZsJjpuVAfYclMeUwaY5VliadfMrA==",
+      "dev": true
+    },
     "@schematics/angular": {
       "version": "0.0.49",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.0.49.tgz",
@@ -5532,12 +5538,6 @@
       "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
-    "pact-web": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/pact-web/-/pact-web-4.3.1.tgz",
-      "integrity": "sha1-D63FAjQYIy1wfj2APEB7g/OIu78=",
-      "dev": true
-    },
     "pako": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
diff --git a/pact-angular/package.json b/pact-angular/package.json
index d34d911..0876c1f 100644
--- a/pact-angular/package.json
+++ b/pact-angular/package.json
@@ -48,7 +48,7 @@
     "typescript": "~2.3.3",
     "@pact-foundation/pact-node": "6.5.0",
     "@pact-foundation/karma-pact": "2.1.3",
-    "pact-web": "4.3.1",
+    "@pact-foundation/pact-web": "5.3.0",
     "cross-env": "^5.0.5"
   }
 }
diff --git a/pact-angular/src/app/user.service.pact.spec.ts b/pact-angular/src/app/user.service.pact.spec.ts
index 8d4a3da..dd2420d 100644
--- a/pact-angular/src/app/user.service.pact.spec.ts
+++ b/pact-angular/src/app/user.service.pact.spec.ts
@@ -2,14 +2,14 @@ import {TestBed} from '@angular/core/testing';
 import {HttpClientModule} from '@angular/common/http';
 import {UserService} from './user.service';
 import {User} from './user';
-import * as Pact from 'pact-web';
+import {PactWeb, Matchers} from '@pact-foundation/pact-web';
 
 describe('UserService', () => {
 
   let provider;
 
   beforeAll(function (done) {
-    provider = Pact({
+    provider = new PactWeb({
       consumer: 'ui',
       provider: 'userservice',
       port: 1234,
@@ -70,7 +70,7 @@ describe('UserService', () => {
         },
         willRespondWith: {
           status: 201,
-          body: Pact.Matchers.somethingLike({
+          body: Matchers.somethingLike({
               id: createdUserId
           }),
           headers: {
@@ -106,14 +106,14 @@ describe('UserService', () => {
         withRequest: {
           method: 'PUT',
           path: '/user-service/users/42',
-          body: Pact.Matchers.somethingLike(expectedUser),
+          body: Matchers.somethingLike(expectedUser),
           headers: {
             'Content-Type': 'application/json'
           }
         },
         willRespondWith: {
           status: 200,
-          body: Pact.Matchers.somethingLike(expectedUser)
+          body: Matchers.somethingLike(expectedUser)
         }
       }).then(done, error => done.fail(error));
     });
diff --git a/pact-spring-provider/build.gradle b/pact-spring-provider/build.gradle
index 16bce52..7dd81f1 100644
--- a/pact-spring-provider/build.gradle
+++ b/pact-spring-provider/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('com.h2database:h2:1.4.196')
-    testCompile('au.com.dius:pact-jvm-provider-spring_2.12:3.5.9')
+    testCompile('au.com.dius:pact-jvm-provider-spring_2.12:3.5.11')
     testCompile('junit:junit:4.12')
     testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/settings.gradle b/settings.gradle
index 7d4405f..f970658 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,4 +10,5 @@ include 'sleuth-upstream-service'
 include 'rabbitmq-event-brokering'
 include 'junit5'
 include 'pact-spring-provider'
+include 'spring-boot-tests'