Commit Graph

64 Commits

Author SHA1 Message Date
Marcin Grzejszczak
490ba50613 Merge branch '1.0.x' 2017-02-01 10:14:44 +01:00
Patrice Conil
1337bb0dea Implement JSON matching with JSON Content-Type (#208)
fixes #116
2017-02-01 10:13:24 +01:00
Marcin Grzejszczak
e36a6e2b56 Going back to snapshots 2017-01-30 11:47:27 +01:00
Marcin Grzejszczak
dfceed2ce1 Bumping versions before release 2017-01-30 11:41:56 +01:00
Marcin Grzejszczak
c2a8bb8cb7 Merge branch '1.0.x' 2017-01-26 13:11:54 +01:00
Marcin Grzejszczak
ed30fc6aa5 Fixed the not setting of response status for rest docs
without this change the status recorded in the test was not properly placed in the stub
with this change it gets fixed

fixes #199
2017-01-26 13:11:37 +01:00
Marcin Grzejszczak
bacde76798 Going back to snapshots 2017-01-12 15:58:06 +01:00
Marcin Grzejszczak
bc37cc9a1a Bumping version before release 2017-01-12 15:28:20 +01:00
Marcin Grzejszczak
b7101f2a77 Merge branch '1.0.x'
fixes #135
2016-12-29 15:38:45 +01:00
Marcin Grzejszczak
4ceaff5b66 Added missing body pattern comparison
without this change the eact contents of the body were mostly ignored
with this change we support all WireMock body matching patterns

fixes #135
2016-12-29 15:38:34 +01:00
Marcin Grzejszczak
4abc36e311 Merge branch '1.0.x'
fixes #163
2016-12-29 14:15:17 +01:00
Marcin Grzejszczak
e4d8e1f6e2 Added missing method verification
without this change the only criterion for matching of requests was URL / headers / content. The method check was missing
with this change we verify if the HTTP method matches too

fixes #163
2016-12-29 14:10:13 +01:00
Marcin Grzejszczak
d8ff715527 Bumped up version to 1.1.0 2016-12-07 14:34:56 +01:00
Marcin Grzejszczak
7a347da55a Going back to snapshots 2016-11-24 18:58:50 +01:00
Marcin Grzejszczak
c7883a0d97 Bumping version before release 2016-11-24 18:37:39 +01:00
Dave Syer
e93d951d50 Add support for file root location in @AutoConfigureWireMock 2016-11-11 14:15:11 +00:00
Dave Syer
3d4cb355c2 Add support for files in WireMockRestServiceServer 2016-11-11 13:10:27 +00:00
Dave Syer
4829e687d8 Improve test coverage of default stubs locations 2016-11-11 12:55:41 +00:00
Dave Syer
b063612d89 Add support for explicit priority in mock server stubs 2016-11-11 12:33:53 +00:00
Dave Syer
891452376b Don't use ServerProperties for configuring Wiremock server
The problem is that it is a Spring Boot app (really tiny one), so
it binds to server.* in the environment, if you try to use
the stock ServerProperties. We only need a subset of the features
so it's actually relatively easy to wrap it and use a delegate.
2016-11-09 16:12:23 +00:00
Marcin Grzejszczak
f4a6b4f4b1 Going back to snapshots 2016-10-17 12:22:17 +02:00
Marcin Grzejszczak
dd214f83f6 Bumping versions before release 2016-10-17 11:54:52 +02:00
Dave Syer
13a90f71e9 Defer setting ignore expect order 2016-10-12 09:20:22 +01:00
Marcin Grzejszczak
c8ac0fe8dc Fixing checkstyle issues 2016-10-12 10:18:19 +02:00
Dave Syer
0f41f4a4dc Tweak mock server builder so that it ignores order by default
If user loads stubs from a directory, the order of the resources
is best left to the comparator by default. If the user wants to
order stubs explicitly, she now has to use ignoreExpectOrder(false)
(the default is true, unlike the normal mock mvc server).
2016-10-11 17:03:14 +02:00
Dave Syer
1a88cbd40a Fix order of matchers in mock server
It turns out the WireMock does not (I think) contain a comparator
that helps. We have made a custom comparator that helps a bit
(it orders requests with the same URL in reverse order of the
number of headers matched).
2016-10-11 15:45:30 +02:00
Dave Syer
67e75fd2c6 Add header matchers for mock http server
Wrapping the WireMock matcher in a Hamcrest matcher, and also
using WireMock's native support for sorting mappings, so the
most specific match comes first.
2016-10-11 14:58:14 +02:00
Dave Syer
103668c669 Add all headers if they are matched with "equalTo"
Still TODO: other matcher types (regex etc.)

See gh-105
2016-10-11 14:31:40 +02:00
Dave Syer
870e42f565 Fix mock server when path is empty
When the path is empty "/" is a better default than "null".
2016-10-11 13:57:36 +02:00
Dave Syer
4313717e01 Check that header exists explicitly while loading stubs
Fixes gh-103
2016-10-11 09:49:30 +01:00
Dave Syer
1d32db483b Add test and correct double "/" in fail path
A double "/" wrks with the file system but not in a jar file
apparently, so the test isn't perfect yet. Also improves
javadocs for stubs().
2016-10-11 09:38:37 +01:00
Marcin Grzejszczak
6381362ad6 Going back to Snapshots 2016-09-23 21:04:10 +02:00
Marcin Grzejszczak
8ee2ef4b18 Bumping versions before release 2016-09-23 20:07:58 +02:00
Marcin Grzejszczak
24b3f80e8c Going back to SNAPSHOTs 2016-09-08 23:25:23 +02:00
Marcin Grzejszczak
411ca5886b Bumping versions before RC1 release 2016-09-08 23:25:23 +02:00
Marcin Grzejszczak
bfc2172d66 Applied checkstyle rules 2016-08-29 12:04:21 +02:00
Marcin Grzejszczak
c59306ce5d Going back to snapshots 2016-08-27 00:27:55 +02:00
Marcin Grzejszczak
bf60a6b72f Bumping versions before release 2016-08-26 23:51:33 +02:00
Marcin Grzejszczak
64d6d3ef6c Automatic stub registration (#64)
before this change the support for Stub Runner Boot with Service Discovery was pretty useless since Stub Runner stubbed service discovery. That makes a lot of sense in unit / integration tests but not when you want to do some version of end to end tests. 

With this change you can pass a property to enable automated registration of stubs in Service Discovery.

Technical changes:
* Added Zookeeper registration
* Added Eureka registration
* Added Consul registration
* Added checkstyle plugin - fixed part of exceptions
2016-08-26 16:09:16 +02:00
Marcin Grzejszczak
c7665db7d9 Fixed code style issues 2016-08-12 11:46:41 +02:00
Dave Syer
33a287dfb8 Polish 2016-07-28 10:23:02 +01:00
Dave Syer
bcce5699de Add additional build() step to allow ordered stubs 2016-07-28 09:32:30 +01:00
Dave Syer
417465b4bd Actually write the request matchers to the stub mapping 2016-07-27 09:22:52 +01:00
Dave Syer
5609ffe76c Add support for WireMock matchers on restdocs stub builder 2016-07-27 09:16:12 +01:00
Dave Syer
f46666324b Add some docs for restdocs usage and rename some things 2016-07-26 15:05:12 +01:00
Dave Syer
aa1d7dc074 Rename expect() to stubs() in mock server config 2016-07-26 14:29:20 +01:00
Dave Syer
997a17f923 Move restdocs stuff into its own package 2016-07-26 14:28:43 +01:00
Dave Syer
eb691717a2 Add support for automatically registering stubs in @AutoConfigureWireMock 2016-07-26 14:28:43 +01:00
Dave Syer
4305f40fd9 Expose WireMockServer for @Autowired in test class 2016-07-26 14:28:43 +01:00
Dave Syer
44eebcab0f Re-organize contract generation into a new helper 2016-07-26 14:28:43 +01:00