spreewald 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9629a83474d8c49dcdee707d4375c5870f2be6e62319298aa78daf4f7b094371
-  data.tar.gz: 2825ae8cf7120966658b4c95d87d817ff25502de599db659d5ba58bde0583704
+  metadata.gz: 892a8b1fc2985989a10ad303aa6be9a65a4ea3542bea9c5d9311fb0f1463b73a
+  data.tar.gz: 2031b66e60406bd9205204a6355fc0f745eed30abf3b14095121f9b04290610e
 SHA512:
-  metadata.gz: a809506ac52895e6977f0e04382a1f84c4f1c7e90bfbdb5d21621f704b38a88b3f3b01206f15bc4cf7329b189783aa814ff35a5b879ac95a59077c7663861441
-  data.tar.gz: dc3d04ba83808692024a9a6081c0246b35157aacc74368026d69a2fcfcf4d182b0fcbb609decc094541863ff809f6aec1177d32e3c41424719b686589cec01c8
+  metadata.gz: e7c84b276c5b1cca99a3beac23d656d206ae68cc8f74b17ca3b316b59703249611c226c85d1cc17305faf588e56a1b689d213b916251db4e876c3644c48ee893
+  data.tar.gz: a61b5d8dd7bf93dca91ea19a69d77de47ddb79b251bacf4ed37b79b1cab91972ea5c2f995d05f9ccf2d83f5a6f37b36882a14ffba178399380da192495a7ac34

data/CHANGELOG.md

@@ -3,6 +3,13 @@ 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.4.1
+- Fix deprecation warning for `ActiveRecord::Base.default_timezone` when running with Rails 7.0 ([#191](https://github.com/makandra/spreewald/issues/191))
+- Fix deprecation warning for using keyword arguments as last argument when running with ruby 2.7 ([#192](https://github.com/makandra/spreewald/issues/192))
+
+## 4.4.0
+- Add support for Rails 7.0
+
 ## 4.3.6
 - Use capybara's `make_visible` [option](https://github.com/teamcapybara/capybara/blob/0468de5a810aae75ab9de20447e246c5c35473f0/lib/capybara/node/actions.rb#L279) in step `I attach the file "..." to "..."`
   - This will make CSS-Hacks like setting the opacity in tests obsolete
@@ -33,8 +40,8 @@ did not find the correct elements
 - The search via `spreewald some query here` includes steps with optional negation now.
 
 ## 4.2.2
-- Fixes the "Show me the email" step (#171)
-- Fixes the "I follow the link in the email" step. (#172, #173)
+- Fixes the "Show me the email" step ([#171](https://github.com/makandra/spreewald/issues/171))
+- Fixes the "I follow the link in the email" step. ([#172](https://github.com/makandra/spreewald/issues/172), [#173](https://github.com/makandra/spreewald/issues/173))
   - It works for emails with and without explicit html parts
   - There's a better error message if no links are found
 
@@ -42,7 +49,7 @@ did not find the correct elements
 - Multiple invocations of console don't raise anymore
 
 ## 4.1.1
-- The step `I open .. in a new browser tab` is now using the `noopener` option (see issue [#174])
+- The step `I open .. in a new browser tab` is now using the `noopener` option (see issue [#174](https://github.com/makandra/spreewald/issues/174))
 
 ## 4.1.0
 
@@ -218,7 +225,7 @@ The "it should work" step now takes an optional reason.
 The word "within" can now be used in arguments for other steps without causing errors ([Issue #53](https://github.com/makandra/spreewald/issues/80))
 
 ## 1.12.3
-Prevent wall of warnings when `Then console` is used multiple times in on test run ([issue](https://github.com/makandra/spreewald/issues/80))
+Prevent wall of warnings when `Then console` is used multiple times in on test run ([issue #80](https://github.com/makandra/spreewald/issues/80))
 
 ## 1.12.2
 Always check the current driver by its class (see [issue](https://github.com/makandra/spreewald/issues/74))

data/README.md

@@ -6,7 +6,7 @@ You can find a list of all contained steps at the end of this README.
 
 ## Supported versions
 
-Spreewald is currently tested against and Ruby 2.6.6 and 3.0.0 with Rails 6 and Capybara 3.
+Spreewald is currently tested against and Ruby 2.6.6 and 3.0.0 with Rails 7 and Capybara 3.
 
 ## Installation
 

data/lib/spreewald/time_steps.rb

@@ -22,7 +22,7 @@ if defined?(Timecop) || is_at_least_rails_4_1
 
     def use_timezones?
       active_record_loaded = defined?(ActiveRecord::Base)
-      (!active_record_loaded || ActiveRecord::Base.default_timezone != :local) && Time.zone
+      (!active_record_loaded || default_timezone != :local) && Time.zone
     end
 
     def parse_time(str)
@@ -41,6 +41,14 @@ if defined?(Timecop) || is_at_least_rails_4_1
       end
     end
 
+    def default_timezone
+      if ActiveRecord.respond_to?(:default_timezone)
+        ActiveRecord.default_timezone
+      else
+        ActiveRecord::Base.default_timezone
+      end
+    end
+
     if defined?(Timecop)
       # Emulate ActiveSupport time helper methods with Timecop - don't rename these methods
       def travel(duration)

data/lib/spreewald/web_steps.rb

@@ -48,7 +48,8 @@ When /^(.*) within (.*[^:])$/ do |nested_step, parent|
   selector = _selector_for(parent)
   if selector.is_a?(String) || selector.is_a?(Array) # could also be a Capybara::Node::Element
     patiently do
-      expect(page).to have_selector(*selector)
+      args, kwargs = deconstruct_selector(selector)
+      expect(page).to have_selector(*args, **kwargs)
     end
   end
   patiently do

data/lib/spreewald_support/path_selector_fallbacks.rb

@@ -31,7 +31,25 @@ World(PathSelectorFallbacks)
 
 module WithinHelpers
   def with_scope(locator)
-    locator ? within(*_selector_for(locator)) { yield } : yield
+    if locator
+      selector = _selector_for(locator)
+      args, kwargs = deconstruct_selector(selector)
+      within(*args, **kwargs) { yield }
+    else
+      yield
+    end
+  end
+
+  def deconstruct_selector(selector)
+    if selector.is_a?(Array)
+      if selector[-1].is_a?(Hash) # selector with keyword arguments, e.g. ['.foo', { text: 'bar', visible: :all }]
+        [selector[0...-1], **selector[-1]]
+      else # xpath selector, e.g. [:xpath, '//header']
+        [selector, {}]
+      end
+    else # String or Capybara::Node::Element
+      [selector, {}]
+    end
   end
 end
 World(WithinHelpers)

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '4.4.0'
+  VERSION = '4.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber