Merge pull request #41 from fac/fix-minitest-deprecations-warnings-errors

gerardm-fa · web-flow · commit a4b184a1dbd3 · 2022-05-25T14:11:40.000+01:00
Fix issue with missing require in later active_support releases
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -5,9 +5,9 @@ jobs:
     name: runner / actionlint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: actionlint
-        uses: reviewdog/action-actionlint@v1.2.0
+        uses: reviewdog/action-actionlint@v1
         with:
           fail_on_error: true
           reporter: github-pr-review
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,19 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-##[2.6.2] - 2022-01-10
+## [2.7.0] - 2022-05-25
+### Fixed
+- Added missing require in `Hermod::XmlSectionBuilder`
+- Fixed deprecations in Minitest
+
+### Removed
+- Remove unused bad_attributes attr_reader on `Hermod::Validators::Attributes`
+
+### Changed
+- Updated development dependencies
+
+## [2.6.2] - 2022-01-10
+### Changed
 - Remove the upper limit on the activesupport version
 
-##[2.6.1] - 2020-10-22
+## [2.6.1] - 2020-10-22
 ## Added
 - Changelog updates
 
-##[2.6.0] - 2020-10-22
+## [2.6.0] - 2020-10-22
 ## Added
 - Update libxml-ruby to version ~> 3.2
 - Update ruby-version to 2.7.1
 
-##[2.5.3] - 2019-11-01
+## [2.5.3] - 2019-11-01
 ### Added
 - Link wiki to the readme file.
 
