From 072790e9cd41d3e885738f849dfceb4307aaa55e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 26 Oct 2018 20:04:05 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- multi/multi_contract-dsl.html | 31 ++++++++++++++++++++++++++++- single/spring-cloud-contract.html | 31 ++++++++++++++++++++++++++++- spring-cloud-contract.xml | 33 +++++++++++++++++++++++++++++-- 3 files changed, 91 insertions(+), 4 deletions(-) diff --git a/multi/multi_contract-dsl.html b/multi/multi_contract-dsl.html index 1574199565..fe88d91fbc 100644 --- a/multi/multi_contract-dsl.html +++ b/multi/multi_contract-dsl.html @@ -188,6 +188,8 @@ relative to the folder in which the contract lays.

// (this can be a valid request or invalid depending // on type of contract being specified). request { + method GET() + url "/foo" //... } @@ -196,6 +198,7 @@ relative to the folder in which the contract lays.

// with following response after receiving request // specified in "request" part above). response { + status 200 //... } @@ -224,6 +227,7 @@ same information is mandatory in request definition of the Contract.

Gr response { //... + status 200 } }

YAML.  @@ -241,6 +245,7 @@ the recommended way, as doing so makes the tests ho response { //... + status 200 } }

YAML.  @@ -251,6 +256,7 @@ the recommended way, as doing so makes the tests ho 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
 
 		urlPath('/users') {
 
@@ -287,6 +293,7 @@ the recommended way, as doing so makes the tests ho
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -346,6 +353,8 @@ response: 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Each header is added in form `'Header-Name' : 'Header-Value'`.
 		// there are also some helper methods
@@ -359,6 +368,7 @@ response:
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -371,6 +381,8 @@ headers: 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Each Cookies is added in form `'Cookie-Key' : 'Cookie-Value'`.
 		// there are also some helper methods
@@ -384,6 +396,7 @@ headers:
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -396,6 +409,8 @@ cookies: 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Currently only JSON format of request body is supported.
 		// Format will be determined from a header or body's content.
@@ -404,6 +419,7 @@ cookies:
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -495,6 +511,8 @@ following code shows an example:

Groovy DSL.  

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 	}
 	response {
 		// Status code sent by the server
@@ -1090,6 +1108,7 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
     Content-Type: application/json
   cookies:
     foo: 2
+    bar: 3
   queryParameters:
     limit: 10
     offset: 20
@@ -1117,7 +1136,7 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
       regex: /get/[0-9]
       # predefined:
       # execute a method
-      # command:
+      #command: 'equals($it)'
     queryParameters:
       - key: limit
         type: equal_to
@@ -1142,6 +1161,8 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
     cookies:
       - key: foo
         regex: '[0-9]'
+      - key: bar
+        command: 'equals($it)'
     headers:
       - key: Content-Type
         regex: "application/json.*"
@@ -1174,6 +1195,9 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
         type: by_null
 response:
   status: 200
+  cookies:
+    foo: 1
+    bar: 2
   body:
     duck: 123
     alpha: "abc"
@@ -1205,6 +1229,11 @@ response:
     headers:
       - key: Content-Type
         regex: "application/json.*"
+    cookies:
+      - key: foo
+        regex: '[0-9]'
+      - key: bar
+        command: 'equals($it)'
     body:
       - path: $.duck
         type: by_regex
diff --git a/single/spring-cloud-contract.html b/single/spring-cloud-contract.html
index cdbd787d1d..221128beb1 100644
--- a/single/spring-cloud-contract.html
+++ b/single/spring-cloud-contract.html
@@ -3579,6 +3579,8 @@ relative to the folder in which the contract lays.
// (this can be a valid request or invalid depending // on type of contract being specified). request { + method GET() + url "/foo" //... } @@ -3587,6 +3589,7 @@ relative to the folder in which the contract lays.

// with following response after receiving request // specified in "request" part above). response { + status 200 //... } @@ -3615,6 +3618,7 @@ same information is mandatory in request definition of the Contract.

Gr response { //... + status 200 } }

YAML.  @@ -3632,6 +3636,7 @@ the recommended way, as doing so makes the tests ho response { //... + status 200 } }

YAML.  @@ -3642,6 +3647,7 @@ the recommended way, as doing so makes the tests ho 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
 
 		urlPath('/users') {
 
@@ -3678,6 +3684,7 @@ the recommended way, as doing so makes the tests ho
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -3737,6 +3744,8 @@ response: 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Each header is added in form `'Header-Name' : 'Header-Value'`.
 		// there are also some helper methods
@@ -3750,6 +3759,7 @@ response:
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -3762,6 +3772,8 @@ headers: 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Each Cookies is added in form `'Cookie-Key' : 'Cookie-Value'`.
 		// there are also some helper methods
@@ -3775,6 +3787,7 @@ headers:
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -3787,6 +3800,8 @@ cookies: 

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Currently only JSON format of request body is supported.
 		// Format will be determined from a header or body's content.
@@ -3795,6 +3810,7 @@ cookies:
 
 	response {
 		//...
+		status 200
 	}
 }

YAML.  @@ -3886,6 +3902,8 @@ following code shows an example:

Groovy DSL.  

org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 	}
 	response {
 		// Status code sent by the server
@@ -4481,6 +4499,7 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
     Content-Type: application/json
   cookies:
     foo: 2
+    bar: 3
   queryParameters:
     limit: 10
     offset: 20
@@ -4508,7 +4527,7 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
       regex: /get/[0-9]
       # predefined:
       # execute a method
-      # command:
+      #command: 'equals($it)'
     queryParameters:
       - key: limit
         type: equal_to
@@ -4533,6 +4552,8 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
     cookies:
       - key: foo
         regex: '[0-9]'
+      - key: bar
+        command: 'equals($it)'
     headers:
       - key: Content-Type
         regex: "application/json.*"
@@ -4565,6 +4586,9 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
         type: by_null
 response:
   status: 200
+  cookies:
+    foo: 1
+    bar: 2
   body:
     duck: 123
     alpha: "abc"
@@ -4596,6 +4620,11 @@ response:
     headers:
       - key: Content-Type
         regex: "application/json.*"
+    cookies:
+      - key: foo
+        regex: '[0-9]'
+      - key: bar
+        command: 'equals($it)'
     body:
       - path: $.duck
         type: by_regex
diff --git a/spring-cloud-contract.xml b/spring-cloud-contract.xml
index d31748d369..6f3bdab631 100644
--- a/spring-cloud-contract.xml
+++ b/spring-cloud-contract.xml
@@ -4,7 +4,7 @@
 
 
 Spring Cloud Contract
-2018-10-17
+2018-10-15
 
 
 
@@ -6133,6 +6133,8 @@ relative to the folder in which the contract lays.
 	// (this can be a valid request or invalid depending
 	// on type of contract being specified).
 	request {
+		method GET()
+		url "/foo"
 		//...
 	}
 
@@ -6141,6 +6143,7 @@ relative to the folder in which the contract lays.
 	// with following response after receiving request
 	// specified in "request" part above).
 	response {
+		status 200
 		//...
 	}
 
@@ -6185,6 +6188,7 @@ same information is mandatory in request definition of the Contract.
 
 	response {
 		//...
+		status 200
 	}
 }
 
@@ -6211,6 +6215,7 @@ the recommended way, as doing so makes the tests host-in
 
 	response {
 		//...
+		status 200
 	}
 }
 
@@ -6230,6 +6235,7 @@ the recommended way, as doing so makes the tests host-in
 org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
 
 		urlPath('/users') {
 
@@ -6266,6 +6272,7 @@ the recommended way, as doing so makes the tests host-in
 
 	response {
 		//...
+		status 200
 	}
 }
 
@@ -6334,6 +6341,8 @@ response:
 org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Each header is added in form `'Header-Name' : 'Header-Value'`.
 		// there are also some helper methods
@@ -6347,6 +6356,7 @@ response:
 
 	response {
 		//...
+		status 200
 	}
 }
 
@@ -6368,6 +6378,8 @@ headers:
 org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Each Cookies is added in form `'Cookie-Key' : 'Cookie-Value'`.
 		// there are also some helper methods
@@ -6381,6 +6393,7 @@ headers:
 
 	response {
 		//...
+		status 200
 	}
 }
 
@@ -6402,6 +6415,8 @@ cookies:
 org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 
 		// Currently only JSON format of request body is supported.
 		// Format will be determined from a header or body's content.
@@ -6410,6 +6425,7 @@ cookies:
 
 	response {
 		//...
+		status 200
 	}
 }
 
