nanoc 3.6.1 → 3.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (120) hide show
  1. checksums.yaml +15 -0
  2. data/Gemfile.lock +4 -4
  3. data/LICENSE +1 -1
  4. data/NEWS.md +17 -0
  5. data/lib/nanoc.rb +1 -1
  6. data/lib/nanoc/base/result_data/item_rep.rb +20 -12
  7. data/lib/nanoc/base/source_data/item_array.rb +1 -1
  8. data/lib/nanoc/cli/commands/check.rb +1 -1
  9. data/lib/nanoc/cli/commands/deploy.rb +32 -23
  10. data/lib/nanoc/cli/commands/prune.rb +2 -2
  11. data/lib/nanoc/cli/commands/validate-css.rb +1 -0
  12. data/lib/nanoc/cli/commands/validate-html.rb +1 -0
  13. data/lib/nanoc/cli/commands/validate-links.rb +2 -0
  14. data/lib/nanoc/cli/commands/watch.rb +1 -1
  15. data/lib/nanoc/extra/checking/checks/external_links.rb +5 -2
  16. data/lib/nanoc/extra/checking/runner.rb +9 -4
  17. data/lib/nanoc/filters/rdoc.rb +9 -2
  18. data/lib/nanoc/helpers/breadcrumbs.rb +10 -15
  19. data/nanoc.gemspec +3 -2
  20. data/test/base/test_checksum_store.rb +1 -3
  21. data/test/base/test_code_snippet.rb +1 -3
  22. data/test/base/test_compiler.rb +24 -3
  23. data/test/base/test_compiler_dsl.rb +1 -3
  24. data/test/base/test_context.rb +1 -3
  25. data/test/base/test_data_source.rb +1 -3
  26. data/test/base/test_dependency_tracker.rb +1 -3
  27. data/test/base/test_directed_graph.rb +1 -3
  28. data/test/base/test_filter.rb +1 -3
  29. data/test/base/test_item.rb +1 -3
  30. data/test/base/test_item_array.rb +1 -3
  31. data/test/base/test_item_rep.rb +1 -3
  32. data/test/base/test_layout.rb +1 -3
  33. data/test/base/test_memoization.rb +1 -3
  34. data/test/base/test_notification_center.rb +1 -3
  35. data/test/base/test_outdatedness_checker.rb +1 -3
  36. data/test/base/test_plugin.rb +1 -3
  37. data/test/base/test_rule.rb +1 -3
  38. data/test/base/test_rule_context.rb +1 -3
  39. data/test/base/test_site.rb +1 -3
  40. data/test/cli/commands/test_check.rb +1 -3
  41. data/test/cli/commands/test_compile.rb +1 -3
  42. data/test/cli/commands/test_create_item.rb +1 -3
  43. data/test/cli/commands/test_create_layout.rb +1 -3
  44. data/test/cli/commands/test_create_site.rb +1 -3
  45. data/test/cli/commands/test_deploy.rb +45 -4
  46. data/test/cli/commands/test_help.rb +1 -3
  47. data/test/cli/commands/test_info.rb +1 -3
  48. data/test/cli/commands/test_prune.rb +1 -3
  49. data/test/cli/commands/test_sync.rb +1 -3
  50. data/test/cli/commands/test_update.rb +1 -3
  51. data/test/cli/commands/test_watch.rb +1 -3
  52. data/test/cli/test_cleaning_stream.rb +1 -3
  53. data/test/cli/test_cli.rb +1 -3
  54. data/test/cli/test_error_handler.rb +1 -3
  55. data/test/cli/test_logger.rb +1 -3
  56. data/test/data_sources/test_filesystem.rb +1 -3
  57. data/test/data_sources/test_filesystem_unified.rb +1 -3
  58. data/test/data_sources/test_filesystem_verbose.rb +1 -3
  59. data/test/data_sources/test_static.rb +1 -3
  60. data/test/extra/checking/checks/test_css.rb +1 -3
  61. data/test/extra/checking/checks/test_external_links.rb +20 -43
  62. data/test/extra/checking/checks/test_html.rb +1 -3
  63. data/test/extra/checking/checks/test_internal_links.rb +1 -3
  64. data/test/extra/checking/checks/test_stale.rb +1 -3
  65. data/test/extra/checking/test_check.rb +1 -3
  66. data/test/extra/checking/test_dsl.rb +1 -3
  67. data/test/extra/checking/test_runner.rb +1 -3
  68. data/test/extra/core_ext/test_enumerable.rb +1 -3
  69. data/test/extra/core_ext/test_pathname.rb +1 -3
  70. data/test/extra/core_ext/test_time.rb +1 -3
  71. data/test/extra/deployers/test_fog.rb +1 -3
  72. data/test/extra/deployers/test_rsync.rb +1 -3
  73. data/test/extra/test_auto_compiler.rb +1 -3
  74. data/test/extra/test_file_proxy.rb +1 -3
  75. data/test/extra/test_link_collector.rb +1 -3
  76. data/test/extra/test_vcs.rb +1 -3
  77. data/test/extra/validators/test_links.rb +1 -3
  78. data/test/extra/validators/test_w3c.rb +1 -3
  79. data/test/filters/test_asciidoc.rb +1 -3
  80. data/test/filters/test_bluecloth.rb +1 -3
  81. data/test/filters/test_coderay.rb +1 -3
  82. data/test/filters/test_coffeescript.rb +1 -3
  83. data/test/filters/test_colorize_syntax.rb +3 -16
  84. data/test/filters/test_erb.rb +1 -3
  85. data/test/filters/test_erubis.rb +1 -3
  86. data/test/filters/test_haml.rb +1 -3
  87. data/test/filters/test_handlebars.rb +1 -3
  88. data/test/filters/test_kramdown.rb +1 -3
  89. data/test/filters/test_less.rb +1 -3
  90. data/test/filters/test_markaby.rb +1 -3
  91. data/test/filters/test_maruku.rb +1 -3
  92. data/test/filters/test_mustache.rb +1 -3
  93. data/test/filters/test_pandoc.rb +1 -3
  94. data/test/filters/test_rainpress.rb +1 -3
  95. data/test/filters/test_rdiscount.rb +1 -3
  96. data/test/filters/test_rdoc.rb +6 -10
  97. data/test/filters/test_redcarpet.rb +1 -3
  98. data/test/filters/test_redcloth.rb +1 -3
  99. data/test/filters/test_relativize_paths.rb +2 -9
  100. data/test/filters/test_rubypants.rb +1 -3
  101. data/test/filters/test_sass.rb +1 -3
  102. data/test/filters/test_slim.rb +1 -3
  103. data/test/filters/test_typogruby.rb +1 -3
  104. data/test/filters/test_uglify_js.rb +1 -3
  105. data/test/filters/test_xsl.rb +1 -3
  106. data/test/filters/test_yui_compressor.rb +1 -3
  107. data/test/helper.rb +6 -0
  108. data/test/helpers/test_blogging.rb +1 -3
  109. data/test/helpers/test_breadcrumbs.rb +21 -59
  110. data/test/helpers/test_capturing.rb +1 -3
  111. data/test/helpers/test_filtering.rb +1 -3
  112. data/test/helpers/test_html_escape.rb +1 -3
  113. data/test/helpers/test_link_to.rb +1 -3
  114. data/test/helpers/test_rendering.rb +1 -3
  115. data/test/helpers/test_tagging.rb +1 -3
  116. data/test/helpers/test_text.rb +1 -3
  117. data/test/helpers/test_xml_sitemap.rb +1 -3
  118. data/test/tasks/test_clean.rb +1 -3
  119. data/test/test_gem.rb +1 -3
  120. metadata +7 -20
