capybara-lockstep 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9207a7671ab6f25999a138df922afb783ec3267257eadfab1b179f3c26eb88d
-  data.tar.gz: 2ddfe3a9a10143894afdc2eb2517ddeeaf76311e3365693606359282004a598d
+  metadata.gz: 963aaa637f5f364f53f2a16087accf68035381e260aa4f7b0b2703d9a00a8abb
+  data.tar.gz: a48cdd51fc2fcf9e6d87d0d692e1448c90a639d36695b38e97d4a1183a44043c
 SHA512:
-  metadata.gz: dffa87e401d189b8afea6bb72b49bb14a6f9865d306fc7a838e50b4fb4dfc715fe8930502b9e3e2b4139c214b45eefe189c0ddb8e3e867d30d3021331ba76ea3
-  data.tar.gz: b311ee487b65ae42dc5dcc114cdd2aca2ff39ed49953fe43959ecf8578b3691740ebd2019aeae95fc87334cc5b87835f18b1f816ed2ad0a234e6475b549baad8
+  metadata.gz: 8e2ab4e0227f8f3511e40b82ba0dfe80df61615547c6291db4f0d16bfa097a1863e612d57bd6d16c86bd5e5a4a9cd8be3f6040cdf3138071d487311dcfbb5b1f
+  data.tar.gz: 0060560ae282df788924891c6fff31cdf27491e79468f6c172154667466f66784bce54920e31d0838b96ad91d84904f8cb859573c390a5a327b8e4c40351d2f5

data/.github/workflows/test.yml

@@ -22,12 +22,12 @@ jobs:
           gemfile: Gemfile
         - ruby: 2.7.2
           gemfile: Gemfile
-        - ruby: 3.0.1
+        - ruby: 3.2.0
           gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install Chrome
       uses: browser-actions/setup-chrome@latest
     - name: Show Chrome version

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.2.0

data/CHANGELOG.md

@@ -2,6 +2,22 @@ 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).
 
+## 1.3.1 - 2023-10-25
+
+Now synchronizes before and after `evaluate_script`.
+
+Previously we only synchronized around `execute_script` and `evaluate_async_script`.
+
+
+## 1.3.0 - 2023-01-10
+
+You can configure a proc to run after successful synchronization:
+
+```ruby
+Capybara::Lockstep.after_synchronize do
+  puts "Synchronized!"
+end
+````
 
 ## 1.2.1 - 2022-09-12
 

data/Gemfile

@@ -13,6 +13,9 @@ gem 'thin' # ruby 3 does not include a webserver
 gem 'chrome_remote'
 
 gem 'byebug'
-gem 'gemika'
+gem 'gemika', '>= 0.8.1'
 
 gem 'activesupport', '~> 6.0'
+
+gem 'capybara', '= 3.36.0' # last version compatible with Ruby < 2.7, which is in our test matrix
+gem 'selenium-webdriver', '=4.1.0' # last version compatible with Ruby < 2.7, which is in our test matrix

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-lockstep (1.2.1)
+    capybara-lockstep (1.3.1)
       activesupport (>= 3.2)
       capybara (>= 2.0)
       ruby2_keywords
@@ -19,7 +19,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     byebug (11.1.3)
-    capybara (3.37.1)
+    capybara (3.36.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -35,7 +35,7 @@ GEM
     daemons (1.3.1)
     diff-lcs (1.3)
     eventmachine (1.2.7)
-    gemika (0.6.0)
+    gemika (0.8.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jasmine (3.6.0)
@@ -46,8 +46,10 @@ GEM
     jasmine-core (3.6.0)
     matrix (0.4.2)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.1)
     minitest (5.16.3)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     phantomjs (2.1.1.0)
     public_suffix (5.0.0)
@@ -73,18 +75,16 @@ GEM
     rspec-support (3.7.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    selenium-webdriver (4.4.0)
+    selenium-webdriver (4.1.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
+      rubyzip (>= 1.2.2)
     thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    websocket (1.2.9)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -98,12 +98,14 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 6.0)
   byebug
+  capybara (= 3.36.0)
   capybara-lockstep!
   chrome_remote
-  gemika
+  gemika (>= 0.8.1)
   jasmine
   rake (~> 13.0)
   rspec (~> 3.0)
+  selenium-webdriver (= 4.1.0)
   thin
 
 BUNDLED WITH

data/README.md

@@ -345,6 +345,17 @@ Waiting additional tasks will have a negative performance impact on your test su
 > **Note:** When capybara-lockstep detects jQuery on the page, it will automatically patch [`$.ajax()`](https://api.jquery.com/jQuery.ajax/) to wait an additional task after the response was received. If your only concern is callbacks to `$.ajax()` you do not need so set `Capybara::Lockstep.wait_tasks`.
 
 
+## Running code after synchronization
+
+You can configure a proc to run after successful synchronization:
+
+```ruby
+Capybara::Lockstep.after_synchronize do
+  puts "Synchronized!"
+end
+````
+
+
 ## Contributing
 
 Pull requests are welcome on GitHub at <https://github.com/makandra/capybara-lockstep>.

data/lib/capybara-lockstep/capybara_ext.rb

@@ -145,9 +145,8 @@ Capybara::Session.class_eval do
   extend Capybara::Lockstep::SynchronizeAroundScriptMethod
 
   synchronize_around_script_method :execute_script
+  synchronize_around_script_method :evaluate_script
   synchronize_around_script_method :evaluate_async_script
-  # Don't synchronize around evaluate_script. It calls execute_script
-  # internally and we don't want to synchronize multiple times.
 end
 
 # Capybara 3 has driver-specific Node classes which sometimes

data/lib/capybara-lockstep/configuration.rb

@@ -77,8 +77,22 @@ module Capybara
         @wait_tasks
       end
 
+      def after_synchronize(&callback)
+        after_synchronize_callbacks << callback
+      end
+
       private
 
+      def after_synchronize_callbacks
+        @before_synchronize_callbacks ||= []
+      end
+
+      def run_after_synchronize_callbacks
+        after_synchronize_callbacks.each do |callback|
+          instance_eval(&callback)
+        end
+      end
+
       def javascript_driver?
         driver.is_a?(Capybara::Selenium::Driver)
       end

data/lib/capybara-lockstep/lockstep.rb

@@ -53,6 +53,8 @@ module Capybara
         end
 
         synchronize_now(log: log)
+
+        run_after_synchronize_callbacks
       end
 
       # Automatic synchronization from within the capybara-lockstep should always call #auto_synchronize.
@@ -136,9 +138,10 @@ module Capybara
           end
         rescue StandardError => e
           unhandled_synchronize_error(e)
-        ensure
-          self.synchronizing = false
         end
+
+      ensure
+        self.synchronizing = false
       end
 
       def unhandled_synchronize_error(e)

data/lib/capybara-lockstep/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Lockstep
-    VERSION = "1.2.1"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-lockstep
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: Synchronize Capybara commands with client-side JavaScript and AJAX requests