@@ -6556,6 +6572,8 @@ following code shows an example:
 org.springframework.cloud.contract.spec.Contract.make {
 	request {
 		//...
+		method GET()
+		url "/foo"
 	}
 	response {
 		// Status code sent by the server
@@ -7513,6 +7531,7 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
     Content-Type: application/json
   cookies:
     foo: 2
+    bar: 3
   queryParameters:
     limit: 10
     offset: 20
@@ -7540,7 +7559,7 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
       regex: /get/[0-9]
       # predefined:
       # execute a method
-      # command:
+      #command: 'equals($it)'
     queryParameters:
       - key: limit
         type: equal_to
@@ -7565,6 +7584,8 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
     cookies:
       - key: foo
         regex: '[0-9]'
+      - key: bar
+        command: 'equals($it)'
     headers:
       - key: Content-Type
         regex: "application/json.*"
@@ -7597,6 +7618,9 @@ email, url, uuid, iso_date, iso_date_time, iso_time, iso_8601_with_offset, non_e
         type: by_null
 response:
   status: 200
+  cookies:
+    foo: 1
+    bar: 2
   body:
     duck: 123
     alpha: "abc"
@@ -7628,6 +7652,11 @@ response:
     headers:
       - key: Content-Type
         regex: "application/json.*"
+    cookies:
+      - key: foo
+        regex: '[0-9]'
+      - key: bar
+        command: 'equals($it)'
     body:
       - path: $.duck
         type: by_regex