data/test/cli/test_logger.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::CLI::LoggerTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::CLI::LoggerTest < Nanoc::TestCase
6
4
 
7
5
  def test_stub
8
6
  end
data/test/data_sources/test_filesystem.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::DataSources::FilesystemTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::DataSources::FilesystemTest < Nanoc::TestCase
6
4
 
7
5
  class SampleFilesystemDataSource < Nanoc::DataSource
8
6
  include Nanoc::DataSources::Filesystem
data/test/data_sources/test_filesystem_unified.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::DataSources::FilesystemUnifiedTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::DataSources::FilesystemUnifiedTest < Nanoc::TestCase
6
4
 
7
5
  def new_data_source(params=nil)
8
6
  # Mock site
data/test/data_sources/test_filesystem_verbose.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::DataSources::FilesystemVerboseTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::DataSources::FilesystemVerboseTest < Nanoc::TestCase
6
4
 
7
5
  def new_data_source(params=nil)
8
6
  # Mock site
data/test/data_sources/test_static.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::DataSources::StaticTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::DataSources::StaticTest < Nanoc::TestCase
6
4
 
7
5
  def new_data_source(params=nil)
8
6
  # Mock site
data/test/extra/checking/checks/test_css.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::Checks::CSSTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::Checks::CSSTest < Nanoc::TestCase
6
4
 
7
5
  def test_run_ok
8
6
  with_site do |site|
data/test/extra/checking/checks/test_external_links.rb CHANGED
@@ -1,24 +1,19 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::Checks::ExternalLinksTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
6
-
7
- def setup
8
- super
9
- require 'timeout'
10
- end
3
+ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
11
4
 
12
5
  def test_run
13
6
  with_site do |site|
14
7
  # Create files
15
8
  FileUtils.mkdir_p('output')
