use pygments.rb 2.0.0 in CI (PR #1860)

.github/workflows/ci.yml

@@ -56,8 +56,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       ASCIIDOCTOR_DIAGRAM_VERSION: '~> 2.1.0'
-      MENTOS_TIMEOUT: 30 # give pygments.rb calls more time to execute (in seconds)
-      PYGMENTS_VERSION: '~> 1.2.0' # test runner will automatically disable Pygments tests on JRuby for Windows
+      PYGMENTS_VERSION: '~> 2.0.0'
       RGHOST_VERSION: '0.9.7'
     steps:
     - name: Checkout

.github/workflows/upstream-dispatch.yml

@@ -5,7 +5,7 @@ jobs:
     name: ${{ github.event.client_payload.message }}
     runs-on: ubuntu-latest
     env:
-      PYGMENTS_VERSION: '~> 1.2.0'
+      PYGMENTS_VERSION: '~> 2.0.0'
       RGHOST_VERSION: '0.9.7'
       PRAWN_GMAGICK_VERSION: '0.0.9'
     steps:

CHANGELOG.adoc

@@ -163,6 +163,7 @@ Build / Infrastructure::
 * enable CI job on macOS (#1817)
 * test against Asciidoctor upstream (#1821)
 * skip tests for unreadable files when euid is 0
+* test against pygments.rb 2.0.0
 
 == 1.5.3 (2020-02-28) - @mojavelinux
 

spec/source_spec.rb

@@ -907,7 +907,7 @@ class Type; end
     end
   end
 
-  context 'Pygments', if: (gem_available? 'pygments.rb') && !(windows? && jruby?), &(proc do
+  context 'Pygments', if: (gem_available? 'pygments.rb'), &(proc do
     it 'should highlight source using Pygments if source-highlighter is pygments' do
       pdf = to_pdf <<~'EOS', analyze: true
       :source-highlighter: pygments
@@ -977,9 +977,12 @@ class << xml_lexer
             key: "value"
         ----
         EOS
-        (expect pdf.find_text 'category:').to have_size 1
-        (expect pdf.find_text %(\u00a0 hash:)).to have_size 1
-        (expect pdf.find_text %(\u00a0   key: )).to have_size 1
+        (expect pdf.find_text %r/: ?/).to have_size 3
+        lines = pdf.lines
+        (expect lines).to have_size 3
+        (expect lines[0]).to eql 'category:'
+        (expect lines[1]).to eql %(\u00a0 hash:)
+        (expect lines[2]).to eql %(\u00a0   key: "value")
         (expect pdf.find_text '"value"').to have_size 1
       end).not_to raise_exception
     end
@@ -1549,7 +1552,7 @@ def highlight?
     end
 
     it 'should preserve space before callout on final line' do
-      ['rouge', (gem_available? 'pygments.rb') && !(windows? && jruby?) ? 'pygments' : nil].compact.each do |highlighter|
+      ['rouge', (gem_available? 'pygments.rb') ? 'pygments' : nil].compact.each do |highlighter|
         pdf = to_pdf <<~'EOS', attribute_overrides: { 'source-highlighter' => highlighter }, analyze: true
         [source,java]
         ----