spreewald 4.4.3 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fafd6c66aa09488c02f829c4b64352d5fc0b8c313cbfcf3da8c8bfc9ef486192
-  data.tar.gz: 2839f5ae1583910b595d9df1166cf3a26696d23a7850c444715e0b965b137782
+  metadata.gz: 1920d9013d22c925f9b9b49058dc46d84228d74e79eb61cece32f1ab747e245e
+  data.tar.gz: 4ded87963d399820eed78316462402f2ded9c46384c073dd60dd7c24d7210f01
 SHA512:
-  metadata.gz: e75c55d4e317c6e67fb93f35b0eac0ed1c9aa9bc4b28a6b68f45976734e5e4ad684549052529b2ce3d3fa31e2b3ef2835cbd16da1d91af991b85811e2cfdf2fa
-  data.tar.gz: ab32078bf86d139a1ee68f21b27217a780eaad1784cf7dd1cf777a7fb2a4a0ceed42f7bf58e657fde8f1157984858bcd430c0d81e6dce79d51c2e032e9a20036
+  metadata.gz: d6a16084fc64d3063c095a4eb036a236c1fdf6c395bcfb42d8f418d6cf2de7a08be7628d797ca0ebadd0786eb48ee5964a5f54577eacf05dda33ac4182b1a977
+  data.tar.gz: 14e2db739ec6f716f23ca78a83d8b8480e889b10517776547352533919adc3f58f7225e8aa666b78520b8d4c839f7c9a2046d88c14d796621707f06da9666628

data/.github/workflows/test.yml

@@ -14,13 +14,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ruby: 3.0.0
+        - ruby: 3.2.0
           gemfile: tests/rails-7_capybara-3/Gemfile
         # Used to run rspec and integration tests for spreewald binary:
         - ruby: 2.6.6
           gemfile: Gemfile.ruby266
-        - ruby: 3.0.0
-          gemfile: Gemfile.ruby300
+        - ruby: 3.2.0
+          gemfile: Gemfile.ruby320
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:

data/.ruby-version

@@ -1 +1 @@
-3.0.0
+3.2.0

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 4.5.0
+- `patiently` retries one more time in certain edge cases where the alloted time was used up within the last retry of the `patiently` block (usually by Capybara).
+
+## 4.4.4
+- Make `When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/` compatible for Ruby 3.0.
+
 ## 4.4.3
 - Improve performance of the `I should (not) see a field ...` step to not retry the query when the element is **not** expected to be there.
 - Improve the `an email should have been sent with` step to ignore successive whitespaces after newlines in HTML mail bodies, effectively improving text matching in formatted HTML-tags.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    gemika (0.6.1)
+    gemika (0.8.1)
     rake (13.0.3)
 
 PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.2.17
+   2.2.18

data/Gemfile.ruby266.lock

@@ -44,7 +44,7 @@ GEM
       cucumber-messages (~> 17.1, >= 17.1.1)
     diff-lcs (1.4.4)
     ffi (1.15.4)
-    gemika (0.6.1)
+    gemika (0.8.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mime-types (3.4.1)

data/{Gemfile.ruby300 → Gemfile.ruby320}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '3.0.0'
+ruby '3.2.0'
 
 gem 'rake'
 gem 'rspec'
@@ -8,5 +8,5 @@ gem 'cucumber'
 gem 'aruba'
 
 gem 'gemika'
-gem 'mail'
+gem 'mail', '~> 2.8.0'
 gem 'nokogiri'

data/{Gemfile.ruby300.lock → Gemfile.ruby320.lock}

@@ -42,17 +42,30 @@ GEM
       cucumber-core (~> 10.1, >= 10.1.0)
       cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
       cucumber-messages (~> 17.1, >= 17.1.1)
+    date (3.3.3)
     diff-lcs (1.4.4)
     ffi (1.15.4)
-    gemika (0.6.1)
-    mail (2.7.1)
+    gemika (0.8.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.1115)
-    mini_mime (1.0.3)
+    mini_mime (1.1.2)
     multi_test (0.1.2)
-    nokogiri (1.11.2-x86_64-linux)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     racc (1.5.2)
     rake (13.0.3)
@@ -72,6 +85,7 @@ GEM
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.1.0)
+    timeout (0.3.1)
 
 PLATFORMS
   x86_64-linux
@@ -80,13 +94,13 @@ DEPENDENCIES
   aruba
   cucumber
   gemika
-  mail
+  mail (~> 2.8.0)
   nokogiri
   rake
   rspec
 
 RUBY VERSION