16
- FileUtils.mkdir_p('output/stuff')
17
9
  File.open('output/foo.txt', 'w') { |io| io.write('<a href="http://example.com/404">broken</a>') }
18
10
  File.open('output/bar.html', 'w') { |io| io.write('<a href="http://example.com/">not broken</a>') }
19
11
 
20
12
  # Create check
21
- check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
13
+ check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
14
+ def check.request_url_once(url)
15
+ Net::HTTPResponse.new('1.1', url.path == '/' ? '200' : '404', 'okay')
16
+ end
22
17
  check.run
23
18
 
24
19
  # Test
@@ -28,49 +23,31 @@ class Nanoc::Extra::Checking::Checks::ExternalLinksTest < MiniTest::Unit::TestCa
28
23
 
29
24
  def test_valid?
30
25
  with_site do |site|
31
- # Create files
32
- FileUtils.mkdir_p('output')
33
- FileUtils.mkdir_p('output/stuff')
34
- File.open('output/origin', 'w') { |io| io.write('hi') }
35
- File.open('output/foo', 'w') { |io| io.write('hi') }
36
- File.open('output/stuff/blah', 'w') { |io| io.write('hi') }
37
-
38
26
  # Create check
39
27
  check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
40
-
41
- # Test
42
- self.run_server_while do
43
- assert ok?(check, 'http://127.0.0.1:9204/200')
44
- assert ok?(check, 'foo://example.com/')
45
- refute ok?(check, 'http://127.0.0.1:9204">')
28
+ def check.request_url_once(url)
29
+ Net::HTTPResponse.new('1.1', url.path == '/200' ? '200' : '404', 'okay')
46
30
  end
47
- end
48
- end
49
31
 
50
- def ok?(check, url)
51
- Timeout.timeout(3) do
52
- check.validate(url).nil?
32
+ # Test
33
+ assert_nil check.validate('http://127.0.0.1:9204/200')
34
+ assert_nil check.validate('foo://example.com/')
35
+ refute_nil check.validate('http://127.0.0.1:9204">')
53
36
  end
54
37
  end
55
38
 
56
- def run_server_while
57
- @app = lambda { |env| [ env['REQUEST_PATH'][1..-1].to_i, {}, [ '... Useless body ...' ] ] }
58
- @server = nil
59
-
60
- @thread = Thread.new do
61
- Rack::Handler::WEBrick.run(@app, :Host => @host='127.0.0.1', :Port => @port=9204) do |server|
62
- @server = server
39
+ def test_fallback_to_get_when_head_is_not_allowed
40
+ with_site do |site|
41
+ #Create check
42
+ check = Nanoc::Extra::Checking::Checks::ExternalLinks.new(site)
43
+ def check.request_url_once(url, req_method = Net::HTTP::Head)
44
+ Net::HTTPResponse.new('1.1', (req_method == Net::HTTP::Head || url.path == '/405') ? '405' : '200', 'okay')
63
45
  end
64
- end
65
46
 
66
- Timeout::timeout(5) do
67
- Thread.pass until @server
47
+ #Test
48
+ assert_nil check.validate('http://127.0.0.1:9204')
49
+ refute_nil check.validate('http://127.0.0.1:9204/405')
68
50
  end
69
-
70
- yield
71
-
72
- @server.stop
73
- @thread.kill
74
51
  end
75
52
 
76
53
  end
data/test/extra/checking/checks/test_html.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::Checks::HTMLTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::Checks::HTMLTest < Nanoc::TestCase
6
4
 
7
5
  def test_run_ok
8
6
  with_site do |site|
data/test/extra/checking/checks/test_internal_links.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::Checks::InternalLinksTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
6
4
 
7
5
  def test_run
8
6
  with_site do |site|
data/test/extra/checking/checks/test_stale.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::Checks::StaleTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::Checks::StaleTest < Nanoc::TestCase
6
4
 
7
5
  def check_class
8
6
  Nanoc::Extra::Checking::Checks::Stale
data/test/extra/checking/test_check.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::CheckTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::CheckTest < Nanoc::TestCase
6
4
 
7
5
  def test_output_filenames
8
6
  with_site do |site|
data/test/extra/checking/test_dsl.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::DSLTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
6
4
 
7
5
  def test_from_file
8
6
  with_site do |site|
data/test/extra/checking/test_runner.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Checking::RunnerTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Checking::RunnerTest < Nanoc::TestCase
6
4
 
7
5
  def test_run_specific
8
6
  with_site do |site|
data/test/extra/core_ext/test_enumerable.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::ExtraCoreExtEnumerableTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::ExtraCoreExtEnumerableTest < Nanoc::TestCase
6
4
 
7
5
  class MyCollection
8
6
 
