Commit Graph

377 Commits

Author SHA1 Message Date
Marcin Grzejszczak
237ee85dc3 Going back to snapshots 2017-08-21 12:33:24 +02:00
Marcin Grzejszczak
b81bb2a489 Update SNAPSHOT to 1.1.3.RELEASE 2017-08-21 12:28:10 +02:00
Marcin Grzejszczak
53a5fe7076 Merge branch 'master' into 2.0.x 2017-07-31 16:11:18 +02:00
Marcin Grzejszczak
b431f1b788 Bumped WireMock to 2.7.1 and added debug option for WireMock
fixes #374 #369
2017-07-31 16:09:35 +02:00
Marcin Grzejszczak
e4af835b8e Going back to snapshots 2017-07-21 14:30:45 +02:00
Marcin Grzejszczak
85f458e34c Update SNAPSHOT to 1.1.2.RELEASE 2017-07-21 14:06:43 +02:00
Marcin Grzejszczak
473a2b9197 Merge branch 'master' into 2.0.x 2017-07-18 17:30:48 +02:00
Marcin Grzejszczak
4de7d38a51 Added support for referencing file contents in the contract (#360)
without this change, large bodies can't be parsed by the compiler
with this change we allow those bodies to be read from files

fixes #357
2017-07-18 16:26:44 +02:00
Marcin Grzejszczak
959d8b958b Added missing cookies method 2017-07-03 13:07:55 +02:00
Marcin Grzejszczak
2f510ec7d2 Merge branch 'master' into 2.0.x 2017-07-03 11:11:06 +02:00
Marcin Grzejszczak
c496722838 Merge branch '1.1.x' 2017-07-03 11:10:20 +02:00
Marcin Grzejszczak
b54c36ce8b Polish 2017-07-03 11:10:02 +02:00
Tomasz Kopczynski
9d0075f586 gh-342: Rest Docs stubs with no body 2017-07-02 22:59:38 +02:00
Marcin Grzejszczak
2d7055560f Going back to snapshots 2017-06-29 08:34:29 +02:00
Marcin Grzejszczak
76e47bfdec Update SNAPSHOT to 2.0.0.M1 2017-06-29 08:24:17 +02:00
Marcin Grzejszczak
3ff0ed942c Trying to make the shading work in intellij (again) 2017-06-20 17:24:32 +02:00
Marcin Grzejszczak
82fda14b61 Bumped versions 2017-06-20 15:10:16 +02:00
Marcin Grzejszczak
d79208c210 Made things work with Intellij (hopefully) 2017-06-20 10:05:34 +02:00
Marcin Grzejszczak
ea5e7e238b Trying to make the shading work in intellij (again) 2017-06-20 09:26:11 +02:00
Marcin Grzejszczak
dde0360f6c Merge branch 'master' into 2.0.x 2017-06-19 18:56:59 +02:00
Marcin Grzejszczak
12ce468b6d Removing deprecations 2017-06-19 18:46:02 +02:00
Dave Syer
ff54a18776 Merge branch 'master' into 2.0.x 2017-06-16 14:49:57 +01:00
Dave Syer
8cdad73158 Add support for placeholder resolution in stub file names
E.g. document("{method-name}/{step}").

Fixes gh-84
2017-06-16 14:47:38 +01:00
Andy Wilkinson
2680d9ee3d Replace use of deprecated REST Docs APIs in WireMockSnippetTests 2017-06-15 20:18:19 +01:00
Dave Syer
a0d08245d5 Migrate Wiremock to Spring Boot 2.0 2017-06-15 17:43:28 +01:00
Marcin Grzejszczak
c1fca13f12 Initial commit 2017-06-15 14:56:18 +02:00
Marcin Grzejszczak
325afbe3ec Fixed wrong condition on jsonpath for rest docs
fixes #298
2017-06-06 13:28:31 +02:00
Marcin Grzejszczak
e0ea1b27f0 Bumping versions to 1.1.2.BUILD-SNAPSHOT after release 2017-05-22 23:57:24 +02:00
Marcin Grzejszczak
82f68347fa Going back to snapshots 2017-05-22 23:57:23 +02:00
Marcin Grzejszczak
7a10b3bf34 Update SNAPSHOT to 1.1.1.RELEASE 2017-05-22 23:51:18 +02:00
Marcin Grzejszczak
205bced50c Polish 2017-05-10 10:35:18 +02:00
Marcin Grzejszczak
6853faa648 Polish 2017-05-10 10:31:52 +02:00
Tomasz Kopczynski
3d23964dca Remove unnecessary host entry from Spring REST Docs contract generation 2017-05-08 19:21:12 +02:00
Marcin Grzejszczak
4c4a18ed22 Bumped versions after release 2017-05-05 12:31:03 +02:00
Marcin Grzejszczak
e9306448f9 Going back to snapshots 2017-05-05 12:23:41 +02:00
Marcin Grzejszczak
bd67bb2f26 Update SNAPSHOT to 1.0.5.RELEASE 2017-05-05 12:12:38 +02:00
Dave Syer
cf637d040f Add custom jetty fault injector for 9.4 2017-04-24 14:45:52 +01:00
Marcin Grzejszczak
2380cb483e Merge branch '1.0.x' 2017-04-24 15:07:01 +02:00
Marcin Grzejszczak
1f71cde2be Removed unused import 2017-04-24 15:06:52 +02:00
Marcin Grzejszczak
c2fdead0b0 Merge branch '1.0.x' 2017-04-24 15:03:09 +02:00
Marcin Grzejszczak
b98223b082 Fixed checkstyle 2017-04-24 15:02:50 +02:00
Dave Syer
f3102d6366 Merge branch '1.0.x' 2017-04-24 09:21:35 +01:00
Dave Syer
d3f6ad90a8 Add a fault injector if server is jetty or tomcat
Tomcat sends a slightly different reponse and the client sees it
differently in the malformed chunk scenario. It would be good to have
the same features for Undertow.

See gh-270.
2017-04-24 09:20:17 +01:00
Dave Syer
225e83d025 Merge branch '1.0.x' 2017-04-21 16:10:30 +01:00
Dave Syer
235281ce9f Add @AutoConfigureHttpClient for SSL validation error handling
For tests only users can add this annotation to make the rest template
in their app ignore SSL validation.
2017-04-21 16:09:08 +01:00
Marcin Grzejszczak
ef5020986f Bumping versions to 1.1.1.BUILD-SNAPSHOT after release 2017-04-11 11:26:11 +02:00
Marcin Grzejszczak
fe14d5c7d9 Going back to snapshots 2017-04-11 11:23:13 +02:00
Marcin Grzejszczak
c167df4fd6 Update SNAPSHOT to 1.1.0.RELEASE 2017-04-11 11:08:00 +02:00
Dave Syer
ac9e976a4b Merge remote-tracking branch 'origin/1.0.x' 2017-03-24 09:43:04 +00:00
Dave Syer
c1e285e76f Fix property source ordering issue with bootstrap context
The problem is that the bootstrap context gets created first
with the correct wiremock server port, and then the environment
is merged into the main context before the annotation
property source is created, so the latter takes precedence.
Fixed by re-ordering the property sources if detected.

Also switch off bootstrap context for wiremock server

Fixes gh-225
2017-03-24 09:41:36 +00:00