diff --git a/Gemfile.lock b/Gemfile.lock index 68930c1d..115d6860 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GEM in_threads (1.6.0) method_source (1.0.0) mini_portile2 (2.8.4) - minitest (5.18.1) + minitest (5.20.0) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) diff --git a/test/app_test.rb b/test/app_test.rb index 8e9e369b..44fca64a 100644 --- a/test/app_test.rb +++ b/test/app_test.rb @@ -2,7 +2,7 @@ require 'test_helper' require 'rack/test' require 'app' -class AppTest < MiniTest::Spec +class AppTest < Minitest::Spec include Rack::Test::Methods MODERN_BROWSER = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:39.0) Gecko/20100101 Firefox/39.0' diff --git a/test/lib/docs/core/doc_test.rb b/test/lib/docs/core/doc_test.rb index b0d2341f..6b41cdd9 100644 --- a/test/lib/docs/core/doc_test.rb +++ b/test/lib/docs/core/doc_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsDocTest < MiniTest::Spec +class DocsDocTest < Minitest::Spec let :doc do Class.new Docs::Doc do self.name = 'name' diff --git a/test/lib/docs/core/entry_index_test.rb b/test/lib/docs/core/entry_index_test.rb index 187f5f4a..95495eb9 100644 --- a/test/lib/docs/core/entry_index_test.rb +++ b/test/lib/docs/core/entry_index_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsEntryIndexTest < MiniTest::Spec +class DocsEntryIndexTest < Minitest::Spec let :entry do Docs::Entry.new 'name', 'path', 'type' end diff --git a/test/lib/docs/core/filter_test.rb b/test/lib/docs/core/filter_test.rb index 38c5019a..10872c7b 100644 --- a/test/lib/docs/core/filter_test.rb +++ b/test/lib/docs/core/filter_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsFilterTest < MiniTest::Spec +class DocsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::Filter diff --git a/test/lib/docs/core/instrumentable_test.rb b/test/lib/docs/core/instrumentable_test.rb index c3fe2b8b..5a244d51 100644 --- a/test/lib/docs/core/instrumentable_test.rb +++ b/test/lib/docs/core/instrumentable_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsInstrumentableTest < MiniTest::Spec +class DocsInstrumentableTest < Minitest::Spec let :extended_class do Class.new.tap { |klass| klass.send :extend, Docs::Instrumentable } end diff --git a/test/lib/docs/core/manifest_test.rb b/test/lib/docs/core/manifest_test.rb index f121e69b..636885cd 100644 --- a/test/lib/docs/core/manifest_test.rb +++ b/test/lib/docs/core/manifest_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class ManifestTest < MiniTest::Spec +class ManifestTest < Minitest::Spec let :doc do doc = Class.new Docs::Scraper doc.name = 'TestDoc' diff --git a/test/lib/docs/core/models/entry_test.rb b/test/lib/docs/core/models/entry_test.rb index 7487340f..56de7966 100644 --- a/test/lib/docs/core/models/entry_test.rb +++ b/test/lib/docs/core/models/entry_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class DocsEntryTest < MiniTest::Spec +class DocsEntryTest < Minitest::Spec Entry = Docs::Entry let :entry do diff --git a/test/lib/docs/core/models/type_test.rb b/test/lib/docs/core/models/type_test.rb index a01d8e61..e3f3b336 100644 --- a/test/lib/docs/core/models/type_test.rb +++ b/test/lib/docs/core/models/type_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class DocsTypeTest < MiniTest::Spec +class DocsTypeTest < Minitest::Spec Type = Docs::Type describe ".new" do diff --git a/test/lib/docs/core/parser_test.rb b/test/lib/docs/core/parser_test.rb index 440516a8..2edacacb 100644 --- a/test/lib/docs/core/parser_test.rb +++ b/test/lib/docs/core/parser_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsParserTest < MiniTest::Spec +class DocsParserTest < Minitest::Spec def parser(content) Docs::Parser.new(content) end diff --git a/test/lib/docs/core/request_test.rb b/test/lib/docs/core/request_test.rb index d05dd1ff..4e735346 100644 --- a/test/lib/docs/core/request_test.rb +++ b/test/lib/docs/core/request_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsRequestTest < MiniTest::Spec +class DocsRequestTest < Minitest::Spec let :url do 'http://example.com' end diff --git a/test/lib/docs/core/requester_test.rb b/test/lib/docs/core/requester_test.rb index acf8d0a9..18a17ec3 100644 --- a/test/lib/docs/core/requester_test.rb +++ b/test/lib/docs/core/requester_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsRequesterTest < MiniTest::Spec +class DocsRequesterTest < Minitest::Spec def stub_request(url) Typhoeus.stub(url).and_return(Typhoeus::Response.new) end diff --git a/test/lib/docs/core/response_test.rb b/test/lib/docs/core/response_test.rb index 9e92c034..5c06dc0c 100644 --- a/test/lib/docs/core/response_test.rb +++ b/test/lib/docs/core/response_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsResponseTest < MiniTest::Spec +class DocsResponseTest < Minitest::Spec let :response do Typhoeus::Response.new(options).tap do |response| response.extend Docs::Response diff --git a/test/lib/docs/core/scraper_test.rb b/test/lib/docs/core/scraper_test.rb index 3d493207..7b5522b3 100644 --- a/test/lib/docs/core/scraper_test.rb +++ b/test/lib/docs/core/scraper_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsScraperTest < MiniTest::Spec +class DocsScraperTest < Minitest::Spec class Scraper < Docs::Scraper self.type = 'scraper' self.base_url = 'http://example.com/' diff --git a/test/lib/docs/core/scrapers/file_scraper_test.rb b/test/lib/docs/core/scrapers/file_scraper_test.rb index 46dad3c7..93b2ba43 100644 --- a/test/lib/docs/core/scrapers/file_scraper_test.rb +++ b/test/lib/docs/core/scrapers/file_scraper_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class FileScraperTest < MiniTest::Spec +class FileScraperTest < Minitest::Spec ROOT_PATH = File.expand_path('../../../../../../', __FILE__) class Scraper < Docs::FileScraper diff --git a/test/lib/docs/core/scrapers/url_scraper_test.rb b/test/lib/docs/core/scrapers/url_scraper_test.rb index 9a687256..77fc235d 100644 --- a/test/lib/docs/core/scrapers/url_scraper_test.rb +++ b/test/lib/docs/core/scrapers/url_scraper_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class DocsUrlScraperTest < MiniTest::Spec +class DocsUrlScraperTest < Minitest::Spec class Scraper < Docs::UrlScraper self.base_url = 'http://example.com' self.html_filters = Docs::FilterStack.new diff --git a/test/lib/docs/core/url_test.rb b/test/lib/docs/core/url_test.rb index 7d4bda43..8f08b140 100644 --- a/test/lib/docs/core/url_test.rb +++ b/test/lib/docs/core/url_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsUrlTest < MiniTest::Spec +class DocsUrlTest < Minitest::Spec URL = Docs::URL describe ".new" do diff --git a/test/lib/docs/filters/core/apply_base_url_test.rb b/test/lib/docs/filters/core/apply_base_url_test.rb index ba2764e7..ce070018 100644 --- a/test/lib/docs/filters/core/apply_base_url_test.rb +++ b/test/lib/docs/filters/core/apply_base_url_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class ApplyBaseUrlFilterTest < MiniTest::Spec +class ApplyBaseUrlFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::ApplyBaseUrlFilter self.filter_type = 'html' diff --git a/test/lib/docs/filters/core/clean_html_test.rb b/test/lib/docs/filters/core/clean_html_test.rb index 2d3c9f8a..a1a47013 100644 --- a/test/lib/docs/filters/core/clean_html_test.rb +++ b/test/lib/docs/filters/core/clean_html_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class CleanHtmlFilterTest < MiniTest::Spec +class CleanHtmlFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::CleanHtmlFilter diff --git a/test/lib/docs/filters/core/clean_text_test.rb b/test/lib/docs/filters/core/clean_text_test.rb index 7babf15e..4126b886 100644 --- a/test/lib/docs/filters/core/clean_text_test.rb +++ b/test/lib/docs/filters/core/clean_text_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class CleanTextFilterTest < MiniTest::Spec +class CleanTextFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::CleanTextFilter diff --git a/test/lib/docs/filters/core/container_test.rb b/test/lib/docs/filters/core/container_test.rb index 7d4993e8..d1cc3ab4 100644 --- a/test/lib/docs/filters/core/container_test.rb +++ b/test/lib/docs/filters/core/container_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class ContainerFilterTest < MiniTest::Spec +class ContainerFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::ContainerFilter self.filter_type = 'html' diff --git a/test/lib/docs/filters/core/entries_test.rb b/test/lib/docs/filters/core/entries_test.rb index e33f778d..95951e11 100644 --- a/test/lib/docs/filters/core/entries_test.rb +++ b/test/lib/docs/filters/core/entries_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class EntriesFilterTest < MiniTest::Spec +class EntriesFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::EntriesFilter diff --git a/test/lib/docs/filters/core/inner_html_test.rb b/test/lib/docs/filters/core/inner_html_test.rb index bbd40958..74fbc9c7 100644 --- a/test/lib/docs/filters/core/inner_html_test.rb +++ b/test/lib/docs/filters/core/inner_html_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class InnerHtmlFilterTest < MiniTest::Spec +class InnerHtmlFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::InnerHtmlFilter diff --git a/test/lib/docs/filters/core/internal_urls_test.rb b/test/lib/docs/filters/core/internal_urls_test.rb index c9194e09..9888c9fe 100644 --- a/test/lib/docs/filters/core/internal_urls_test.rb +++ b/test/lib/docs/filters/core/internal_urls_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class InternalUrlsFilterTest < MiniTest::Spec +class InternalUrlsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::InternalUrlsFilter diff --git a/test/lib/docs/filters/core/normalize_paths_test.rb b/test/lib/docs/filters/core/normalize_paths_test.rb index 6d407f2b..1fc82721 100644 --- a/test/lib/docs/filters/core/normalize_paths_test.rb +++ b/test/lib/docs/filters/core/normalize_paths_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class NormalizePathsFilterTest < MiniTest::Spec +class NormalizePathsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::NormalizePathsFilter diff --git a/test/lib/docs/filters/core/normalize_urls_test.rb b/test/lib/docs/filters/core/normalize_urls_test.rb index 804b05b1..0122c8fc 100644 --- a/test/lib/docs/filters/core/normalize_urls_test.rb +++ b/test/lib/docs/filters/core/normalize_urls_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class NormalizeUrlsFilterTest < MiniTest::Spec +class NormalizeUrlsFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::NormalizeUrlsFilter diff --git a/test/lib/docs/filters/core/parse_cf_email_test.rb b/test/lib/docs/filters/core/parse_cf_email_test.rb index d6124fed..7f248582 100644 --- a/test/lib/docs/filters/core/parse_cf_email_test.rb +++ b/test/lib/docs/filters/core/parse_cf_email_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class ParseCfEmailFilterTest < MiniTest::Spec +class ParseCfEmailFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::ParseCfEmailFilter diff --git a/test/lib/docs/filters/core/title_test.rb b/test/lib/docs/filters/core/title_test.rb index 9a28bd3b..24189555 100644 --- a/test/lib/docs/filters/core/title_test.rb +++ b/test/lib/docs/filters/core/title_test.rb @@ -1,7 +1,7 @@ require_relative '../../../../test_helper' require_relative '../../../../../lib/docs' -class TitleFilterTest < MiniTest::Spec +class TitleFilterTest < Minitest::Spec include FilterTestHelper self.filter_class = Docs::TitleFilter diff --git a/test/lib/docs/storage/abstract_store_test.rb b/test/lib/docs/storage/abstract_store_test.rb index d63e95f2..2bdf391e 100644 --- a/test/lib/docs/storage/abstract_store_test.rb +++ b/test/lib/docs/storage/abstract_store_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsAbstractStoreTest < MiniTest::Spec +class DocsAbstractStoreTest < Minitest::Spec InvalidPathError = Docs::AbstractStore::InvalidPathError LockError = Docs::AbstractStore::LockError diff --git a/test/lib/docs/storage/file_store_test.rb b/test/lib/docs/storage/file_store_test.rb index aa3ce3f8..1068b7d7 100644 --- a/test/lib/docs/storage/file_store_test.rb +++ b/test/lib/docs/storage/file_store_test.rb @@ -1,7 +1,7 @@ require_relative '../../../test_helper' require_relative '../../../../lib/docs' -class DocsFileStoreTest < MiniTest::Spec +class DocsFileStoreTest < Minitest::Spec let :store do Docs::FileStore.new(tmp_path) end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2bcaa9d5..8ae02364 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -18,7 +18,7 @@ end ActiveSupport::TestCase.test_order = :random -class MiniTest::Spec +class Minitest::Spec include ActiveSupport::Testing::Assertions module DSL