Minor cleaning setting up tests (#1875)

We use minitest for Sinatra's test suite but we weren't using its rake task. I've updated the Rakefile to require and use Minitest default rake task to simplify.

Another change is to rename the `helper.rb` file to `test_helper.rb` because I think that name is used more in the community and require it directly without calling `File.expand_path`

Rakefile

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 require 'rake/clean'
-require 'rake/testtask'
+require 'minitest/test_task'
 require 'fileutils'
 require 'date'
 
 task default: :test
-task spec: :test
-
-CLEAN.include '**/*.rbc'
 
 def source_version
   @source_version ||= File.read(File.expand_path('VERSION', __dir__)).strip
@@ -24,27 +21,20 @@ def prev_version
   source_version.gsub(/\d+$/) { |s| s.to_i - 1 }
 end
 
-# SPECS ===============================================================
+# Tests ===============================================================
 
-Rake::TestTask.new(:test) do |t|
+Minitest::TestTask.create # Default `test` task
-  t.test_files = FileList['test/*_test.rb']
+Minitest::TestTask.create(:'test:core') do |t|
-  t.ruby_opts = ['-r rubygems'] if defined? Gem
   t.warning = true
-end
+  t.test_globs = %w[
-
-Rake::TestTask.new(:'test:core') do |t|
-  core_tests = %w[
     base delegator encoding extensions filter
     helpers mapped_error middleware rdoc
     readme request response result route_added_hook
     routing server settings sinatra static templates
-  ]
+  ].map { |n| "test/#{n}_test.rb" }
-  t.test_files = core_tests.map { |n| "test/#{n}_test.rb" }
-  t.ruby_opts = ['-r rubygems'] if defined? Gem
-  t.warning = true
 end
 
-# Rcov ================================================================
+# Test code coverage ==================================================
 
 namespace :test do
   desc 'Measures test coverage'
@@ -54,6 +44,7 @@ namespace :test do
     Rake::Task['test'].invoke
   end
 end
+CLEAN.include('coverage')
 
 # Website =============================================================
 

test/asciidoctor_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
   require 'asciidoctor'

test/base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class BaseTest < Minitest::Test
   describe 'Sinatra::Base subclasses' do

test/builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'builder'

test/compile_test.rb

@@ -1,5 +1,4 @@
-# I like coding: UTF-8
+require_relative 'test_helper'
-require File.expand_path('helper', __dir__)
 
 class CompileTest < Minitest::Test
   def self.parses pattern, example, expected_params, mtype = :sinatra, mopts = {}

test/delegator_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class DelegatorTest < Minitest::Test
   class Mirror

test/encoding_test.rb

@@ -1,5 +1,4 @@
-# encoding: UTF-8
+require_relative 'test_helper'
-require File.expand_path('helper', __dir__)
 require 'erb'
 
 class BaseTest < Minitest::Test

test/erb_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class ERBTest < Minitest::Test
   def engine

test/extensions_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class ExtensionsTest < Minitest::Test
   module FooExtensions

test/filter_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class BeforeFilterTest < Minitest::Test
   it "executes filters in the order defined" do

test/haml_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'haml'

test/helpers_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 require 'date'
 require 'json'
 
@@ -895,8 +895,8 @@ class HelpersTest < Minitest::Test
       send_file_app :disposition => 'inline'.freeze
       get '/file.txt'
       assert_equal 'inline; filename="file.txt"', response['Content-Disposition']
-    end 
+    end
-    
+
     it "sets the Content-Disposition header when :filename provided" do
       send_file_app :filename => 'foo.txt'
       get '/file.txt'

test/integration_async_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 require File.expand_path('integration_async_helper', __dir__)
 
 # These tests are like integration_test, but they test asynchronous streaming.

test/integration_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 require File.expand_path('integration_helper', __dir__)
 
 # These tests start a real server and talk to it over TCP.

test/liquid_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'liquid'

test/mapped_error_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class FooError < RuntimeError
 end

test/markaby_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'markaby'

test/markdown_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 MarkdownTest = proc do
   def markdown_app(&block)

test/middleware_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class MiddlewareTest < Minitest::Test
   setup do

test/nokogiri_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'nokogiri'

test/rabl_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'rabl'

test/rack_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 require 'rack'
 
 class RackTest < Minitest::Test

test/rdoc_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'rdoc'

test/readme_test.rb

@@ -1,6 +1,6 @@
-# Tests to check if all the README examples work.
+require_relative 'test_helper'
-require File.expand_path('helper', __dir__)
 
+# Tests to check if all the README examples work.
 class ReadmeTest < Minitest::Test
   example do
     mock_app { get('/') { 'Hello world!' } }

test/request_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 require 'stringio'
 
 class RequestTest < Minitest::Test

test/response_test.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
+require_relative 'test_helper'
-
-require File.expand_path('helper', __dir__)
 
 class ResponseTest < Minitest::Test
   setup { @response = Sinatra::Response.new([], 200, { 'Content-Type' => 'text/html' }) }

test/result_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class ThirdPartyError < RuntimeError
   def http_status; 400 end

test/route_added_hook_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 module RouteAddedTest
   @routes, @procs = [], []

test/routing_test.rb

@@ -1,5 +1,4 @@
-# I like coding: UTF-8
+require_relative 'test_helper'
-require File.expand_path('helper', __dir__)
 
 # Helper method for easy route pattern matching testing
 def route_def(pattern)

test/server_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 require 'stringio'
 
 module Rack::Handler

test/settings_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class SettingsTest < Minitest::Test
   setup do

test/sinatra_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class SinatraTest < Minitest::Test
   it 'creates a new Sinatra::Base subclass on new' do

test/slim_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'slim'

test/static_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class StaticTest < Minitest::Test
   setup do

test/streaming_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 class StreamingTest < Minitest::Test
   Stream = Sinatra::Helpers::Stream

test/templates_test.rb

@@ -1,5 +1,4 @@
-# encoding: UTF-8
+require_relative 'test_helper'
-require File.expand_path('helper', __dir__)
 File.delete(__dir__ + '/views/layout.test') rescue nil
 
 class TestTemplate < Tilt::Template

test/yajl_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('helper', __dir__)
+require_relative 'test_helper'
 
 begin
 require 'yajl'