jekyll-toc 0.12.2 → 0.15.0

data/gemfiles/jekyll_3.8.gemfile

@@ -2,6 +2,13 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "minitest-reporters"
+gem "minitest"
+gem "pry"
+gem "rake"
+gem "rubocop", "~> 0.81"
+gem "simplecov", "~> 0.17.1"
 gem "jekyll", "3.8"
 
 gemspec path: "../"

data/gemfiles/jekyll_3.9.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "minitest-reporters"
+gem "minitest"
+gem "pry"
+gem "rake"
+gem "rubocop", "~> 0.81"
+gem "simplecov", "~> 0.17.1"
+gem "jekyll", "3.9"
+
+gemspec path: "../"

data/gemfiles/jekyll_4.0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "minitest-reporters"
+gem "minitest"
+gem "pry"
+gem "rake"
+gem "rubocop", "~> 0.81"
+gem "simplecov", "~> 0.17.1"
+gem "jekyll", "4.0"
+
+gemspec path: "../"

data/gemfiles/jekyll_4.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "minitest-reporters"
+gem "minitest"
+gem "pry"
+gem "rake"
+gem "rubocop", "~> 0.81"
+gem "simplecov", "~> 0.17.1"
+gem "jekyll", "4.1"
+
+gemspec path: "../"

data/jekyll-toc.gemspec

@@ -1,30 +1,24 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version'
+require 'table_of_contents/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'jekyll-toc'
-  spec.version       = JekyllToc::VERSION
+  spec.version       = Jekyll::TableOfContents::VERSION
   spec.summary       = 'Jekyll Table of Contents plugin'
-  spec.description   = 'A liquid filter plugin for Jekyll which generates a table of contents.'
+  spec.description   = 'Jekyll (Ruby static website generator) plugin which generates a Table of Contents for the page.'
   spec.authors       = %w(toshimaru torbjoernk)
   spec.email         = 'me@toshimaru.net'
   spec.files         = `git ls-files -z`.split("\x0")
   spec.homepage      = 'https://github.com/toshimaru/jekyll-toc'
   spec.license       = 'MIT'
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test|spec)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
-
-  spec.add_runtime_dependency 'nokogiri', '~> 1.9'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'jekyll', '>= 3.5'
-  spec.add_development_dependency 'minitest', '~> 5.11'
-  spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_dependency 'jekyll', '>= 3.8'
+  spec.add_dependency 'nokogiri', '~> 1.10'
 end

data/lib/table_of_contents/configuration.rb

@@ -4,12 +4,13 @@ module Jekyll
   module TableOfContents
     # jekyll-toc configuration class
     class Configuration
