From 70e07b9d8728ca30829851595944d9739c3285ae Mon Sep 17 00:00:00 2001 From: Adam Maas Date: Wed, 20 Mar 2024 16:33:54 -0400 Subject: [PATCH] Fixes --- Gemfile | 2 ++ gemfiles/rails_5_2.gemfile | 2 ++ gemfiles/rails_5_2.gemfile.lock | 10 +++++----- gemfiles/rails_6.gemfile | 2 ++ gemfiles/rails_6.gemfile.lock | 10 +++++----- gemfiles/rails_6_1.gemfile | 2 ++ gemfiles/rails_6_1.gemfile.lock | 10 +++++----- gemfiles/rails_7.gemfile | 2 ++ gemfiles/rails_7.gemfile.lock | 10 +++++----- gemfiles/rails_7_1.gemfile | 2 ++ gemfiles/rails_7_1.gemfile.lock | 10 +++++----- test/test_helper.rb | 8 ++++---- 12 files changed, 41 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index 3cd6556..02bdac6 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } gemspec group :test do + gem "akami", "1.2" + gem "minitest", "5.15.0" gem 'minitest-ci', require: false gem 'simplecov', '< 0.18', require: false end diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 63f43e5..796e874 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -6,6 +6,8 @@ gem "rails", "~> 5.2.8.1" gem "nokogiri", "1.12.5" group :test do + gem "akami", "1.2" + gem "minitest", "5.15.0" gem "minitest-ci", require: false gem "simplecov", "< 0.18", require: false end diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index a0d6c32..a0d7d84 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -51,10 +51,9 @@ GEM tzinfo (~> 1.1) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - akami (1.3.3) - base64 + akami (1.2.0) gyoku (>= 0.4.0) - nokogiri + nokogiri (>= 1.4.0) appraisal (2.5.0) bundler rake @@ -101,7 +100,7 @@ GEM method_source (1.0.0) mini_mime (1.1.5) mini_portile2 (2.6.1) - minitest (5.22.3) + minitest (5.15.0) minitest-ci (3.4.0) minitest (>= 5.0.6) mocha (2.1.0) @@ -200,13 +199,14 @@ PLATFORMS x86_64-linux DEPENDENCIES + akami (= 1.2) appraisal awesome_print bundler byebug circuitbox dotenv - minitest (~> 5.0) + minitest (= 5.15.0) minitest-ci mocha nokogiri (= 1.12.5) diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 7802101..b880a14 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -6,6 +6,8 @@ gem "rails", "~> 6.0.6.1" gem "nokogiri", "1.12.5" group :test do + gem "akami", "1.2" + gem "minitest", "5.15.0" gem "minitest-ci", require: false gem "simplecov", "< 0.18", require: false end diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock index 6053285..36a6805 100644 --- a/gemfiles/rails_6.gemfile.lock +++ b/gemfiles/rails_6.gemfile.lock @@ -65,10 +65,9 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - akami (1.3.3) - base64 + akami (1.2.0) gyoku (>= 0.4.0) - nokogiri + nokogiri (>= 1.4.0) appraisal (2.5.0) bundler rake @@ -114,7 +113,7 @@ GEM method_source (1.0.0) mini_mime (1.1.5) mini_portile2 (2.6.1) - minitest (5.22.3) + minitest (5.15.0) minitest-ci (3.4.0) minitest (>= 5.0.6) mocha (2.1.0) @@ -216,13 +215,14 @@ PLATFORMS x86_64-linux DEPENDENCIES + akami (= 1.2) appraisal awesome_print bundler byebug circuitbox dotenv - minitest (~> 5.0) + minitest (= 5.15.0) minitest-ci mocha nokogiri (= 1.12.5) diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index ac5c054..8bd42a0 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -6,6 +6,8 @@ gem "rails", "~> 6.1.7.7" gem "nokogiri", "1.12.5" group :test do + gem "akami", "1.2" + gem "minitest", "5.15.0" gem "minitest-ci", require: false gem "simplecov", "< 0.18", require: false end diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock index 2f83d2f..1ea4bc0 100644 --- a/gemfiles/rails_6_1.gemfile.lock +++ b/gemfiles/rails_6_1.gemfile.lock @@ -69,10 +69,9 @@ GEM zeitwerk (~> 2.3) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - akami (1.3.3) - base64 + akami (1.2.0) gyoku (>= 0.4.0) - nokogiri + nokogiri (>= 1.4.0) appraisal (2.5.0) bundler rake @@ -118,7 +117,7 @@ GEM method_source (1.0.0) mini_mime (1.1.5) mini_portile2 (2.6.1) - minitest (5.22.3) + minitest (5.15.0) minitest-ci (3.4.0) minitest (>= 5.0.6) mocha (2.1.0) @@ -219,13 +218,14 @@ PLATFORMS x86_64-linux DEPENDENCIES + akami (= 1.2) appraisal awesome_print bundler byebug circuitbox dotenv - minitest (~> 5.0) + minitest (= 5.15.0) minitest-ci mocha nokogiri (= 1.12.5) diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 9c7f846..d1ea5aa 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -6,6 +6,8 @@ gem "rails", "~> 7.0.8.1" gem "nokogiri", "1.15.6" group :test do + gem "akami", "1.2" + gem "minitest", "5.15.0" gem "minitest-ci", require: false gem "simplecov", "< 0.18", require: false end diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index 690cd40..ff8ad1b 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -75,10 +75,9 @@ GEM tzinfo (~> 2.0) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - akami (1.3.3) - base64 + akami (1.2.0) gyoku (>= 0.4.0) - nokogiri + nokogiri (>= 1.4.0) appraisal (2.5.0) bundler rake @@ -127,7 +126,7 @@ GEM marcel (1.0.4) method_source (1.0.0) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.15.0) minitest-ci (3.4.0) minitest (>= 5.0.6) mocha (2.1.0) @@ -226,13 +225,14 @@ PLATFORMS x86_64-linux DEPENDENCIES + akami (= 1.2) appraisal awesome_print bundler byebug circuitbox dotenv - minitest (~> 5.0) + minitest (= 5.15.0) minitest-ci mocha nokogiri (= 1.15.6) diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index 5465976..12b1b44 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -6,6 +6,8 @@ gem "rails", "~> 7.1.3.2" gem "nokogiri", "1.15.6" group :test do + gem "akami", "1.2" + gem "minitest", "5.15.0" gem "minitest-ci", require: false gem "simplecov", "< 0.18", require: false end diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock index 1eb5d15..aecdbac 100644 --- a/gemfiles/rails_7_1.gemfile.lock +++ b/gemfiles/rails_7_1.gemfile.lock @@ -84,10 +84,9 @@ GEM tzinfo (~> 2.0) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - akami (1.3.3) - base64 + akami (1.2.0) gyoku (>= 0.4.0) - nokogiri + nokogiri (>= 1.4.0) appraisal (2.5.0) bundler rake @@ -141,7 +140,7 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.15.0) minitest-ci (3.4.0) minitest (>= 5.0.6) mocha (2.1.0) @@ -252,13 +251,14 @@ PLATFORMS x86_64-linux DEPENDENCIES + akami (= 1.2) appraisal awesome_print bundler byebug circuitbox dotenv - minitest (~> 5.0) + minitest (= 5.15.0) minitest-ci mocha nokogiri (= 1.15.6) diff --git a/test/test_helper.rb b/test/test_helper.rb index eab54c1..d691f7a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,10 +2,10 @@ # SimpleCov configuration always goes first to ensure that we are generating correct code-coverage reports. # But we only use SimpleCov on the CI System -if ENV.fetch('CI') { false } - require 'simplecov' - SimpleCov.start -end +# if ENV.fetch('CI') { false } +# require 'simplecov' +# SimpleCov.start +# end $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__) require 'circuitbox'