Skip to content

Commit

Permalink
Merge pull request #1074 from robertpanzer/upgrade-asciidoctor-2.0.17
Browse files Browse the repository at this point in the history
Upgrade to asciidoctor 2.0.17
  • Loading branch information
robertpanzer committed Jan 8, 2022
2 parents 5765549 + a50573b commit f54746e
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 95 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co

Improvement::

* Upgrade to asciidoctorj 2.0.17 (#1074)
* Upgrade to asciidoctorj-pdf 1.6.2 (#1073)
* Upgrade to rouge 3.27.0 (#1073)
* Upgrade to asciidoctorj-diagram 2.2.1 (#1066) (@abelsromero) (#1065)
* Upgrade to jruby 9.2.20.1 (#1074)
* Upgrade to rouge 3.27.0 (#1073)
* Upgrade CLI to use JCommander 1.81 (@abelsromero) (#1067)

Build Improvement::
Expand All @@ -28,6 +30,9 @@ Build Improvement::
Documentation::

* Clarify execution order for extensions (@rockyallen) (#1068)
* Added docs for attributes and positional attributes in extensions (#1072)
* Added docs for how to log from extensions (#1071)


== 2.5.2 (2021-08-08)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import org.junit.runner.RunWith
import spock.lang.Ignore
import spock.lang.Specification

import static org.asciidoctor.OptionsBuilder.options

@RunWith(ArquillianSputnik)
class WhenExtensionsAreRegisteredAsService extends Specification {

Expand Down Expand Up @@ -51,14 +49,15 @@ class WhenExtensionsAreRegisteredAsService extends Specification {
//To avoid registering the same extension over and over for all tests, service is instantiated manually.
new ArrowsAndBoxesExtension().register(asciidoctor)

Options options = options().inPlace(false)
.toFile(new File(testFolder.getRoot(), FILENAME_HTML))
.safe(SafeMode.UNSAFE).get()
File renderedFile = testFolder.newFile(FILENAME_HTML)
Options options = Options.builder()
.inPlace(false)
.toFile(renderedFile)
.safe(SafeMode.UNSAFE).build()

asciidoctor.convertFile(classpath.getResource('arrows-and-boxes-example.ad'), options)

then:
File renderedFile = new File(testFolder.getRoot(), FILENAME_HTML)
Document doc = Jsoup.parse(renderedFile, 'UTF-8')

Element arrowsJs = doc.select('script[src=http://www.headjump.de/javascripts/arrowsandboxes.js').first()
Expand Down

0 comments on commit f54746e

Please sign in to comment.