Commit Graph

596 Commits

Author SHA1 Message Date
Andy Wilkinson
3f127897c3 Merge branch '1.2.x' 2017-10-13 11:53:36 +01:00
Andy Wilkinson
caf01d1f21 Revert "Make sure that spring-aop is available at test runtime"
This reverts commit 26707cd7ac.

See gh-411
2017-10-13 11:42:33 +01:00
Andy Wilkinson
3d7262ae46 Merge branch '1.2.x' 2017-10-12 10:37:05 +01:00
Andy Wilkinson
440997c72b Merge pull request #431 from Johnny Lim
* gh-431:
  Polish “Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor”
  Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor
2017-10-12 10:36:57 +01:00
Andy Wilkinson
0c8ec11c9c Polish “Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor” 2017-10-12 10:36:23 +01:00
Johnny Lim
9bd9fa31dc Reuse ObjectMapper in FieldPathPayloadSubsectionExtractor
Closes gh-431
2017-10-12 10:33:40 +01:00
Andy Wilkinson
04632c24fb Merge branch '1.2.x' 2017-09-28 06:58:25 +01:00
Andy Wilkinson
d1881c30e2 Update the samples to use the latest snapshots 2017-09-28 06:57:44 +01:00
Spring Buildmaster
f6002a00a3 Next development version 2017-09-28 05:54:30 +00:00
Andy Wilkinson
dd976ad299 Merge branch '1.2.x' 2017-09-23 19:46:38 +01:00
Andy Wilkinson
9e3a3c0536 Upgrade to latest version of JRuby to avoid problems on Windows
See https://github.com/jruby/jruby/issues/4745
2017-09-23 19:45:59 +01:00
Andy Wilkinson
21addcfdb6 Merge branch '1.2.x' 2017-09-23 18:01:31 +01:00
Andy Wilkinson
47bcc45e45 Upgrade dependencies 2017-09-23 18:00:17 +01:00
Andy Wilkinson
de67160b1e Merge branch '1.2.x' 2017-09-23 17:40:29 +01:00
Andy Wilkinson
d22dc1e211 Include filename in Content-Disposition header when available
Closes gh-425
2017-09-23 17:40:22 +01:00
Andy Wilkinson
4e99df6b75 Merge branch '1.2.x' 2017-09-23 17:20:55 +01:00
Andy Wilkinson
7c6c2e7523 Polish 2017-09-23 17:20:03 +01:00
Andy Wilkinson
5f7aa1af56 Merge branch '1.2.x' 2017-09-23 16:41:05 +01:00
Andy Wilkinson
a084175afd Fix field extraction and type resolution beneath arrays and wildcards
Fixes gh-422
Fixes gh-423
2017-09-23 16:40:12 +01:00
Andy Wilkinson
4854bc949f Fix type resolution for fields with null and non-null values
Closes gh-398
2017-09-23 16:40:07 +01:00
Andy Wilkinson
645a60a787 Merge branch '1.2.x' 2017-07-17 09:03:48 +01:00
Andy Wilkinson
a123e06d06 Update build status image URL following changes to Bamboo 2017-07-17 09:02:55 +01:00
Andy Wilkinson
190ca2c450 Merge branch '1.2.x' 2017-07-09 11:09:02 +01:00
Andy Wilkinson
26707cd7ac Make sure that spring-aop is available at test runtime
Closes gh-411
2017-07-09 11:08:15 +01:00
Andy Wilkinson
5ac105db83 Merge branch '1.2.x' 2017-07-02 10:31:01 +01:00
Andy Wilkinson
a38a512033 Require occasionally null or absent field in array to be marked optional
Closes gh-402
2017-07-02 10:29:27 +01:00
Andy Wilkinson
3ac173c149 Merge branch '1.2.x' 2017-07-01 16:30:37 +01:00
Andy Wilkinson
a84bb0c569 Make new snippet relaxed when adding descriptors to relaxed snippet
Closes gh-400
2017-07-01 16:27:40 +01:00
Andy Wilkinson
ab2dbb2b4c Merge branch '1.2.x' 2017-07-01 16:06:51 +01:00
Andy Wilkinson
214c068ece Remove Accept: */* header from REST Assured requests
Closes gh-404
2017-07-01 16:05:31 +01:00
Andy Wilkinson
d75a1b4277 Merge pull request #397 from Johnny Lim
* gh-397:
  Add missing space to assertion failure message in the tests
2017-07-01 11:23:36 +01:00
Johnny Lim
9a22ec0442 Add missing space to assertion failure message in the tests
Closes gh-397
2017-07-01 11:22:59 +01:00
Andy Wilkinson
fbd13e30b0 Merge branch '1.2.x' 2017-07-01 11:14:55 +01:00
Andy Wilkinson
eac0e2c2d3 Merge branch 'gh-398' into 1.2.x 2017-07-01 11:13:10 +01:00
Andy Wilkinson
6bf1edcd09 Improve handling of null fields beneath an array
Previously, if an array contained objects where a field was sometimes
null and sometimes had a value of a consistent type, the type inferred
type was varies. Furthermore, it was not possible for the user to
specify a type other than varies as a mismatch would be detected.

This commit updates JsonFieldTypeResolver so that, when dealing with
an imprecise field path (i.e. a path for a field within an array),
null values that don't match the common type for the field are
ignored. This produces the following behavior when nulls are involved:

- All null fields results in the null type
- A mixture of nulls and a particular type results in the particular
  type
- A mixture of nulls and two or more other types results in the varies
  type

Closes gh-398
2017-07-01 11:07:38 +01:00
Andy Wilkinson
5cef4745f7 Polish new response fields test and add equivalent for request fields
See gh-399
2017-07-01 10:57:26 +01:00
Nakul Chaudhari
288ebf771a Add a test that shows problem with sometimes null field within an array
Closes gh-399
2017-07-01 10:52:26 +01:00
Andy Wilkinson
1499eabef3 Merge branch '1.2.x' 2017-06-30 19:57:02 +01:00
Andy Wilkinson
dff9062a32 Fix formatting problems in the documentation
Previously, the included .adoc files did not consistently end with a 
blank line. In certain cases, Asciidoctor requires a blank line before a
new section. As a result, the lack of blank lines meant that some
section headings did not appear correctly.

This commit updates each of the included .adoc files in the
documentation to ensure that each ends with a blank line.
2017-06-30 19:56:56 +01:00
Andy Wilkinson
e6d548407c Merge branch '1.2.x' 2017-06-30 19:56:24 +01:00
Andy Wilkinson
2650bd3bac Merge pull request #409 from Oliver Zeit
* gh-409:
  Fix formatting of reference to HeaderDocumentation in the docs
2017-06-30 19:56:19 +01:00
ooz
a8d51da4f4 Fix formatting of reference to HeaderDocumentation in the docs
Closes gh-409
2017-06-30 19:56:08 +01:00
Andy Wilkinson
893a38694e Merge pull request #408 from Johnny Lim
* gh-408:
  Correct the documentation generated by the JUnit 5 sample
2017-06-29 12:32:13 +01:00
Johnny Lim
59311292ba Correct the documentation generated by the JUnit 5 sample
Closes gh-408
2017-06-29 12:31:30 +01:00
Andy Wilkinson
c5d8b2fe0e Merge branch '1.2.x' 2017-05-30 13:13:45 +01:00
Andy Wilkinson
ba327f1e9a Ensure that all nodes for a snippet refer to main document
Previously, when the operation block macro rendered the fragment
for a snippet, every top-level block in the fragment had its parent
set. Setting the parent has the side-effect of also setting the
block's document to be that of its parent. This meant that every
top-level block's document referred to the main document, but any
descendents were left with their document referring to the fragment
document. This did not cause a problem with the HTML backend (which
does not consider a block's document) but the PDF backend does
consider a block's document resulting in the descendents being
omitted from the generated PDF.

This commit updates the operation block macro to set the parent of
every block in the fragment to its correct value. This has the
side-effect of causing the block to update its document reference to
point to the main document.

Closes gh-396
2017-05-30 13:11:01 +01:00
Andy Wilkinson
5af574a48a Upgrade to snapshots of the latest Spring IO plugin 2017-05-19 19:52:35 +02:00
Andy Wilkinson
84f8e55101 Update documentation after removal of deprecated REST Assured 2 support
See gh-387 and 6986cb75
2017-05-19 17:36:30 +02:00
Andy Wilkinson
0e6e785fb0 Add support for JUnit 5
This commit adds support for JUnit 5 and its Jupiter programming
model. A new Jupiter Extension implementation,
RestDocumentationExtension, is provided. This extension can be applied
to a test class to allow it to use Spring REST Docs to document a
RESTful API.

Closes gh-296
2017-05-19 17:29:12 +02:00
Andy Wilkinson
6986cb75a8 Remove deprecated code
Closes gh-387
2017-05-19 09:27:06 +02:00