-      attr_accessor :toc_levels, :no_toc_class, :no_toc_section_class,
-                    :list_class, :sublist_class, :item_class, :item_prefix
+      attr_reader :toc_levels, :no_toc_class, :ordered_list, :no_toc_section_class,
+                  :list_class, :sublist_class, :item_class, :item_prefix
 
       DEFAULT_CONFIG = {
         'min_level' => 1,
         'max_level' => 6,
+        'ordered_list' => false,
         'no_toc_section_class' => 'no_toc_section',
         'list_class' => 'section-nav',
         'sublist_class' => '',
@@ -21,6 +22,7 @@ module Jekyll
         options = generate_option_hash(options)
 
         @toc_levels = options['min_level']..options['max_level']
+        @ordered_list = options['ordered_list']
         @no_toc_class = 'no_toc'
         @no_toc_section_class = options['no_toc_section_class']
         @list_class = options['list_class']

data/lib/table_of_contents/helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module TableOfContents
+    # helper methods for Parser
+    module Helper
+      PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u.freeze
+
+      def generate_toc_id(text)
+        text = text.downcase
+                   .gsub(PUNCTUATION_REGEXP, '') # remove punctuation
+                   .tr(' ', '-') # replace spaces with dash
+        CGI.escape(text)
+      end
+    end
+  end
+end

data/lib/table_of_contents/parser.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'table_of_contents/helper'
+
 module Jekyll
   module TableOfContents
     # Parse html contents and generate table of contents
     class Parser
-      PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u
+      include ::Jekyll::TableOfContents::Helper
 
       def initialize(html, options = {})
         @doc = Nokogiri::HTML::DocumentFragment.parse(html)
@@ -17,11 +19,12 @@ module Jekyll
       end
 
       def build_toc
-        %(<ul class="#{@configuration.list_class}">\n#{build_toc_list(@entries)}</ul>)
+        %(<#{list_tag} class="#{@configuration.list_class}">\n#{build_toc_list(@entries)}</#{list_tag}>)
       end
 
       def inject_anchors_into_html
         @entries.each do |entry|
+          # NOTE: `entry[:id]` is automatically URL encoded by Nokogiri
           entry[:header_content].add_previous_sibling(
             %(<a class="anchor" href="##{entry[:id]}" aria-hidden="true"><span class="octicon octicon-link"></span></a>)
           )
@@ -41,10 +44,7 @@ module Jekyll
           .reject { |n| n.classes.include?(@configuration.no_toc_class) }
           .inject([]) do |entries, node|
           text = node.text
-          id = node.attribute('id') || text
-               .downcase
-               .gsub(PUNCTUATION_REGEXP, '') # remove punctuation
-               .tr(' ', '-') # replace spaces with dash
+          id = node.attribute('id') || generate_toc_id(text)
 
           suffix_num = headers[id]
           headers[id] += 1
@@ -74,7 +74,7 @@ module Jekyll
             next_i = i + 1
             if next_i < entries.count && entries[next_i][:h_num] > min_h_num
               nest_entries = get_nest_entries(entries[next_i, entries.count], min_h_num)
-              toc_list << %(\n<ul#{ul_attributes}>\n#{build_toc_list(nest_entries)}</ul>\n)
+              toc_list << %(\n<#{list_tag}#{ul_attributes}>\n#{build_toc_list(nest_entries)}</#{list_tag}>\n)
               i += nest_entries.count
             end
             # Add the closing tag for the current entry in the list
@@ -107,7 +107,7 @@ module Jekyll
       end
 
       def toc_headings_in_no_toc_section
-        if @configuration.no_toc_section_class.is_a? Array
+        if @configuration.no_toc_section_class.is_a?(Array)
           @configuration.no_toc_section_class.map { |cls| toc_headings_within(cls) }.join(',')
         else
           toc_headings_within(@configuration.no_toc_section_class)
@@ -121,6 +121,10 @@ module Jekyll
       def ul_attributes
         @ul_attributes ||= @configuration.sublist_class.empty? ? '' : %( class="#{@configuration.sublist_class}")
       end
+
+      def list_tag
+        @list_tag ||= @configuration.ordered_list ? 'ol' : 'ul'
+      end
     end
   end
 end

data/lib/table_of_contents/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module TableOfContents
+    VERSION = '0.15.0'
+  end
+end

data/test/parser/test_inject_anchors_filter.rb

@@ -18,6 +18,6 @@ class TestInjectAnchorsFilter < Minitest::Test
   def test_does_not_inject_toc
     html = @parser.inject_anchors_into_html
 
-    assert_nil(/<ul class="section-nav">/ =~ html)
+    refute_includes(html, %(<ul class="section-nav">))
   end
 end

data/test/parser/{test_option_error.rb → test_invalid_options.rb}

@@ -2,9 +2,9 @@
 
 require 'test_helper'
 
-class TestOptionError < Minitest::Test
+class TestInvalidOptions < Minitest::Test
   BASE_HTML = '<h1>h1</h1>'
-  EXPECTED_HTML = <<~HTML
+  EXPECTED_HTML = <<~HTML.chomp
     <ul class="section-nav">
     <li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
     </ul>
@@ -12,29 +12,21 @@ class TestOptionError < Minitest::Test
 
   def test_option_is_nil
     parser = Jekyll::TableOfContents::Parser.new(BASE_HTML, nil)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = EXPECTED_HTML
-    assert_equal(expected, doc.css('ul.section-nav').to_s)
+    assert_equal(EXPECTED_HTML, parser.build_toc)
   end
 
   def test_option_is_epmty_string
     parser = Jekyll::TableOfContents::Parser.new(BASE_HTML, '')
-    doc = Nokogiri::HTML(parser.toc)
-    expected = EXPECTED_HTML
-    assert_equal(expected, doc.css('ul.section-nav').to_s)
+    assert_equal(EXPECTED_HTML, parser.build_toc)
   end
 
   def test_option_is_string
     parser = Jekyll::TableOfContents::Parser.new(BASE_HTML, 'string')
-    doc = Nokogiri::HTML(parser.toc)
-    expected = EXPECTED_HTML
-    assert_equal(expected, doc.css('ul.section-nav').to_s)
+    assert_equal(EXPECTED_HTML, parser.build_toc)
   end
 
   def test_option_is_array
     parser = Jekyll::TableOfContents::Parser.new(BASE_HTML, [])
-    doc = Nokogiri::HTML(parser.toc)
-    expected = EXPECTED_HTML
-    assert_equal(expected, doc.css('ul.section-nav').to_s)
+    assert_equal(EXPECTED_HTML, parser.build_toc)
   end
 end

data/test/parser/test_ordered_list.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class TestOrderedList < Minitest::Test
+  include TestHelpers
+
+  def test_default_configuration
+    configuration = Jekyll::TableOfContents::Configuration.new({})
+
+    refute(configuration.ordered_list)
+  end
+
+  def test_disabled_ordered_list
+    configuration = Jekyll::TableOfContents::Configuration.new('ordered_list' => false)
+
+    refute(configuration.ordered_list)
+  end
+
+  def test_enabled_ordered_list
+    configuration = Jekyll::TableOfContents::Configuration.new('ordered_list' => true)
+
+    assert(configuration.ordered_list)
+  end
+
+  def test_basic_ordered_list_top_heading
+    parse_with_ordered_list
+    html = @parser.toc
+
+    assert_match(/^<ol class="section-nav">/, html)
+  end
+
+  def test_ordered_list_sub_headings
+    parse_with_ordered_list
+    html = @parser.toc
+
+    assert_match(/<ol>\n<li class="toc-entry/, html)
+  end
+
+  def test_ordered_list_top_heading_with_classes
+    parse_with_ordered_list_and_classes
+    html = @parser.toc
+
+    assert_match(/^<ol class="top-list-class">/, html)
+  end
+
+  def test_ordered_list_sub_headings_with_classes
+    parse_with_ordered_list_and_classes
+    html = @parser.toc
+
+    assert_match(/<ol class="sublist-class">/, html)
+  end
+
+  def test_ordered_list_subheadings_with_classes_nested_structure
+    parse_with_ordered_list_and_classes
+    html = @parser.toc
+
+    occurrences = html.scan(/<ol class="sublist-class">/).count
+
+    assert_equal(5, occurrences)
+  end
+
+  private
+
+  def parse_with_ordered_list
+    read_html_and_create_parser('ordered_list' => true)
+  end
+
+  def parse_with_ordered_list_and_classes
+    read_html_and_create_parser(
+      'ordered_list' => true,
+      'list_class' => 'top-list-class',
+      'sublist_class' => 'sublist-class'
+    )
+  end
+end

data/test/parser/test_toc_only_filter.rb

@@ -12,12 +12,12 @@ class TestTOCOnlyFilter < Minitest::Test
   def test_injects_toc_container
     html = @parser.build_toc
 
-    assert_match(/<ul class="section-nav">/, html)
+    assert_includes(html, %(<ul class="section-nav">))
   end
 
   def test_does_not_return_content
     html = @parser.build_toc
 
-    assert_nil(%r{<h1>Simple H1</h1>} =~ html)
+    refute_includes(html, %(<h1>Simple H1</h1>))
   end
 end

data/test/parser/test_various_toc_html.rb

@@ -3,75 +3,19 @@
 require 'test_helper'
 
 class TestVariousTocHtml < Minitest::Test
-  # ref. https://github.com/toshimaru/jekyll-toc/issues/45
-  ANGLE_BRACKET_HTML = <<~HTML
-    <h1>h1</h1>
-    <h1>&lt;base href&gt;</h1>
-    <h1>&amp; &lt; &gt;</h1>
-  HTML
-
-  NO_TOC_HTML = <<~HTML
-    <h1>h1</h1>
-    <h1 class="no_toc">no_toc h1</h1>
-    <h2>h2</h2>
-    <h2 class="no_toc">no_toc h2</h2>
-    <h3>h3</h3>
-    <h3 class="no_toc">no_toc h3</h3>
-    <h4>h4</h4>
-    <h4 class="no_toc">no_toc h4</h4>
-  HTML
-
-  JAPANESE_HEADINGS_HTML = <<~HTML
-    <h1>あ</h1>
-    <h2>い</h2>
-    <h3>う</h3>
-  HTML
-
-  TAGS_INSIDE_HEADINGS_HTML = <<~HTML
-    <h2><strong>h2</strong></h2>
-    <h2><em>h2</em></h2>
-  HTML
-
-  TEST_HTML_1 = <<~HTML
-    <h1>h1</h1>
-    <h3>h3</h3>
-    <h6>h6</h6>
-  HTML
-
-  TEST_HTML_2 = <<~HTML
+  TEST_HTML = <<~HTML
     <h1>h1</h1>
     <h3>h3</h3>
-    <h2>h2</h2>
-    <h6>h6</h6>
-  HTML
-
-  TEST_HTML_3 = <<~HTML
     <h6>h6</h6>
-    <h5>h5</h5>
-    <h4>h4</h4>
-    <h3>h3</h3>
-    <h2>h2</h2>
-    <h1>h1</h1>
-  HTML
-
-  TEST_HTML_4 = <<~HTML
-    <h1>h1</h1>
-    <h3>h3</h3>
-    <h2>h2</h2>
-    <h4>h4</h4>
-    <h5>h5</h5>
   HTML
 
   def test_nested_toc
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_1)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML)
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
-      <li class="toc-entry toc-h3">
-      <a href="#h3">h3</a>
+      <li class="toc-entry toc-h3"><a href="#h3">h3</a>
       <ul>
       <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
       </ul>
@@ -80,35 +24,34 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_nested_toc_with_min_and_max
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_1, 'min_level' => 2, 'max_level' => 5)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML, 'min_level' => 2, 'max_level' => 5)
+    expected = <<~HTML.chomp
       <ul class="section-nav">
       <li class="toc-entry toc-h3"><a href="#h3">h3</a></li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_complex_nested_toc
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_2)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <h3>h3</h3>
+      <h2>h2</h2>
+      <h6>h6</h6>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
       <li class="toc-entry toc-h3"><a href="#h3">h3</a></li>
-      <li class="toc-entry toc-h2">
-      <a href="#h2">h2</a>
+      <li class="toc-entry toc-h2"><a href="#h2">h2</a>
       <ul>
       <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
       </ul>
@@ -117,15 +60,20 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_decremental_headings1
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_3)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h6>h6</h6>
+      <h5>h5</h5>
+      <h4>h4</h4>
+      <h3>h3</h3>
+      <h2>h2</h2>
+      <h1>h1</h1>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
       <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
       <li class="toc-entry toc-h5"><a href="#h5">h5</a></li>
@@ -135,25 +83,26 @@ class TestVariousTocHtml < Minitest::Test
       <li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_decremental_headings2
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_4)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <h3>h3</h3>
+      <h2>h2</h2>
+      <h4>h4</h4>
+      <h5>h5</h5>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
       <li class="toc-entry toc-h3"><a href="#h3">h3</a></li>
-      <li class="toc-entry toc-h2">
-      <a href="#h2">h2</a>
+      <li class="toc-entry toc-h2"><a href="#h2">h2</a>
       <ul>
-      <li class="toc-entry toc-h4">
-      <a href="#h4">h4</a>
+      <li class="toc-entry toc-h4"><a href="#h4">h4</a>
       <ul>
       <li class="toc-entry toc-h5"><a href="#h5">h5</a></li>
       </ul>
@@ -165,22 +114,27 @@ class TestVariousTocHtml < Minitest::Test
       </ul>
     HTML
 
-    assert_equal(expected, doc.css('ul.section-nav').to_s)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_no_toc
-    parser = Jekyll::TableOfContents::Parser.new(NO_TOC_HTML)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <h1 class="no_toc">no_toc h1</h1>
+      <h2>h2</h2>
+      <h2 class="no_toc">no_toc h2</h2>
+      <h3>h3</h3>
+      <h3 class="no_toc">no_toc h3</h3>
+      <h4>h4</h4>
+      <h4 class="no_toc">no_toc h4</h4>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
-      <li class="toc-entry toc-h2">
-      <a href="#h2">h2</a>
+      <li class="toc-entry toc-h2"><a href="#h2">h2</a>
       <ul>
