Commit Graph

253 Commits

Author SHA1 Message Date
Marcin Grzejszczak
19f8cc4003 Fixed compilation issues 2020-07-07 18:20:33 +02:00
Marcin Grzejszczak
a37b35800d Fixed compilation issues 2020-07-07 08:52:13 +02:00
Olga Maciaszek-Sharma
6ec5c8440e Merge remote-tracking branch 'origin/2.2.x' 2020-05-08 18:52:04 +02:00
Olga Maciaszek-Sharma
ca90c521b3 Do not override default RestDocs snippets with RestAssured. Fixes gh-14.00. 2020-05-08 18:33:18 +02:00
Olga Maciaszek-Sharma
156657c8c4 Update license comments. 2020-04-27 15:38:44 +02:00
Olga Maciaszek-Sharma
90c4312b37 Update license comments. 2020-04-24 13:24:33 +02:00
Marcin Grzejszczak
1d923ee0a1 Fixed javadocs 2020-03-30 16:16:26 +02:00
Marcin Grzejszczak
012a17871e Merge branch '2.2.x' 2020-03-25 15:11:54 +01:00
Marcin Grzejszczak
90aa477365 Merge branch 'fix-already-running-init' of https://github.com/wpanas/spring-cloud-contract into wpanas-fix-already-running-init 2020-03-25 14:49:25 +01:00
Marcin Grzejszczak
bd054e3220 Improved bean restarting and resetting 2020-03-25 14:48:26 +01:00
wpanas
6d963253b0 Fixing issues with duplicated init 2020-03-25 11:14:39 +01:00
Marcin Grzejszczak
9115aa8d4a Should fix the build 2020-03-17 18:21:11 +01:00
Marcin Grzejszczak
cb7b298d5c Merge branch '2.2.x' 2020-02-12 17:34:31 +01:00
Marcin Grzejszczak
4f6b6909a6 Added additional resetting options; fixes gh-1322 2020-02-12 16:30:38 +01:00
Marcin Grzejszczak
9e02b7c902 Updated Copyrights 2020-01-28 20:00:13 +01:00
Marcin Grzejszczak
7fbefd0c08 Merge branch '2.1.x' 2019-12-31 09:37:06 +01:00
Marcin Grzejszczak
67119e62f6 Adds a flag to disable stubs after each test excution; fixes gh-1286 2019-12-11 13:13:37 +01:00
Marcin Grzejszczak
6bd0e8cc60 Added NPE guard 2019-11-20 14:15:42 +01:00
buildmaster
35ddaef152 Bumping versions 2019-11-19 00:21:00 +00:00
buildmaster
b41772176c Going back to snapshots 2019-11-18 16:14:30 +00:00
buildmaster
40fc9b011f Update SNAPSHOT to 2.1.4.RELEASE 2019-11-18 16:04:55 +00:00
Marcin Grzejszczak
6500822c3e Merge branch '2.1.x' 2019-11-18 14:20:40 +01:00
Marcin Grzejszczak
732b7d401c Added NPE guard when there are no bytes returned 2019-11-18 14:20:00 +01:00
Marcin Grzejszczak
954f3244bd Merge branch '2.1.x' 2019-11-05 14:54:52 +01:00
Marcin Grzejszczak
380d2535bd WireMock RestDocs stub() method is a no-op
deprecating the method and going towards document()
fix by @dsyer

fixes gh-1092
2019-11-05 14:03:22 +01:00
Marcin Grzejszczak
e2999d9f8b Updates the parsing of a json body containing a regex in the body 2019-11-04 09:20:25 +01:00
Marcin Grzejszczak
d5acc0ca12 Update auto-configuration to use @Configuration(proxyBeanMethods=false)
fixes gh-1245
2019-10-24 15:39:57 +02:00
Marcin Grzejszczak
f2bdf0e0d9 Removed unnecessary eclipse jetty server dep; fixes gh-1244 2019-10-24 11:41:08 +02:00
buildmaster
769c821804 Bumping versions 2019-10-03 00:21:26 +00:00
Marcin Grzejszczak
7a6e1713e7 Fixed wrong merge 2019-10-02 15:09:05 +02:00
Marcin Grzejszczak
dba2d1b260 Merge branch '2.1.x' 2019-10-02 14:53:58 +02:00
Karol Lipiec
a2845713a1 Added support of query parameters for RestDocs for WireMock stubs (#1237)
* Added support of query parameters for RestDocs for Stubs

fixes #112
2019-10-02 14:53:42 +02:00
Karol Lipiec
1c945c8202 Added support of query parameters for RestDocs for WireMock stubs (#1237)
* Added support of query parameters for RestDocs for Stubs

fixes #112
2019-10-02 14:03:54 +02:00
Marcin Grzejszczak
25ada9ea0a Bumped WireMock to 2.25.0
fixes gh-1230
fixes gh-1231
2019-10-01 14:39:43 +02:00
Marcin Grzejszczak
ea47c72552 Added an option to bufferontent for WireMockRestServiceServer
fixes gh-860
2019-09-27 15:10:44 +02:00
Marcin Grzejszczak
cf9ea03df3 Merge branch '2.1.x' 2019-09-26 15:09:53 +02:00
Marcin Grzejszczak
0a67fcbab3 Additional stub resetting, updated wiremock listener conditions
fixes gh-1027
2019-09-26 14:14:34 +02:00
buildmaster
882cee887d Going back to snapshots 2019-09-10 18:47:35 +00:00
buildmaster
4750b4e60e Update SNAPSHOT to 2.1.3.RELEASE 2019-09-10 18:38:17 +00:00
buildmaster
3a60466e76 Bumping versions 2019-09-06 00:21:40 +00:00
Marcin Grzejszczak
c7e6f77d42 Merge branch '2.1.x' 2019-09-05 13:44:44 +02:00
Marcin Grzejszczak
8d6336c73f Made @AutoConfigureWireMock @Inherited; fixes gh-1201 2019-09-05 13:44:37 +02:00
Marcin Grzejszczak
4f652ad1e6 Sets a defaultInstance for WireMock server
without this change we're not resetting default instances upon test finish
with this change we're resetting the default intance and setting it once more upon configuration startup

fixes gh-1081
2019-08-05 21:32:15 +02:00
Marcin Grzejszczak
b48dd4905f Upgraded Rest Assured to 4.0.0; fixes gh-1122 2019-07-02 14:50:20 +02:00
Spencer Gibb
8949bae485 Moves back to StaticContext from NoContext
NoContext doesn't exist.
2019-06-28 14:51:10 -04:00
Marcin Grzejszczak
d739efc50b Bumped pact to 3.6.7; fixes gh-1099 2019-06-28 17:17:32 +02:00
Dave Syer
e79e69fb11 Add support for placeholders for port in restdocs with WebTestClient
See gh-1088
2019-06-14 15:32:04 +01:00
Dave Syer
33c8cbfc87 Add support for placeholders in Wiremock stubs (#1109)
* Generate wiremock stubs in restdocs with placeholders for port

* Add support for placeholders in Wiremock stubs

* Ensure response-template transformer is added if needed

fixes gh-1088
2019-06-14 16:15:25 +02:00
Dave Syer
1146674a0e Remove usage of deprecated Jetty API 2019-05-29 10:08:05 +01:00
Marcin Grzejszczak
27435e2668 Merge branch '2.1.x' 2019-05-20 14:24:56 +02:00