ndr_dev_support 5.10.1 → 5.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acf9c9b2a5bf1839574b1e38f6507041b1ab7a79c5a44714c8be1f126d6a3a7
-  data.tar.gz: 52a923eb70ed6d240ed3f200b2fa99289e5246b5a563e3aeb0d1bc30ab5be2b8
+  metadata.gz: e096683da4bfa31ffebdb774b1a37c887dccfa92fc6a0062d9e27fe1c687a318
+  data.tar.gz: bfb53cc7a05f65045bab8b8dbd2b09f5efab929a5b94528961f4255c8afb9851
 SHA512:
-  metadata.gz: a948f1a21e02c3d66ff0a7ea0385a790f34f9fbb6f84f48bde53874e606155e711c694db3ded3df258ac24ce404e9535615f8ee40ea1fedda179482d9d37e9cc
-  data.tar.gz: 7a18b6cd57a32fd0668d6671a82960e9233a5cd59a5d75cd8b4cc153c36cbe61a0522033fb59b508a34866d6fea00864b6664bcc2c6b407b15dffe77c0e5a771
+  metadata.gz: 13b4be9f6fdd0d20bba97b65992963a08872678d38294a80063b604b095fdbb2bf24d31543bb83fc48fa75ff9979646179a3295e1fb2f427dfa2f2e620df8a99
+  data.tar.gz: 86c1e2f013f3804e2cb4f94dbd542aaac3e4d3024e48ce64c1ea2dcaf82df403d50c80d48165d092596940effd255b396b1a9cc6a22c09b14bc59ae736345e37

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.10.2 / 2021-02-15
+### Fixed
+* Fixed an issue using `flakey_test` with `minitest` v5.11 onwards
+* Allow use with Rails 6.1
+
 ## 5.10.1 / 2021-02-01
 ### Fixed
 * Fixed an issue with binary files breaking certain code audit modes (#94)

data/code_safety.yml

@@ -10,8 +10,8 @@ file safety:
     safe_revision: 0ce43640c417e174054f903fd82043948ebe8ccb
   ".github/workflows/test.yml":
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 761cacc344191277f4e07ea5982fce89f7a47e0c
+    reviewed_by: joshpencheon
+    safe_revision: 366ef1122fa4502c25cba9e508c565989545ef25
   ".gitignore":
     comments: 
     reviewed_by: josh.pencheon
@@ -26,8 +26,8 @@ file safety:
     safe_revision: 6211cff0ce44645ed3752723b5b0ee65f24c66aa
   CHANGELOG.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: ae7af78e0193891c430ea880dae9f530dcec206b
+    reviewed_by: joshpencheon
+    safe_revision: 9f3ebf2773adc7fdb15f268cfe7635f389da2b2e
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -62,12 +62,16 @@ file safety:
     safe_revision: 05476acacadfa0ad7404f3c37cf3c17c4e0ba11b
   gemfiles/Gemfile.rails52:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: a844e9e392a38b456b21789a8f05b9038903865a
+    reviewed_by: joshpencheon
+    safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
   gemfiles/Gemfile.rails60:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 38266fd047417ecb4d5e6de71746f40495fc9de9
+    reviewed_by: joshpencheon
+    safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
+  gemfiles/Gemfile.rails61:
+    comments: 
+    reviewed_by: joshpencheon
+    safe_revision: f25001ef74c44ab727eef5cb29cef9a54525d36f
   lib/minitest/rake_ci.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -150,8 +154,8 @@ file safety:
     safe_revision: f1a32b1f2d1851b87a883dbf8620aa0e921e436c
   lib/ndr_dev_support/integration_testing/flakey_tests.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: a18f35895baebb1b0971043b3b3f666bb4eb9b5c
+    reviewed_by: joshpencheon
+    safe_revision: 9fc4527cbc132218533cec8d696bd2aadd4a2291
   lib/ndr_dev_support/rake_ci/brakeman_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -222,8 +226,8 @@ file safety:
     safe_revision: 2154aa7f32e731933ff6091b8f42b2b014028a6a
   lib/ndr_dev_support/version.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: ae7af78e0193891c430ea880dae9f530dcec206b
+    reviewed_by: joshpencheon
+    safe_revision: 9f3ebf2773adc7fdb15f268cfe7635f389da2b2e
   lib/tasks/audit_code.rake:
     comments: Identical to the version reviewed by josh.pencheon when contained within
       ndr_support
@@ -295,12 +299,16 @@ file safety:
     safe_revision: 9f33cc3f6fed0c24cb215befa1beaa4bc03e81ef
   ndr_dev_support.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 8d5bef0365849bd87cd3239a722fc21df1e55c48
+    reviewed_by: joshpencheon
+    safe_revision: 9fc4527cbc132218533cec8d696bd2aadd4a2291
   test/daemon/ci_server_test.rb:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: cdd176f2e90284e11899c5c6eea1032f9b785b74
+  test/integration_testing/flakey_tests_test.rb:
+    comments: 
+    reviewed_by: joshpencheon
+    safe_revision: 9fc4527cbc132218533cec8d696bd2aadd4a2291
   test/ndr_dev_support_test.rb:
     comments: 
     reviewed_by: timgentry

data/gemfiles/Gemfile.rails52

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-
 gemspec path: '..'
 
 gem 'activesupport', '~> 5.2.0'

data/gemfiles/Gemfile.rails60

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 gemspec path: '..'
 
-gem 'activesupport', '~> 6.0.0rc1'
-
+gem 'activesupport', '~> 6.0.0'

data/gemfiles/Gemfile.rails61

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'activesupport', '~> 6.1.0'

data/lib/ndr_dev_support/integration_testing/flakey_tests.rb

@@ -33,11 +33,12 @@ module NdrDevSupport
 
         previous_failure = failures.last
         failed_attempts = []
+        result = nil
 
         loop do
           break if attempts_remaining < 1
 
-          super
+          result = super
 
           # No failure was added; we passed!
           break if failures.last == previous_failure
@@ -52,10 +53,12 @@ module NdrDevSupport
         # Attempts were only flakey if we eventually passed:
         flakes.concat(failed_attempts) if failures.last == previous_failure
 
-        self
+        result
       end
     end
   end
 end
 
-ActionDispatch::IntegrationTest.include(NdrDevSupport::IntegrationTesting::FlakeyTests)
+if defined?(ActionDispatch)
+  ActionDispatch::IntegrationTest.include(NdrDevSupport::IntegrationTesting::FlakeyTests)
+end

data/lib/ndr_dev_support/version.rb

@@ -2,5 +2,5 @@
 # This defines the NdrDevSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks (and our own).
 module NdrDevSupport
-  VERSION = '5.10.1'.freeze
+  VERSION = '5.10.2'.freeze
 end

data/ndr_dev_support.gemspec

@@ -35,14 +35,14 @@ Gem::Specification.new do |spec|
   # Integration test dependencies:
   spec.add_dependency 'capybara', '>= 3.34'
   spec.add_dependency 'capybara-screenshot'
-  spec.add_dependency 'minitest', '~> 5.0'
+  spec.add_dependency 'minitest', '~> 5.11'
   spec.add_dependency 'poltergeist', '>= 1.8.0'
   spec.add_dependency 'selenium-webdriver'
   spec.add_dependency 'show_me_the_cookies'
   spec.add_dependency 'webdrivers', '>= 3.9'
 
   # CI server dependencies:
-  spec.add_dependency 'activesupport', '< 6.1'
+  spec.add_dependency 'activesupport', '< 7'
   spec.add_dependency 'brakeman', '>= 4.7.1'
   spec.add_dependency 'bundler-audit'
   spec.add_dependency 'github-linguist'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_dev_support
 version: !ruby/object:Gem::Version
-  version: 5.10.1
+  version: 5.10.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -415,6 +415,7 @@ files:
 - config/rubocop/ndr.yml
 - gemfiles/Gemfile.rails52
 - gemfiles/Gemfile.rails60
+- gemfiles/Gemfile.rails61
 - lib/minitest/rake_ci.rb
 - lib/minitest/rake_ci_plugin.rb
 - lib/ndr_dev_support.rb