-      <li class="toc-entry toc-h3">
-      <a href="#h3">h3</a>
+      <li class="toc-entry toc-h3"><a href="#h3">h3</a>
       <ul>
       <li class="toc-entry toc-h4"><a href="#h4">h4</a></li>
       </ul>
@@ -191,21 +145,21 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_japanese_toc
-    parser = Jekyll::TableOfContents::Parser.new(JAPANESE_HEADINGS_HTML)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>あ</h1>
+      <h2>い</h2>
+      <h3>う</h3>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#%E3%81%82">あ</a>
+      <li class="toc-entry toc-h1"><a href="#%E3%81%82">あ</a>
       <ul>
-      <li class="toc-entry toc-h2">
-      <a href="#%E3%81%84">い</a>
+      <li class="toc-entry toc-h2"><a href="#%E3%81%84">い</a>
       <ul>
       <li class="toc-entry toc-h3"><a href="#%E3%81%86">う</a></li>
       </ul>
@@ -214,59 +168,61 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
+    html_with_anchors = parser.inject_anchors_into_html
+    assert_match(%r{<a class="anchor" href="#%E3%81%82" aria-hidden="true"><span.*span></a>あ}, html_with_anchors)
+    assert_match(%r{<a class="anchor" href="#%E3%81%84" aria-hidden="true"><span.*span></a>い}, html_with_anchors)
+    assert_match(%r{<a class="anchor" href="#%E3%81%86" aria-hidden="true"><span.*span></a>う}, html_with_anchors)
   end
 
