upgraded pact-web and pact-jvm-provider-spring

thombergs · thombergs · commit 7bce17b055a3 · 2018-01-02T23:01:38.000+01:00
diff --git a/pact-angular/package-lock.json b/pact-angular/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -10,4 +10,5 @@ include 'sleuth-upstream-service'
 include 'rabbitmq-event-brokering'
 include 'junit5'
 include 'pact-spring-provider'
+include 'spring-boot-tests'
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`"typescript": "~2.3.3",`
`49`	`49`	`"@pact-foundation/pact-node": "6.5.0",`
`50`	`50`	`"@pact-foundation/karma-pact": "2.1.3",`
`51`		`- "pact-web": "4.3.1",`
	`51`	`+ "@pact-foundation/pact-web": "5.3.0",`
`52`	`52`	`"cross-env": "^5.0.5"`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ dependencies {`
`26`	`26`	`compile('org.springframework.boot:spring-boot-starter-data-jpa')`
`27`	`27`	`compile('org.springframework.boot:spring-boot-starter-web')`
`28`	`28`	`compile('com.h2database:h2:1.4.196')`
`29`		`- testCompile('au.com.dius:pact-jvm-provider-spring_2.12:3.5.9')`
	`29`	`+ testCompile('au.com.dius:pact-jvm-provider-spring_2.12:3.5.11')`
`30`	`30`	`testCompile('junit:junit:4.12')`
`31`	`31`	`testCompile('org.springframework.boot:spring-boot-starter-test')`
`32`	`32`	`}`