From 7eb03ea198471ecb64af25d6956be0bbaadc8ee2 Mon Sep 17 00:00:00 2001 From: Dylan Thacker-Smith Date: Thu, 8 Oct 2020 01:52:40 -0400 Subject: [PATCH 1/3] Only test liquid-c integration using the integration tests --- Rakefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index 780ec353..c8e78bf0 100755 --- a/Rakefile +++ b/Rakefile @@ -14,6 +14,12 @@ Rake::TestTask.new(:base_test) do |t| t.verbose = false end +Rake::TestTask.new(:integration_test) do |t| + t.libs << 'lib' << 'test' + t.test_files = FileList['test/integration/**/*_test.rb'] + t.verbose = false +end + desc('run test suite with warn error mode') task :warn_test do ENV['LIQUID_PARSER_MODE'] = 'warn' @@ -40,12 +46,12 @@ task :test do ENV['LIQUID_C'] = '1' ENV['LIQUID_PARSER_MODE'] = 'lax' - Rake::Task['base_test'].reenable - Rake::Task['base_test'].invoke + Rake::Task['integration_test'].reenable + Rake::Task['integration_test'].invoke ENV['LIQUID_PARSER_MODE'] = 'strict' - Rake::Task['base_test'].reenable - Rake::Task['base_test'].invoke + Rake::Task['integration_test'].reenable + Rake::Task['integration_test'].invoke end end From e781449c36fbc132f46e64a4456b5a520bd943c7 Mon Sep 17 00:00:00 2001 From: Dylan Thacker-Smith Date: Thu, 8 Oct 2020 01:53:11 -0400 Subject: [PATCH 2/3] Remove root directory from library search path for tests It isn't in the gemspec's require_path, so we shouldn't add any dependence on it. --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index c8e78bf0..889fc722 100755 --- a/Rakefile +++ b/Rakefile @@ -9,7 +9,7 @@ task(default: [:test, :rubocop]) desc('run test suite with default parser') Rake::TestTask.new(:base_test) do |t| - t.libs << '.' << 'lib' << 'test' + t.libs << 'lib' << 'test' t.test_files = FileList['test/{integration,unit}/**/*_test.rb'] t.verbose = false end From e495f75cc2e21791e4b37389f34f6845517a9fae Mon Sep 17 00:00:00 2001 From: Dylan Thacker-Smith Date: Thu, 8 Oct 2020 09:47:42 -0400 Subject: [PATCH 3/3] Remove support for ruby 2.4, which is no longer supported upstream --- .github/workflows/liquid.yml | 1 - liquid.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/liquid.yml b/.github/workflows/liquid.yml index 7c4366db..00c51a42 100644 --- a/.github/workflows/liquid.yml +++ b/.github/workflows/liquid.yml @@ -6,7 +6,6 @@ jobs: strategy: matrix: entry: - - { ruby: 2.4, allowed-failure: false } - { ruby: 2.5, allowed-failure: false } - { ruby: 2.6, allowed-failure: false } - { ruby: 2.7, allowed-failure: false } diff --git a/liquid.gemspec b/liquid.gemspec index cf1b75fc..9a261625 100644 --- a/liquid.gemspec +++ b/liquid.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.license = "MIT" # s.description = "A secure, non-evaling end user template engine with aesthetic markup." - s.required_ruby_version = ">= 2.4.0" + s.required_ruby_version = ">= 2.5.0" s.required_rubygems_version = ">= 1.3.7" s.test_files = Dir.glob("{test}/**/*")