Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2018-03-27 15:27:15 +01:00
parent 097b38d5c5 0b0c9e1cc4
commit 8e338b6c73
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-restdocs-asciidoctor/src/main/resources/extensions/operation_block_macro.rb
View File

@@ -15,6 +15,7 @@ class OperationBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
def process(parent, operation, attributes)
snippets_dir = parent.document.attributes['snippets'].to_s
snippet_names = attributes.fetch 'snippets', ''
operation = parent.sub_attributes operation
snippet_titles = SnippetTitles.new parent.document.attributes
content = read_snippets(snippets_dir, snippet_names, parent, operation,
snippet_titles)

10
spring-restdocs-asciidoctor/src/test/java/org/springframework/restdocs/asciidoctor/OperationBlockMacroTests.java
View File

@@ -76,6 +76,16 @@ public class OperationBlockMacroTests {
assertThat(result, equalTo(getExpectedContentFromFile("snippet-simple")));
}
@Test
public void operationWithParameterizedName() throws Exception {
Attributes attributes = getAttributes();
attributes.setAttribute("name", "some");
this.options.setAttributes(attributes);
String result = this.asciidoctor.convert(
"operation::{name}-operation[snippets='curl-request']", this.options);
assertThat(result, equalTo(getExpectedContentFromFile("snippet-simple")));
}
@Test
public void codeBlockSnippetIncludeWithPdfBackend() throws Exception {
File output = configurePdfOutput();