+  # ref. https://github.com/toshimaru/jekyll-toc/issues/45
   def test_angle_bracket
-    parser = Jekyll::TableOfContents::Parser.new(ANGLE_BRACKET_HTML)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <h1>&lt;base href&gt;</h1>
+      <h1>&amp; &lt; &gt;</h1>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
       <li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
       <li class="toc-entry toc-h1"><a href="#base-href">&lt;base href&gt;</a></li>
       <li class="toc-entry toc-h1"><a href="#--">&amp; &lt; &gt;</a></li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_tags_inside_heading
-    parser = Jekyll::TableOfContents::Parser.new(TAGS_INSIDE_HEADINGS_HTML)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h2><strong>h2</strong></h2>
+      <h2><em>h2</em></h2>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
       <li class="toc-entry toc-h2"><a href="#h2">h2</a></li>
       <li class="toc-entry toc-h2"><a href="#h2-1">h2</a></li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
 
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
   end
 
-  TEST_HTML_IGNORE = <<~HTML
-    <h1>h1</h1>
-    <div class="no_toc_section">
-    <h2>h2</h2>
-    </div>
-    <h3>h3</h3>
-    <h6>h6</h6>
-  HTML
-
   def test_nested_toc_with_no_toc_section_class
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_IGNORE)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <div class="no_toc_section">
+      <h2>h2</h2>
+      </div>
+      <h3>h3</h3>
+      <h6>h6</h6>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
-      <li class="toc-entry toc-h3">
-      <a href="#h3">h3</a>
+      <li class="toc-entry toc-h3"><a href="#h3">h3</a>
       <ul>
       <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
       </ul>
@@ -275,8 +231,7 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
 
     html = parser.inject_anchors_into_html
     assert_match(%r{<h1>.+</h1>}m, html)
@@ -285,29 +240,24 @@ class TestVariousTocHtml < Minitest::Test
     assert_includes(html, '<h2>h2</h2>')
   end
 
-  TEST_HTML_IGNORE_2 = <<~HTML
-    <h1>h1</h1>
-    <div class="exclude">
-    <h2>h2</h2>
-    </div>
-    <h3>h3</h3>
-    <div class="exclude">
-    <h4>h4</h4>
-    <h5>h5</h5>
-    </div>
-    <h6>h6</h6>
-  HTML
-
   def test_nested_toc_with_no_toc_section_class_option
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_IGNORE_2, 'no_toc_section_class' => 'exclude')
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML, 'no_toc_section_class' => 'exclude')
+      <h1>h1</h1>
+      <div class="exclude">
+      <h2>h2</h2>
+      </div>
+      <h3>h3</h3>
+      <div class="exclude">
+      <h4>h4</h4>
+      <h5>h5</h5>
+      </div>
+      <h6>h6</h6>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
-      <li class="toc-entry toc-h3">
-      <a href="#h3">h3</a>
+      <li class="toc-entry toc-h3"><a href="#h3">h3</a>
       <ul>
       <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
       </ul>
@@ -316,8 +266,7 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
 
     html = parser.inject_anchors_into_html
     assert_match(%r{<h1>.+</h1>}m, html)
@@ -328,29 +277,24 @@ class TestVariousTocHtml < Minitest::Test
     assert_includes(html, '<h5>h5</h5>')
   end
 
-  TEST_HTML_IGNORE_3 = <<~HTML
-    <h1>h1</h1>
-    <div class="no_toc_section">
-    <h2>h2</h2>
-    </div>
-    <h3>h3</h3>
-    <div class="exclude">
-    <h4>h4</h4>
-    <h5>h5</h5>
-    </div>
-    <h6>h6</h6>
-  HTML
-
   def test_multiple_no_toc_section_classes