diff --git a/hermod.gemspec b/hermod.gemspec
@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "13.0.1"
-  spec.add_development_dependency "minitest", "~> 5.3"
-  spec.add_development_dependency "minitest-reporters", "~> 1.0", ">= 1.0.16"
-  spec.add_development_dependency "nokogiri", "~> 1.5"
+  spec.add_development_dependency "minitest", "~> 5.15"
+  spec.add_development_dependency "minitest-reporters", ">= 1.0.16", "~> 1.5"
+  spec.add_development_dependency "nokogiri", "~> 1.13"
 
   spec.metadata = {
     "allowed_push_host" => "https://rubygems.org",
diff --git a/lib/hermod/validators/attributes.rb b/lib/hermod/validators/attributes.rb
@@ -4,7 +4,7 @@ module Hermod
   module Validators
     # Checks the attributes are in a list of allowed attributes
     class Attributes < Base
-      attr_reader :allowed_attributes, :bad_attributes
+      attr_reader :allowed_attributes
 
       # Public: Sets up the list of allowed attributes
       def initialize(allowed_attributes)
diff --git a/lib/hermod/version.rb b/lib/hermod/version.rb
@@ -1,3 +1,3 @@
 module Hermod
-  VERSION = "2.6.2"
+  VERSION = "2.7.0"
 end
diff --git a/lib/hermod/xml_section_builder.rb b/lib/hermod/xml_section_builder.rb
@@ -1,7 +1,8 @@
-require 'bigdecimal'
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
+require 'bigdecimal'
+require 'date'
 
 require 'hermod/xml_node'
 require 'hermod/input_mutator'
diff --git a/spec/hermod/validators/allowed_values_spec.rb b/spec/hermod/validators/allowed_values_spec.rb
@@ -8,17 +8,17 @@ module Validators
       end
 
       it "permits values in the list" do
-        subject.valid?("Cat", {}).must_equal true
+        expect(subject.valid?("Cat", {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?("", {}).must_equal true
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?("", {})).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values not in the list" do
-        ex = proc { subject.valid?("Albatross", {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be one of Antelope, Bear, Cat, Dog, or Elephant, not Albatross"
+        ex = expect { subject.valid?("Albatross", {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be one of Antelope, Bear, Cat, Dog, or Elephant, not Albatross"
       end
     end
   end
diff --git a/spec/hermod/validators/attributes_spec.rb b/spec/hermod/validators/attributes_spec.rb
@@ -8,12 +8,12 @@ module Validators
       end
 
       it "permits attributes in the list" do
-        subject.valid?(nil, {species: "Felis catus", genus: "Felis"}).must_equal true
+        expect(subject.valid?(nil, {species: "Felis catus", genus: "Felis"})).must_equal true
       end
 
       it "raises an error for attributes not in the list" do
-        ex = proc { subject.valid?(nil, {phylum: "Chordata"}) }.must_raise InvalidInputError
-        ex.message.must_equal "has attributes it doesn't accept: phylum"
+        ex = expect { subject.valid?(nil, {phylum: "Chordata"}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "has attributes it doesn't accept: phylum"
       end
     end
   end
diff --git a/spec/hermod/validators/base_spec.rb b/spec/hermod/validators/base_spec.rb
@@ -8,7 +8,7 @@ module Validators
       end
 
       it "doesn't implement a test" do
-        proc { subject.valid?(nil, {}) }.must_raise NotImplementedError
+        expect { subject.valid?(nil, {}) }.must_raise NotImplementedError
       end
 
       it "has a default error message" do
@@ -17,8 +17,8 @@ def test(value, attributes)
             false
           end
         end
-        ex = proc { TestValidator.new.valid?(nil, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "is invalid"
+        ex = expect { TestValidator.new.valid?(nil, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "is invalid"
       end
     end
   end
diff --git a/spec/hermod/validators/non_negative_spec.rb b/spec/hermod/validators/non_negative_spec.rb
@@ -8,20 +8,20 @@ module Validators
       end
 
       it "allows positive values" do
-        subject.valid?(1, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
       end
 
       it "allows zero values" do
-        subject.valid?(0, {}).must_equal true
+        expect(subject.valid?(0, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for negative values" do
-        ex = proc { subject.valid?(-1, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "cannot be negative"
+        ex = expect { subject.valid?(-1, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "cannot be negative"
       end
     end
   end
diff --git a/spec/hermod/validators/non_zero_spec.rb b/spec/hermod/validators/non_zero_spec.rb
@@ -8,20 +8,20 @@ module Validators
       end
 
       it "allows positive values" do
-        subject.valid?(1, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
       end
 
       it "allows negative values" do
-        subject.valid?(-1, {}).must_equal true
+        expect(subject.valid?(-1, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for zero values" do
-        ex = proc { subject.valid?(0, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "cannot be zero"
+        ex = expect { subject.valid?(0, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "cannot be zero"
       end
     end
   end
diff --git a/spec/hermod/validators/range_spec.rb b/spec/hermod/validators/range_spec.rb
@@ -8,21 +8,21 @@ module Validators
       end
 
       it "allows values in the range" do
-        subject.valid?(1, {}).must_equal true
-        subject.valid?(7, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
+        expect(subject.valid?(7, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values outwith the range" do
-        ex = proc { subject.valid?(0, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be between 1 and 7"
+        ex = expect { subject.valid?(0, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be between 1 and 7"
       end
 
       it "can also take a min and max as arguments" do
-        Range.new(1, 7).valid?(3, {}).must_equal true
+        expect(Range.new(1, 7).valid?(3, {})).must_equal true
       end
     end
   end
diff --git a/spec/hermod/validators/regular_expression_spec.rb b/spec/hermod/validators/regular_expression_spec.rb
@@ -8,17 +8,17 @@ module Validators
       end
 
       it "allows values that match the pattern" do
-        subject.valid?("AB123456C", {}).must_equal true
+        expect(subject.valid?("AB123456C", {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?("", {}).must_equal true
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?("", {})).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values that don't match the pattern" do
-        ex = proc { subject.valid?("fish", {}) }.must_raise InvalidInputError
-        ex.message.must_equal "\"fish\" does not match /\\A[A-Z]{2} [0-9]{6} [A-D]\\z/x"
+        ex = expect { subject.valid?("fish", {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "\"fish\" does not match /\\A[A-Z]{2} [0-9]{6} [A-D]\\z/x"
       end
     end
   end
diff --git a/spec/hermod/validators/type_checker_spec.rb b/spec/hermod/validators/type_checker_spec.rb
@@ -5,27 +5,27 @@ module Validators
     describe TypeChecker do
       it "uses a default block that checks the value is an instance of the given class" do
         checker = TypeChecker.new(Integer)
-        checker.valid?(1, {}).must_equal true
-        proc { checker.valid?(1.0, {}) }.must_raise InvalidInputError
+        expect(checker.valid?(1, {})).must_equal true
+        expect { checker.valid?(1.0, {}) }.must_raise InvalidInputError
       end
 
       it "allows you to give a block to be more discerning" do
         checker = TypeChecker.new(Integer) { |val| val > 0 }
-        checker.valid?(5, {}).must_equal true
-        proc { checker.valid?(-2, {}) }.must_raise InvalidInputError
+        expect(checker.valid?(5, {})).must_equal true
+        expect { checker.valid?(-2, {}) }.must_raise InvalidInputError
       end
 
       it "ignores blank values" do
         checker = TypeChecker.new(Integer)
-        checker.valid?(nil, {}).must_equal true
+        expect(checker.valid?(nil, {})).must_equal true
       end
 
       it "gives the correct message" do
-        ex = proc { TypeChecker.new(Integer).valid?(1.0, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be an integer"
+        ex = expect { TypeChecker.new(Integer).valid?(1.0, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be an integer"
 
-        ex = proc { TypeChecker.new(Float).valid?(1, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be a float"
+        ex = expect { TypeChecker.new(Float).valid?(1, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be a float"
       end
     end
   end
diff --git a/spec/hermod/validators/value_presence_spec.rb b/spec/hermod/validators/value_presence_spec.rb
@@ -8,12 +8,12 @@ module Validators
       end
 
       it "allows values that are present" do
-        subject.valid?(1, {}).must_equal true
+        expect(subject.valid?(1, {})).must_equal true
       end
 
       it "raises an error for missing values" do
-        ex = proc { subject.valid?(nil, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "isn't optional but no value was provided"
+        ex = expect { subject.valid?(nil, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "isn't optional but no value was provided"
       end
     end
   end
diff --git a/spec/hermod/validators/whole_units_spec.rb b/spec/hermod/validators/whole_units_spec.rb
@@ -8,16 +8,16 @@ module Validators
       end
 
       it "allows values that are in whole units" do
-        subject.valid?(1.0, {}).must_equal true
+        expect(subject.valid?(1.0, {})).must_equal true
       end
 
       it "allows blank values" do
-        subject.valid?(nil, {}).must_equal true
+        expect(subject.valid?(nil, {})).must_equal true
       end
 
       it "raises an error for values with a fractional componant" do
-        ex = proc { subject.valid?(3.1415, {}) }.must_raise InvalidInputError
-        ex.message.must_equal "must be in whole units"
+        ex = expect { subject.valid?(3.1415, {}) }.must_raise InvalidInputError
+        expect(ex.message).must_equal "must be in whole units"
       end
     end
   end
diff --git a/spec/hermod/xml_section_builder/date_node_spec.rb b/spec/hermod/xml_section_builder/date_node_spec.rb
@@ -16,16 +16,16 @@ module Hermod
       end
 
       it "should format the date with the given date string" do
-        value_of_node("DateOfBirth").must_equal "1988-08-13"
+        expect(value_of_node("DateOfBirth")).must_equal "1988-08-13"
       end
 
       it "should raise an error if given something that isn't a date" do
-        proc { subject.anniversary "yesterday" }.must_raise InvalidInputError
+        expect { subject.anniversary "yesterday" }.must_raise InvalidInputError
       end
 
       it "should ignore blank dates if the date is optional" do
         subject.anniversary nil
-        nodes("Anniversary").must_be_empty
+        expect(nodes("Anniversary")).must_be_empty
       end
     end
   end
diff --git a/spec/hermod/xml_section_builder/datetime_node_spec.rb b/spec/hermod/xml_section_builder/datetime_node_spec.rb
@@ -16,16 +16,16 @@ module Hermod
       end
 
       it "should format the datetime with the given format string" do
-        value_of_node("Published").must_equal "2015-03-14 12:30:56"
+        expect(value_of_node("Published")).must_equal "2015-03-14 12:30:56"
       end
 
       it "should raise an error if given something that isn't a date" do
-        proc { subject.redacted "yesterday" }.must_raise InvalidInputError
+        expect { subject.redacted "yesterday" }.must_raise InvalidInputError
       end
 
       it "should ignore blank dates if the date is optional" do
         subject.redacted nil
-        nodes("Redacted").must_be_empty
+        expect(nodes("Redacted")).must_be_empty
       end
     end
   end
diff --git a/spec/hermod/xml_section_builder/integer_node_spec.rb b/spec/hermod/xml_section_builder/integer_node_spec.rb
@@ -14,15 +14,15 @@ module Hermod
 
       it "should accept a valid number" do
         subject.day_of_the_week 7
-        value_of_node("DayOfTheWeek").must_equal "7"
+        expect(value_of_node("DayOfTheWeek")).must_equal "7"
       end
 
       it "should raise an error if the number is above the maximum" do
-        proc { subject.day_of_the_week 8 }.must_raise InvalidInputError
+        expect { subject.day_of_the_week 8 }.must_raise InvalidInputError
       end
 
       it "should raise an error if the number is below the minimum" do
-        proc { subject.day_of_the_week 0 }.must_raise InvalidInputError
+        expect { subject.day_of_the_week 0 }.must_raise InvalidInputError
       end
     end
   end
diff --git a/spec/hermod/xml_section_builder/monetary_node_spec.rb b/spec/hermod/xml_section_builder/monetary_node_spec.rb
diff --git a/spec/hermod/xml_section_builder/parent_node_spec.rb b/spec/hermod/xml_section_builder/parent_node_spec.rb
diff --git a/spec/hermod/xml_section_builder/string_node_spec.rb b/spec/hermod/xml_section_builder/string_node_spec.rb
diff --git a/spec/hermod/xml_section_builder/yes_no_node_spec.rb b/spec/hermod/xml_section_builder/yes_no_node_spec.rb
diff --git a/spec/hermod/xml_section_builder/yes_node_spec.rb b/spec/hermod/xml_section_builder/yes_node_spec.rb
diff --git a/spec/hermod/xml_section_spec.rb b/spec/hermod/xml_section_spec.rb
diff --git a/spec/hermod_spec.rb b/spec/hermod_spec.rb