data/test/extra/core_ext/test_pathname.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::CoreExtPathnameTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::CoreExtPathnameTest < Nanoc::TestCase
6
4
 
7
5
  def test_components
8
6
  assert_equal %w( / a bb ccc dd e ), Pathname.new('/a/bb/ccc/dd/e').components
data/test/extra/core_ext/test_time.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::ExtraCoreExtTimeTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::ExtraCoreExtTimeTest < Nanoc::TestCase
6
4
 
7
5
  def test_to_iso8601_date
8
6
  assert_equal('2008-05-19', Time.utc(2008, 5, 19, 14, 20, 0, 0).to_iso8601_date)
data/test/extra/deployers/test_fog.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Deployers::FogTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Deployers::FogTest < Nanoc::TestCase
6
4
 
7
5
  def test_run
8
6
  if_have 'fog' do
data/test/extra/deployers/test_rsync.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Deployers::RsyncTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
6
4
 
7
5
  def test_run_without_dst
8
6
  if_have 'systemu' do
data/test/extra/test_auto_compiler.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::AutoCompilerTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::AutoCompilerTest < Nanoc::TestCase
6
4
 
7
5
  def test_handle_request_with_item_rep_with_index_filename
8
6
  if_have 'mime/types', 'rack' do
data/test/extra/test_file_proxy.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::FileProxyTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::FileProxyTest < Nanoc::TestCase
6
4
 
7
5
  def test_create_many
8
6
  if_implemented do
data/test/extra/test_link_collector.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::LinkCollectorTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::LinkCollectorTest < Nanoc::TestCase
6
4
 
7
5
  def test_all
8
6
  # Create dummy data
data/test/extra/test_vcs.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::VCSTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::VCSTest < Nanoc::TestCase
6
4
 
7
5
  def test_named
8
6
  assert_nil(Nanoc::Extra::VCS.named(:lkasjdlkfjlkasdfkj))
data/test/extra/validators/test_links.rb CHANGED
@@ -1,7 +1,5 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Validators::LinksTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Validators::LinksTest < Nanoc::TestCase
6
4
 
7
5
  end
data/test/extra/validators/test_w3c.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Extra::Validators::W3CTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Extra::Validators::W3CTest < Nanoc::TestCase
6
4
 
7
5
  def test_simple
8
6
  if_have 'w3c_validators' do
data/test/filters/test_asciidoc.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::AsciiDocTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter
8
6
  if_have 'systemu' do
data/test/filters/test_bluecloth.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::BlueClothTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::BlueClothTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter
8
6
  if_have 'bluecloth' do
data/test/filters/test_coderay.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::CodeRayTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::CodeRayTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter_without_language
8
6
  if_have 'coderay' do
data/test/filters/test_coffeescript.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::CoffeeScriptTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter
8
6
  if_have 'coffee-script' do
data/test/filters/test_colorize_syntax.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
6
4
 
7
5
  CODERAY_PRE = '<div class="CodeRay"><div class="code">'
8
6
  CODERAY_POST = '</div></div>'
@@ -54,22 +52,11 @@ class Nanoc::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
54
52
  </body>
55
53
  </html>
56
54
  EOS
57
- expected_output = <<EOS
58
- <!DOCTYPE html>
59
- <html>
60
- <head>
61
- <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">
62
- <title>Foo</title>
63
- </head>
64
- <body>
65
- <pre title="moo"><code class="language-ruby"># comment</code></pre>
66
- </body>
67
- </html>
68
- EOS
55
+ expected_output_regex = %r[^<!DOCTYPE html>\s*<html>\s*<head>\s*<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\s*<title>Foo</title>\s*</head>\s*<body>\s*<pre title="moo"><code class="language-ruby"># comment</code></pre>\s*</body>\s*</html>]
69
56
 
70
57
  # Run filter
71
58
  actual_output = filter.setup_and_run(input, :default_colorizer => :dummy, :is_fullpage => true)
72
- assert_equal(expected_output, actual_output)
59
+ assert_match expected_output_regex, actual_output
73
60
  end
74
61
  end
75
62
 
data/test/filters/test_erb.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::ERBTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::ERBTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter_with_instance_variable
8
6
  # Create filter
data/test/filters/test_erubis.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::ErubisTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::ErubisTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter_with_instance_variable
8
6
  if_have 'erubis' do
data/test/filters/test_haml.rb CHANGED
@@ -1,8 +1,6 @@
1
1
  # encoding: utf-8
2
2
 
3
- class Nanoc::Filters::HamlTest < MiniTest::Unit::TestCase
4
-
5
- include Nanoc::TestHelpers
3
+ class Nanoc::Filters::HamlTest < Nanoc::TestCase
6
4
 
7
5
  def test_filter
8
6
  if_have 'haml' do