-   ruby 3.0.0p0
+   ruby 3.2.0p0
 
 BUNDLED WITH
    2.2.3

data/lib/spreewald/web_steps.rb

@@ -165,7 +165,7 @@ When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
   options[:make_visible] = true if javascript_capable?
 
   patiently do
-    attach_file(field, File.expand_path(path), options)
+    attach_file(field, File.expand_path(path), **options)
   end
 end.overridable
 

data/lib/spreewald_support/tolerance_for_selenium_sync_issues.rb

@@ -39,16 +39,17 @@ module ToleranceForSeleniumSyncIssues
     WAIT_PERIOD = 0.05
 
     def patiently(seconds, &block)
-      started = monotonic_time
+      patiently_started = monotonic_time
       tries = 0
       begin
         tries += 1
+        block_started = monotonic_time
         block.call
       rescue Exception => e
         raise e unless retryable_error?(e)
-        raise e if (monotonic_time - started > seconds && tries >= 2)
+        raise e if (block_started - patiently_started > seconds && tries >= 2)
         sleep(WAIT_PERIOD)
-        raise Capybara::FrozenInTime, "time appears to be frozen, Capybara does not work with libraries which freeze time, consider using time travelling instead" if monotonic_time == started
+        raise Capybara::FrozenInTime, "time appears to be frozen, Capybara does not work with libraries which freeze time, consider using time travelling instead" if monotonic_time == patiently_started
         retry
       end
     end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '4.4.3'
+  VERSION = '4.5.0'
 end

data/spec/spreewald_support/tolerance_for_selenium_sync_issues_spec.rb

@@ -105,6 +105,18 @@ describe ToleranceForSeleniumSyncIssues do
       expect(count).to be > 1
     end
 
+    it 'retries the block if the given time has been used within the last retry (see issue #202)' do
+      count = 0
+      expect {
+        subject.patiently do
+          count += 1
+          sleep wait_time if count == 2
+          raise Capybara::ElementNotFound
+        end
+      }.to raise_error(Capybara::ElementNotFound)
+      expect(count).to be > 2
+    end
+
     it 'will retry an outer patiently block if an inner patiently block took up all the time' do
       try = 0
       expect {

data/spreewald.gemspec

@@ -9,7 +9,12 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Collection of useful cucumber steps.}
   gem.homepage      = "https://github.com/makandra/spreewald"
   gem.license       = 'MIT'
-  gem.metadata = { 'rubygems_mfa_required' => 'true' }
+  gem.metadata = {
+    'source_code_uri' => gem.homepage,
+    'bug_tracker_uri' => gem.homepage + '/issues',
+    'changelog_uri' => gem.homepage + '/blob/master/CHANGELOG.md',
+    'rubygems_mfa_required' => 'true',
+  }
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/tests/rails-7_capybara-3/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.0.0'
+ruby '3.2.0'
 
 gem 'rails', '~>7'
 gem 'sqlite3'

data/tests/rails-7_capybara-3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (4.4.3)
+    spreewald (4.4.4)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)
@@ -145,7 +145,7 @@ GEM
     erubi (1.10.0)
     erubis (2.7.0)
     ffi (1.15.5)
-    gemika (0.5.0)
+    gemika (0.8.1)
     globalid (1.0.0)
       activesupport (>= 5.0)
     haml (5.2.1)
@@ -197,7 +197,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.0)
       coderay (~> 1.1)
@@ -304,7 +304,7 @@ DEPENDENCIES
   webrick
 
 RUBY VERSION
-   ruby 3.0.0p0
+   ruby 3.2.0p0
 
 BUNDLED WITH
    2.2.24

data/tests/shared/app/views/spreewald_mailer

@@ -1 +1 @@
-tests/shared/app/views/mailer
+mailer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.5.0
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -140,8 +140,8 @@ files:
 - Gemfile.lock
 - Gemfile.ruby266
 - Gemfile.ruby266.lock
-- Gemfile.ruby300
-- Gemfile.ruby300.lock
+- Gemfile.ruby320
+- Gemfile.ruby320.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -335,6 +335,9 @@ homepage: https://github.com/makandra/spreewald
 licenses:
 - MIT
 metadata:
+  source_code_uri: https://github.com/makandra/spreewald
+  bug_tracker_uri: https://github.com/makandra/spreewald/issues
+  changelog_uri: https://github.com/makandra/spreewald/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
@@ -351,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Collection of useful cucumber steps.