From 7ad0597bff367fe78154fac09091d3041ee7b63f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sat, 21 Feb 2015 00:33:47 -0800 Subject: [PATCH] Make our own Minitest::Test subclass for further subclassing --- test/helper.rb | 2 +- test/test_cleaner.rb | 2 +- test/test_coffeescript.rb | 2 +- test/test_collections.rb | 2 +- test/test_command.rb | 2 +- test/test_configuration.rb | 2 +- test/test_convertible.rb | 2 +- test/test_document.rb | 2 +- test/test_draft.rb | 2 +- test/test_entry_filter.rb | 2 +- test/test_excerpt.rb | 2 +- test/test_filters.rb | 2 +- test/test_front_matter_defaults.rb | 2 +- test/test_generated_site.rb | 2 +- test/test_kramdown.rb | 2 +- test/test_layout_reader.rb | 2 +- test/test_liquid_extensions.rb | 2 +- test/test_log_adapter.rb | 2 +- test/test_new_command.rb | 2 +- test/test_page.rb | 2 +- test/test_path_sanitization.rb | 2 +- test/test_plugin_manager.rb | 2 +- test/test_post.rb | 2 +- test/test_rdiscount.rb | 2 +- test/test_redcarpet.rb | 2 +- test/test_regenerator.rb | 2 +- test/test_related_posts.rb | 2 +- test/test_sass.rb | 2 +- test/test_site.rb | 2 +- test/test_tags.rb | 2 +- test/test_url.rb | 2 +- test/test_utils.rb | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 71133559..257b2db9 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -27,7 +27,7 @@ STDERR.reopen(test(?e, '/dev/null') ? '/dev/null' : 'NUL:') # Report with color. Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)] -class Minitest::Test +class JekyllUnitTest < Minitest::Test def fixture_site(overrides = {}) Jekyll::Site.new(site_configuration(overrides)) end diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb index 3b45fad7..819dbf5c 100644 --- a/test/test_cleaner.rb +++ b/test/test_cleaner.rb @@ -1,6 +1,6 @@ require 'helper' -class TestCleaner < Minitest::Test +class TestCleaner < JekyllUnitTest context "directory in keep_files" do setup do clear_dest diff --git a/test/test_coffeescript.rb b/test/test_coffeescript.rb index edf6c7d0..68e19a52 100644 --- a/test/test_coffeescript.rb +++ b/test/test_coffeescript.rb @@ -1,6 +1,6 @@ require 'helper' -class TestCoffeeScript < Minitest::Test +class TestCoffeeScript < JekyllUnitTest context "converting CoffeeScript" do setup do External.require_with_graceful_fail('jekyll-coffeescript') diff --git a/test/test_collections.rb b/test/test_collections.rb index 3e64022a..3cae5c30 100644 --- a/test/test_collections.rb +++ b/test/test_collections.rb @@ -1,6 +1,6 @@ require 'helper' -class TestCollections < Minitest::Test +class TestCollections < JekyllUnitTest context "an evil collection" do setup do @collection = Jekyll::Collection.new(fixture_site, "../../etc/password") diff --git a/test/test_command.rb b/test/test_command.rb index 3f9d06fb..fb9e247b 100644 --- a/test/test_command.rb +++ b/test/test_command.rb @@ -1,6 +1,6 @@ require 'helper' -class TestCommand < Minitest::Test +class TestCommand < JekyllUnitTest context "when calling .add_build_options" do should "add common options" do cmd = Object.new diff --git a/test/test_configuration.rb b/test/test_configuration.rb index e03cb901..7e14a418 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -1,6 +1,6 @@ require 'helper' -class TestConfiguration < Minitest::Test +class TestConfiguration < JekyllUnitTest context "#stringify_keys" do setup do @mixed_keys = Configuration[{ diff --git a/test/test_convertible.rb b/test/test_convertible.rb index b8e809b4..09c69737 100644 --- a/test/test_convertible.rb +++ b/test/test_convertible.rb @@ -1,7 +1,7 @@ require 'helper' require 'ostruct' -class TestConvertible < Minitest::Test +class TestConvertible < JekyllUnitTest context "yaml front-matter" do setup do @convertible = OpenStruct.new( diff --git a/test/test_document.rb b/test/test_document.rb index 59044a94..654532da 100644 --- a/test/test_document.rb +++ b/test/test_document.rb @@ -1,6 +1,6 @@ require 'helper' -class TestDocument < Minitest::Test +class TestDocument < JekyllUnitTest context "a document in a collection" do setup do diff --git a/test/test_draft.rb b/test/test_draft.rb index 127060c1..7312c8c9 100644 --- a/test/test_draft.rb +++ b/test/test_draft.rb @@ -1,6 +1,6 @@ require 'helper' -class TestDraft < Minitest::Test +class TestDraft < JekyllUnitTest def setup_draft(file) Draft.new(@site, source_dir, '', file) end diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb index d31266b6..e3a7e8c0 100644 --- a/test/test_entry_filter.rb +++ b/test/test_entry_filter.rb @@ -1,6 +1,6 @@ require 'helper' -class TestEntryFilter < Minitest::Test +class TestEntryFilter < JekyllUnitTest context "Filtering entries" do setup do @site = Site.new(site_configuration) diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb index 3ab31f91..ac477176 100644 --- a/test/test_excerpt.rb +++ b/test/test_excerpt.rb @@ -1,6 +1,6 @@ require 'helper' -class TestExcerpt < Minitest::Test +class TestExcerpt < JekyllUnitTest def setup_post(file) Post.new(@site, source_dir, '', file) end diff --git a/test/test_filters.rb b/test/test_filters.rb index 65d53357..eec08564 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -2,7 +2,7 @@ require 'helper' -class TestFilters < Minitest::Test +class TestFilters < JekyllUnitTest class JekyllFilter include Jekyll::Filters attr_accessor :site, :context diff --git a/test/test_front_matter_defaults.rb b/test/test_front_matter_defaults.rb index 2bfd34c6..0c7f5bf4 100644 --- a/test/test_front_matter_defaults.rb +++ b/test/test_front_matter_defaults.rb @@ -1,6 +1,6 @@ require 'helper' -class TestFrontMatterDefaults < Minitest::Test +class TestFrontMatterDefaults < JekyllUnitTest context "A site with full front matter defaults" do setup do diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb index e9c1efbd..fee492bc 100644 --- a/test/test_generated_site.rb +++ b/test/test_generated_site.rb @@ -1,6 +1,6 @@ require 'helper' -class TestGeneratedSite < Minitest::Test +class TestGeneratedSite < JekyllUnitTest context "generated sites" do setup do clear_dest diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index a2954403..7101baaa 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -2,7 +2,7 @@ require 'helper' -class TestKramdown < Minitest::Test +class TestKramdown < JekyllUnitTest context "kramdown" do setup do @config = { diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb index cd658739..fc2f1fc3 100644 --- a/test/test_layout_reader.rb +++ b/test/test_layout_reader.rb @@ -1,6 +1,6 @@ require 'helper' -class TestLayoutReader < Minitest::Test +class TestLayoutReader < JekyllUnitTest context "reading layouts" do setup do stub(Jekyll).configuration do diff --git a/test/test_liquid_extensions.rb b/test/test_liquid_extensions.rb index dec13ef6..0ab95e94 100644 --- a/test/test_liquid_extensions.rb +++ b/test/test_liquid_extensions.rb @@ -1,6 +1,6 @@ require 'helper' -class TestLiquidExtensions < Minitest::Test +class TestLiquidExtensions < JekyllUnitTest context "looking up a variable in a Liquid context" do class SayHi < Liquid::Tag diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb index ad006e1d..99b243bc 100644 --- a/test/test_log_adapter.rb +++ b/test/test_log_adapter.rb @@ -1,6 +1,6 @@ require 'helper' -class TestLogAdapter < Minitest::Test +class TestLogAdapter < JekyllUnitTest class LoggerDouble attr_accessor :level diff --git a/test/test_new_command.rb b/test/test_new_command.rb index 09332cf9..2e0fd45c 100644 --- a/test/test_new_command.rb +++ b/test/test_new_command.rb @@ -1,7 +1,7 @@ require 'helper' require 'jekyll/commands/new' -class TestNewCommand < Minitest::Test +class TestNewCommand < JekyllUnitTest def dir_contents(path) Dir["#{path}/**/*"].each do |file| file.gsub! path, '' diff --git a/test/test_page.rb b/test/test_page.rb index 2b5fbbc0..1c8dc215 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -1,6 +1,6 @@ require 'helper' -class TestPage < Minitest::Test +class TestPage < JekyllUnitTest def setup_page(*args) dir, file = args dir, file = ['', dir] if file.nil? diff --git a/test/test_path_sanitization.rb b/test/test_path_sanitization.rb index bb5a00be..2a3182e3 100644 --- a/test/test_path_sanitization.rb +++ b/test/test_path_sanitization.rb @@ -1,6 +1,6 @@ require 'helper' -class TestPathSanitization < Minitest::Test +class TestPathSanitization < JekyllUnitTest context "on Windows with absolute source" do setup do @source = "C:/Users/xmr/Desktop/mpc-hc.org" diff --git a/test/test_plugin_manager.rb b/test/test_plugin_manager.rb index c4a52889..9cdb45d8 100644 --- a/test/test_plugin_manager.rb +++ b/test/test_plugin_manager.rb @@ -1,6 +1,6 @@ require 'helper' -class TestPluginManager < Minitest::Test +class TestPluginManager < JekyllUnitTest def with_no_gemfile FileUtils.mv "Gemfile", "Gemfile.old" yield diff --git a/test/test_post.rb b/test/test_post.rb index 124f0a85..ef5b4a46 100644 --- a/test/test_post.rb +++ b/test/test_post.rb @@ -2,7 +2,7 @@ require 'helper' -class TestPost < Minitest::Test +class TestPost < JekyllUnitTest def setup_post(file) Post.new(@site, source_dir, '', file) end diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb index 5eade6b5..ea1756d7 100644 --- a/test/test_rdiscount.rb +++ b/test/test_rdiscount.rb @@ -1,6 +1,6 @@ require 'helper' -class TestRdiscount < Minitest::Test +class TestRdiscount < JekyllUnitTest context "rdiscount" do setup do diff --git a/test/test_redcarpet.rb b/test/test_redcarpet.rb index ff4585f8..909df7bf 100644 --- a/test/test_redcarpet.rb +++ b/test/test_redcarpet.rb @@ -1,6 +1,6 @@ require 'helper' -class TestRedcarpet < Minitest::Test +class TestRedcarpet < JekyllUnitTest context "redcarpet" do setup do @config = { diff --git a/test/test_regenerator.rb b/test/test_regenerator.rb index 371e711d..15819487 100644 --- a/test/test_regenerator.rb +++ b/test/test_regenerator.rb @@ -1,6 +1,6 @@ require 'helper' -class TestRegenerator < Minitest::Test +class TestRegenerator < JekyllUnitTest context "The site regenerator" do setup do FileUtils.rm_rf(source_dir(".jekyll-metadata")) diff --git a/test/test_related_posts.rb b/test/test_related_posts.rb index 73a8a1ca..645f2bfb 100644 --- a/test/test_related_posts.rb +++ b/test/test_related_posts.rb @@ -1,6 +1,6 @@ require 'helper' -class TestRelatedPosts < Minitest::Test +class TestRelatedPosts < JekyllUnitTest context "building related posts without lsi" do setup do stub(Jekyll).configuration do diff --git a/test/test_sass.rb b/test/test_sass.rb index 867b2dcc..153c339a 100644 --- a/test/test_sass.rb +++ b/test/test_sass.rb @@ -1,6 +1,6 @@ require 'helper' -class TestSass < Minitest::Test +class TestSass < JekyllUnitTest context "importing partials" do setup do @site = Jekyll::Site.new(Jekyll.configuration({ diff --git a/test/test_site.rb b/test/test_site.rb index 6cbfe5be..c460d873 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -1,6 +1,6 @@ require 'helper' -class TestSite < Minitest::Test +class TestSite < JekyllUnitTest context "configuring sites" do should "have an array for plugins by default" do site = Site.new(Jekyll::Configuration::DEFAULTS) diff --git a/test/test_tags.rb b/test/test_tags.rb index 883a6af6..4db4ab85 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -2,7 +2,7 @@ require 'helper' -class TestTags < Minitest::Test +class TestTags < JekyllUnitTest def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown) stub(Jekyll).configuration do diff --git a/test/test_url.rb b/test/test_url.rb index 462ee0b7..e4529be7 100644 --- a/test/test_url.rb +++ b/test/test_url.rb @@ -1,6 +1,6 @@ require 'helper' -class TestURL < Minitest::Test +class TestURL < JekyllUnitTest context "The URL class" do should "throw an exception if neither permalink or template is specified" do diff --git a/test/test_utils.rb b/test/test_utils.rb index 50d8d17b..ddb63d4b 100644 --- a/test/test_utils.rb +++ b/test/test_utils.rb @@ -1,6 +1,6 @@ require 'helper' -class TestUtils < Minitest::Test +class TestUtils < JekyllUnitTest context "hash" do context "pluralized_array" do