-    parser = Jekyll::TableOfContents::Parser.new(TEST_HTML_IGNORE_3, 'no_toc_section_class' => ['no_toc_section', 'exclude'])
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML, 'no_toc_section_class' => ['no_toc_section', 'exclude'])
+      <h1>h1</h1>
+      <div class="no_toc_section">
+      <h2>h2</h2>
+      </div>
+      <h3>h3</h3>
+      <div class="exclude">
+      <h4>h4</h4>
+      <h5>h5</h5>
+      </div>
+      <h6>h6</h6>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
-      <li class="toc-entry toc-h1">
-      <a href="#h1">h1</a>
+      <li class="toc-entry toc-h1"><a href="#h1">h1</a>
       <ul>
-      <li class="toc-entry toc-h3">
-      <a href="#h3">h3</a>
+      <li class="toc-entry toc-h3"><a href="#h3">h3</a>
       <ul>
       <li class="toc-entry toc-h6"><a href="#h6">h6</a></li>
       </ul>
@@ -359,8 +303,7 @@ class TestVariousTocHtml < Minitest::Test
       </li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
 
     html = parser.inject_anchors_into_html
     assert_match(%r{<h1>.+</h1>}m, html)
@@ -371,24 +314,20 @@ class TestVariousTocHtml < Minitest::Test
     assert_includes(html, '<h5>h5</h5>')
   end
 
-  TEST_EXPLICIT_ID = <<~HTML
-    <h1>h1</h1>
-    <h1 id="second">h2</h1>
-    <h1 id="third">h3</h1>
-  HTML
-
   def test_toc_with_explicit_id
-    parser = Jekyll::TableOfContents::Parser.new(TEST_EXPLICIT_ID)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <h1 id="second">h2</h1>
+      <h1 id="third">h3</h1>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
       <li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
       <li class="toc-entry toc-h1"><a href="#second">h2</a></li>
       <li class="toc-entry toc-h1"><a href="#third">h3</a></li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
-    assert_equal(expected, actual)
+    assert_equal(expected, parser.build_toc)
 
     html = parser.inject_anchors_into_html
     assert_includes(html, %(<a class="anchor" href="#h1" aria-hidden="true">))
@@ -396,39 +335,33 @@ class TestVariousTocHtml < Minitest::Test
     assert_includes(html, %(<a class="anchor" href="#third" aria-hidden="true">))
   end
 
-  TEST_UNIQ_ID = <<~HTML
-    <h1>h1</h1>
-    <h1>h1</h1>
-    <h1>h1</h1>
-  HTML
-
   def test_anchor_is_uniq
-    parser = Jekyll::TableOfContents::Parser.new(TEST_UNIQ_ID)
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    parser = Jekyll::TableOfContents::Parser.new(<<~HTML)
+      <h1>h1</h1>
+      <h1>h1</h1>
+      <h1>h1</h1>
+    HTML
+    expected = <<~HTML.chomp
       <ul class="section-nav">
       <li class="toc-entry toc-h1"><a href="#h1">h1</a></li>
       <li class="toc-entry toc-h1"><a href="#h1-1">h1</a></li>
       <li class="toc-entry toc-h1"><a href="#h1-2">h1</a></li>
       </ul>
     HTML
-    actual = doc.css('ul.section-nav').to_s
-    assert_equal(expected, actual)
+
+    assert_equal(expected, parser.build_toc)
   end
 
   def test_custom_css_classes
     parser = Jekyll::TableOfContents::Parser.new(
-      TEST_HTML_1,
+      TEST_HTML,
       'item_class' => 'custom-item', 'list_class' => 'custom-list', 'sublist_class' => 'custom-sublist', 'item_prefix' => 'custom-prefix-'
     )
-    doc = Nokogiri::HTML(parser.toc)
-    expected = <<~HTML
+    expected = <<~HTML.chomp
       <ul class="custom-list">
-      <li class="custom-item custom-prefix-h1">
-      <a href="#h1">h1</a>
+      <li class="custom-item custom-prefix-h1"><a href="#h1">h1</a>
       <ul class="custom-sublist">
-      <li class="custom-item custom-prefix-h3">
-      <a href="#h3">h3</a>
+      <li class="custom-item custom-prefix-h3"><a href="#h3">h3</a>
       <ul class="custom-sublist">
       <li class="custom-item custom-prefix-h6"><a href="#h6">h6</a></li>
       </ul>
@@ -438,6 +371,6 @@ class TestVariousTocHtml < Minitest::Test
       </ul>
     HTML
 
-    assert_equal(expected, doc.css('ul.custom-list').to_s)
+    assert_equal(expected, parser.build_toc)
   end
 end