capybara-lockstep 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f6aba93856539de9e2df301e720cced0c444de2d62436e72ea620765f9b3e1
-  data.tar.gz: 1ae5dc301b4761d7c51796313ea4a6210596b5975e02f639410916ddc53060b5
+  metadata.gz: 4ece5e0daeb6883b02791ed06f6ff2afca446e5aa5635f22d3ec5b94d0e96aa7
+  data.tar.gz: 5e4d53a8c59f71071aa48fee8ec87fa62e5c189e026b5cac563fd9427a082c59
 SHA512:
-  metadata.gz: b1dc1f1e4a8af3d4d02f4d7b2aec3ae99844ba42bd3713028a138842bdc296c6bc0ed39688b8c15d7976830cc97df9ebc96cee3f3cfc9ab5f799e99ec59fee23
-  data.tar.gz: 50e27f5304cc7fbc1ed0c74ee87311ef8c8a333ecd4395af7cf155305ce0607f4b0f20defdf901d8f5cb3cbe8fc1ddb23638d9587c27f15e2071aea59c24297c
+  metadata.gz: 7e68bf91ab8b5ecf91b145159697e7990dbbbb3a5497955d50d91ea83d802c50195f803ae1fd029b2b76dc18b407bd1995b03aa292e30873cd35f8746dfa509e
+  data.tar.gz: 8fb8d9b19fc47b5769208d36125b6cc2fb40375a8d5b46216ec318a3fd8459ca26f6bf22f352efcf350b7d7cbfe89f7bb866633fb4e096812b7d31513d4c7bae

data/.github/workflows/test.yml

@@ -28,6 +28,12 @@ jobs:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:
     - uses: actions/checkout@v2
+    - name: Install Chrome
+      uses: browser-actions/setup-chrome@latest
+    - name: Show Chrome version
+      run: chrome --version
+    - name: Install ChromeDriver
+      uses: nanasess/setup-chromedriver@master
     - name: Install ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -2,32 +2,68 @@ 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.1.0
 
-## Unreleased
+- Stop handling of `[data-initializing]` attribute. Apps that have late initialization after the `load` event can just use `CapybaraLockstep.startWork()`.
+- Remove useless tracking of interaction events like `"click"` or `"focus"`. If such an event handler would start an AJAX request, it is already tracked.
+- On apps with Unpoly 0.x, wait for one more task after `DOMContentLoaded`. Please upgrade to Unpoly 1.x or 2.x, as this logic will be removed in a year or so.
 
-### Breaking changes
+## 1.0.0
 
-- 
+- First stable release.
+- Replace option `Capybara::Lockstep.config` (`true`, `false`) with a more refined option `.mode` (`:auto`, `:manual`, `:off`)
 
-### Compatible changes
+## 0.7.0
 
--
+- Ruby 3 compatibility.
+- Fix logging.
 
-## 0.7.0 - 2021-05-04
+## 0.6.0
 
-### Compatible changes
+- Synchronize around `evaluate_script` and `execute_script`.
+- Improve logging.
 
-- add changelog
-- add gemika for tests with github actions
-- add Ruby 3 support
+## 0.5.0
 
-## 0.6.0 - 2021-03-10
-## 0.5.0 - 2021-03-09
-## 0.4.0 - 2021-03-05
-## 0.3.3 - 2021-03-05
-## 0.3.2 - 2021-03-04 
-## 0.3.1 - 2021-03-04
-## 0.3.0 - 2021-03-04
-## 0.2.3 - 2021-03-03
-## 0.2.2 - 2021-03-03
-## 0.2.1 - 2021-03-03 
+- Allow developer to signal custom async work.
+- Option to wait additional tasks, to handle legacy promise implementations.
+- Debugging log can be enabled during a running test.
+- Also wait for images and iframes.
+
+## 0.4.0
+
+- Don't fail the test when synchronization times out.
+- Capybara::Lockstep.debug = true will now also enable client-side logging on the browser's JavaScript console.
+- Always wait at least for `Capybara.default_max_wait_time`.
+
+## 0.3.2
+
+- Delay synchronization when an alert is open (instead of failing)
+
+
+## 0.3.1
+
+- Fix typo in log message
+
+## 0.3.0
+
+- Rework entire waiting logic to be lazy.
+- There is now a single method `Capybara::Lockstep.synchronize` (no distinction between awaiting "initialization" and "idle").
+
+## 0.2.3
+
+- When we cannot wait for browser idle due to an open alert, wait before the next Capybara synchronize
+
+## 0.2.2
+
+- Fix incorrect data in gemspec.
+
+
+## 0.2.1
+
+- Internal changes.
+
+
+## 0.2.0
+
+- Initial release.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-lockstep (1.0.0)
+    capybara-lockstep (1.1.0)
       activesupport (>= 3.2)
       capybara (>= 2.0)
       ruby2_keywords

data/README.md

@@ -1,12 +1,15 @@
 # capybara-lockstep
 
-This Ruby gem synchronizes [Capybara](https://github.com/teamcapybara/capybara) commands with client-side JavaScript and AJAX requests. This greatly improves the stability of a full-stack integration test suite, even if that suite has timing issues.
+This Ruby gem synchronizes [Capybara](https://github.com/teamcapybara/capybara) commands with client-side JavaScript and AJAX requests. This greatly improves the stability of an end-to-end ("E2E") test suite, even if that suite has timing issues.
+
+The next section explain why your test suite is flaky and how capybara-lockstep can help.\
+If you don't care you may skip to [installation instructions](#installation).
 
 
 Why are tests flaky?
 --------------------
 
-A naively written integration test will have [race conditions](https://makandracards.com/makandra/47336-fixing-flaky-integration-tests) between the test script and the controlled browser. How often these timing issues will fail your test depends on luck and your machine's performance. You may not see these issues for years until a colleague runs your suite on their new laptop.
+A naively written E2E test will have [race conditions](https://makandracards.com/makandra/47336-fixing-flaky-integration-tests) between the test script and the controlled browser. How often these timing issues will fail your test depends on luck and your machine's performance. You may not see these issues for years until a colleague runs your suite on their new laptop.
 
 Here is a typical example for a test that will fail with unlucky timing:
 
@@ -23,28 +26,50 @@ end
 
 This test has four timing issues that may cause it to fail:
 
-1. We click on the "New tweet" button, but the the JS event handler to open the tweet form wasn't registered yet.
+1. We click on the *New tweet* button, but the the JS event handler to open the tweet form wasn't registered yet.
 2. We start filling in the form, but it wasn't loaded yet.
 3. After sending the tweet we immediately navigate away, killing the form submission request that is still in flight. Hence the tweet will never appear in the next step.
 4. We look for the new tweet, but the timeline wasn't loaded yet.
 
-Capybara will retry individual commands or expectations when they fail. However, only issues **2** and **4** can be healed by retrying.
+[Capybara will retry](https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends) individual commands or expectations when they fail.\
+However, only issues **2** and **4** can be healed by retrying.
+
+While it is [possible](https://makandracards.com/makandra/47336-fixing-flaky-integration-tests) to remove most of the timing issues above, it requires skill and discipline.\
+capybara-lockstep fixes issues **1**, **2**, **3** and **4** without any changes to the test code.
+
+
+### This is a JavaScript problem
+
+The timing issues above will only manifest in an app where links, forms and buttons are handled by JavaScript.
+
+When all you have is standard HTML links and forms, stock Capybara will not see timing issues:
+
+- After a `visit()` Capybara/WebDriver will wait until the page is completely loaded
+- When following a link Capybara/WebDriver will wait until the link destination is completely loaded
+- When submitting a form Capybara/WebDriver will wait until the response is completely loaded
+
+However, when JavaScript handles a link click, you get **zero guarantees**.\
+Capybara/WebDriver **will not wait** for AJAX requests or any other async work.
 
-While it is [possible](https://makandracards.com/makandra/47336-fixing-flaky-integration-tests) to remove most of the timing issues above, it requires skill and discipline. capybara-lockstep fixes issues **1**, **2**, **3** and **4** without any changes to the test code.
 
 
 How capybara-lockstep helps
 ---------------------------
 
-capybara-lockstep waits until the browser is idle before moving on to the next Capybara command. This greatly relieves the pressure on Capybara's retry logic.
+capybara-lockstep waits until the browser is idle before moving on to the next Capybara command. This greatly relieves the pressure on [Capybara's retry logic](https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends).
 
-Whenever Capybara visits a new URL or simulates a user interaction (clicking, typing, etc.):
+Before Capybara simulates a user interaction (clicking, typing, etc.) or before it visits a new URL:
 
-- capybara-lockstep waits for all document resources to load.
+- capybara-lockstep waits for all document resources to load (images, CSS, fonts, frames).
+- capybara-lockstep waits for any AJAX requests to finish.
 - capybara-lockstep waits for client-side JavaScript to render or hydrate DOM elements.
-- capybara-lockstep waits for any AJAX requests.
 - capybara-lockstep waits for dynamically inserted `<script>`s to load (e.g. from [dynamic imports](https://webpack.js.org/guides/code-splitting/#dynamic-imports) or Analytics snippets).
-- capybara-lockstep waits for dynamically `<img>` or `<iframe>` elements to load.
+- capybara-lockstep waits for dynamically inserted `<img>` or `<iframe>` elements to load.
+
+In summary Capybara can no longer observe the page while HTTP requests are in flight.
+This covers most async work that causes flaky tests.
+
+You can also configure capybara-lockstep to [wait for other async work](#signaling-asynchronous-work) that does not involve the network, like animations.
 
 
 Installation
@@ -76,127 +101,82 @@ And then execute:
 $ bundle install
 ```
 
-If you're not using Rails you should also `require 'capybara-lockstep'` in your `spec_helper.rb` (RSpec) or `env.rb` (Cucumber).
+If you're not using Rails you should also `require 'capybara-lockstep'` in your `spec_helper.rb` (RSpec), `test_helper.rb` (Minitest) or `env.rb` (Cucumber).
 
 
 ### Including the JavaScript snippet
 
 capybara-lockstep requires a JavaScript snippet to be embedded by the application under test. If that snippet is missing on a screen, capybara-lockstep will not be able to synchronize with the browser. In that case the test will continue without synchronization.
 
-If you're using Rails you can use the `capybara_lockstep` helper to insert the snippet into your application layouts:
+**If you're using Rails** you can use the `capybara_lockstep` helper to insert the snippet into your application layouts:
 
 ```erb
 <%= capybara_lockstep if Rails.env.test? %>
 ```
 
-Ideally the snippet should be included in the `<head>` before any other `<script>` tags. If that's impractical you will also see some benefit if you insert it later.
+Ideally the snippet should be included in the `<head>` before any other `<script>` tags.
 
-If you have a strict [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP), the `capybara_lockstep` helper will insert a CSP nonce by default. You can also pass a `:nonce` option.
+**If you're not using Rails** you can `include Capybara::Lockstep::Helper` and access the JavaScript with `capybara_lockstep_script`.
 
-If you're not using Rails you can `include Capybara::Lockstep::Helper` and access the JavaScript with `capybara_lockstep_script`.
+**If you have a strict [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP)** the `capybara_lockstep` Rails helper will insert a CSP nonce by default. You can also pass an explicit nonce string using the `:nonce` option.
 
 
-### Signaling the end of page initialization
 
-Most web applications run some JavaScript after a document has initially loaded. Such JavaScript usually enhances existing DOM elements ("hydration") or renders additional element into the DOM.
+### Verify successful integration
 
-capybara-lockstep will synchronize more reliably if you signal when your JavaScript is done rendering the initial document. After the initial rendering, capybara-lockstep will automatically detect when the browser is busy, even if content is changed dynamically later.
+capybara-lockstep will automatically patch Capybara to wait for the browser after every command.
 
-To signal that JavaScript is still initializing, your application layouts should render the `<body>` element with an `[data-initializing]` attribute:
+Run your test suite to see if integration was successful and whether stability improves. During validation we recommend to activate the [debugging log](#debugging-log) before your test:
 
-```html
-<body data-initializing>
+```ruby
+Capybara::Lockstep.debug = true
 ```
 
-Your application JavaScript should remove the `[data-initializing]` attribute when it is done rendering the initial page.
+You should see messages like this in your console:
 
-More precisely, the attribute should be removed in the same [JavaScript task](https://jakearchibald.com/2015/tasks-microtasks-queues-and-schedules/) ("tick") that will finish initializing. capybara-lockstep will assume that the page will be initialized by the end of this task.
-
-**After the initial rendering, capybara-lockstep will automatically detect when the browser is busy, even if content is changed dynamically later. After the initial page load you no longer need to add or remove the `[data-initializing]` attribute.**
+```text
+[capybara-lockstep] Synchronizing
+[capybara-lockstep] Finished waiting for JavaScript
+[capybara-lockstep] Synchronized successfully
+```
 
-#### Example: Vanilla JS
+Note that you may see some failures from tests with wrong assertions, which previously passed due to lucky timing.
 
-If all your initializing JavaScript runs synchronously on `DOMContentLoaded`, you can remove `[data-initializing]` in an event handler:
 
-```js
-document.addEventListener('DOMContentLoaded', function() {
-  // Initialize the page here
-  document.body.removeAttribute('data-initializing')
-})
-```
 
-If you call libraries during initialization, you may need to check the library code to see whether it finishes synchronously or asynchronously. Ideally a library offers a callback to notify you when it is done rendering:
+## Signaling asynchronous work
 
-```js
-document.addEventListener('DOMContentLoaded', function() {
-  Libary.initialize({
-    onFinished: function() {
-      document.body.removeAttribute('data-initializing')
-    }
-  })
-})
-```
+By default capybara-lockstep blocks all async work that 
 
-When a library offers no such callback, but you see in its code that the library delays work for a task, you must also wait another task to remove `[data-initializing]`:
+If for some reason you want capybara-lockstep to consider additional asynchronous work as "busy", you can do so:
 
 ```js
-document.addEventListener('DOMContentLoaded', function() {
-  Libary.initialize()
-  setTimeout(function() { document.body.removeAttribute('data-initializing') })
+CapybaraLockstep.startWork('Eject warp core')
+doAsynchronousWork().then(function() {
+  CapybaraLockstep.stopWork('Eject warp core')
 })
 ```
 
-If your initialization code lazy-loads another script, you should only remove `[data-initializing]` once that is done:
+The string argument is used for logging (when logging is enabled). It does **not** need to be unique per job. In this case you should see messages like this in your browser's JavaScript console:
 
-```js
-document.addEventListener('DOMContentLoaded', function() {
-  import('huge-library').then(function({ HugeLibrary }) {
-    HugeLibrary.initialize()
-    document.body.removeAttribute('data-initializing')
-  })
-})
+```text
+[capybara-lockstep] Started work: Eject warp core [1 jobs]
+[capybara-lockstep] Finished work: Eject warp core [0 jobs]
 ```
 
+You may omit the string argument, in which case nothing will be logged, but the work will still be tracked.
 
-#### Example: Unpoly
-
-When you're using [Unpoly](https://unpoly.com/) initializing will usually happen synchronously in [compilers](https://unpoly.com/up.compiler). Hence a compiler is a good place to remove `[data-initializing]`:
-
-```js
-up.compiler('body', function(body) {
-  body.removeAttribute('data-initializing')
-})
-```
 
-#### Example: AngularJS 1
+## Note on interacting with the JavaScript API
 
-When you're using [AngularJS 1](https://unpoly.com/) initializing will usually happen synchronously in [directives](https://docs.angularjs.org/guide/directive). Hence a directive is a good place to remove `[data-initializing]`:
+If you only load capybara-lockstep in tests you, should check for the `CapybaraLockstep` global to be defined before you interact with the JavaScript API.
 
 ```js
-app.directive('body', function() {
-  return {
-    restrict: 'E',
-    link: function() {
-      document.body.removeAttribute('data-initializing')
-    }
-  }
-})
-```
-
-### Verify successful integration
-
-capybara-lockstep will automatically patch Capybara to wait for the browser after every command.
-
-Run your test suite to see if integration was successful and whether stability improves. During validation we recommend to activate `Capybara::Lockstep.debug = true` in your `spec_helper.rb` (RSpec) or `env.rb` (Cucumber). You should see messages like this in your console:
-
-```text
-[capybara-lockstep] Synchronizing
-[capybara-lockstep] Finished waiting for JavaScript
-[capybara-lockstep] Synchronized successfully
+if (window.CapybaraLockstep) {
+  // interact with CapybaraLockstep
+}
 ```
 
-Note that you may see some failures from tests with wrong assertions, which sometimes passed due to lucky timing.
-
 
 ## Performance impact
 
@@ -204,7 +184,7 @@ capybara-lockstep may or may not impact the runtime of your test suite. It depen
 
 While waiting for the browser to be idle does take a few milliseconds, Capybara no longer needs to retry failed commands. You will also save time from not needing to re-run failed tests.
 
-In casual testing I experienced a performance impact between +/- 10%.
+In casual testing with large test suites I experienced a performance impact between +/- 10%.
 
 
 ## Debugging log
@@ -243,9 +223,9 @@ Capybara::Lockstep.debug = Rails.logger
 
 ### Logging in the browser only
 
-To enable logging in the browser console (but not STDOUT), include the snippet with `{ debug: true }`:
+To enable logging in the browser console (but not STDOUT), include the [JavaScript snippet](#including-the-javascript-snippet) with `{ debug: true }`:
 
-```
+```ruby
 capybara_lockstep(debug: true)
 ```
 
@@ -253,7 +233,11 @@ capybara_lockstep(debug: true)
 
 By default capybara-lockstep will wait `Capybara.default_max_wait_time` seconds for the page initialize and for JavaScript and AJAX request to finish.
 
-When synchronization times out, capybara-lockstep will log but not raise an error.
+When synchronization times out, capybara-lockstep will [log](#debugging-log):
+
+```text
+[capybara-lockstep] Could not synchronize within 3 seconds
+```
 
 You can configure a different timeout:
 
@@ -261,10 +245,19 @@ You can configure a different timeout:
 Capybara::Lockstep.timeout = 5 # seconds
 ```
 
-To revert to defaulting to `Capybara.default_max_wait_time`, set the timeout to `nil`:
+By default Capybara will **not** raise an error after a timeout. You may occasionally get a slow server response, and Capybara will retry synchronization before the next interaction or `visit`. This is often good enough.
+
+If you want to be strict you may configure that an `Capybara::Lockstep::Timeout` error is raised after a timeout:
+
+```ruby
+Capybara::Lockstep.timeout_with = :error
+```
+
+To revert to defaults:
 
 ```ruby
 Capybara::Lockstep.timeout = nil
+Capybara::Lockstep.timeout_with = nil
 ```
 
 
@@ -300,7 +293,7 @@ ensure
 end
 ```
 
-Note that you may still force synchronization by calling `Capybara::Lockstep.synchronize` manually.
+In the `:manual` mode you may still force synchronization by calling `Capybara::Lockstep.synchronize` manually.
 
 To completely disable synchronization:
 
@@ -310,36 +303,6 @@ Capybara::Lockstep.synchronize # will not synchronize
 ```
 
 
-## Signaling asynchronous work
-
-If for some reason you want capybara-lockstep to consider additional asynchronous work as "busy", you can do so:
-
-```js
-CapybaraLockstep.startWork('Eject warp core')
-doAsynchronousWork().then(function() {
-  CapybaraLockstep.stopWork('Eject warp core')
-})
-```
-
-The string argument is used for logging (when logging is enabled). It does **not** need to be unique per job. In this case you should see messages like this in your browser's JavaScript console:
-
-```text
-[capybara-lockstep] Started work: Eject warp core [1 jobs]
-[capybara-lockstep] Finished work: Eject warp core [0 jobs]
-```
-
-You may omit the string argument, in which case nothing will be logged, but the work will still be tracked.
-
-
-## Note on interacting with the JavaScript API
-
-If you only load capybara-lockstep in tests you, should check for the `CapybaraLockstep` global to be defined before you interact with the JavaScript API.
-
-```js
-if (window.CapybaraLockstep) {
-  // interact with CapybaraLockstep
-}
-```
 
 ## Handling legacy promises
 
@@ -364,16 +327,31 @@ If you see longer `then()` chains in your code, you may need to configure a high
 This will have a negative performance impact on your test suite.
 
 
-## Development
+## Contributing
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Pull requests are welcome on GitHub at <https://github.com/makandra/capybara-lockstep>.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+After checking out the repo, run `bin/setup` to install dependencies.
 
+Then, run `rake spec` to run the tests.
 
-## Contributing
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-Pull requests are welcome on GitHub at <https://github.com/makandra/capybara-lockstep>.
+### Manually testing a change
+
+To test an unrelased change with a test suite, we recommend to temporarily link the local repository from your test suites's `Gemfile`:
+
+```ruby
+gem 'capybara-lockstep', path: '../capybara-lockstep'
+```
+
+As an alternative you may also install this gem onto your local machine by running `bundle exec rake install`.
+
+### Releasing a new version
+
+- Update the version number in `version.rb`
+ - Run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+ - If RubyGems publishing seems to freeze, try entering your OTP code.
 
 
 ## License

data/lib/capybara-lockstep/configuration.rb

@@ -10,6 +10,14 @@ module Capybara
         @timeout = seconds
       end
 
+      def timeout_with
+        @timeout_with.nil? ? :log : @timeout_with
+      end
+
+      def timeout_with=(action)
+        @timeout_with = action&.to_sym
+      end
+
       def debug?
         # @debug may also be a Logger object, so convert it to a boolean
         @debug.nil? ? false : !!@debug
@@ -38,7 +46,7 @@ module Capybara
       end
 
       def mode=(mode)
-        @mode = mode
+        @mode = mode&.to_sym
       end
 
       def enabled=(enabled)

data/lib/capybara-lockstep/errors.rb

@@ -1,6 +1,6 @@
 module Capybara
   module Lockstep
     class Error < StandardError; end
-    class Busy < Error; end
+    class Timeout < Error; end
   end
 end

data/lib/capybara-lockstep/helper.js

@@ -123,43 +123,21 @@ window.CapybaraLockstep = (function() {
     }
   }
 
-  function trackInteraction() {
-    // We already override all interaction methods in the Selenium browser nodes, so they
-    // wait for an idle frame afterwards. However a test script might also dispatch synthetic
-    // events with executate_script() to manipulate the browser in ways that are not possible
-    // with the Capybara API. When we observe such an event we wait until the end of the microtask,
-    // assuming any busy action will be queued by then.
-    ['click',  'mousedown', 'keydown', 'change', 'input', 'submit', 'focusin', 'focusout', 'scroll'].forEach(function(eventType) {
-      // Use { useCapture: true } so we get the event before another listener
-      // can prevent it from bubbling up to the document.
-      document.addEventListener(eventType, onInteraction, { capture: true, passive: true })
-    })
-  }
-
-  function onInteraction(event) {
-    startWork()
-    // (1) We wait until the end of this microtask, assuming that any callback that
-    //     would queue an AJAX request or load additional scripts will run by then.
-    // (2) For performance reasons we don't wait for `waitTasks` here.
-    //     Whatever was queued by an event handler should call us again, and then
-    //     we do wait for additional tasks.
-    Promise.resolve().then(stopWorkNow)
-  }
-
   function trackRemoteElements() {
     if (!window.MutationObserver) {
       return
     }
 
-    // Dynamic imports or analytics snippets may insert a <script src>
-    // tag that loads and executes additional JavaScript. We want to be isBusy()
+    // Dynamic imports or analytics snippets may insert a script element
+    // that loads and executes additional JavaScript. We want to be isBusy()
     // until such scripts have loaded or errored.
     let observer = new MutationObserver(onAnyElementChanged)
     observer.observe(document, { subtree: true, childList: true })
   }
 
   function trackJQuery() {
-    // jQuery may be loaded after us, so we wait until DOMContentReady.
+    // CapybaraLockstep.track() is called as the first script in the head.
+    // jQuery will be loaded after us, so we wait until DOMContentReady.
     whenReady(function() {
       if (!window.jQuery || waitTasks > 0) {
         return
@@ -180,28 +158,6 @@ window.CapybaraLockstep = (function() {
     })
   }
 
-  let INITIALIZING_ATTRIBUTE = 'data-initializing'
-
-  function trackHydration() {
-    // Until we have a body on which we can observe [data-initializing]
-    // we consider ourselves busy.
-    startWork()
-    whenReady(function() {
-      stopWorkNow()
-      if (document.body.hasAttribute(INITIALIZING_ATTRIBUTE)) {
-        startWork('Page initialization')
-        let observer = new MutationObserver(onInitializingAttributeChanged)
-        observer.observe(document.body, { attributes: true, attributeFilter: [INITIALIZING_ATTRIBUTE] })
-      }
-    })
-  }
-
-  function onInitializingAttributeChanged() {
-    if (!document.body.hasAttribute(INITIALIZING_ATTRIBUTE)) {
-      stopWork('Page initialization')
-    }
-  }
-
   function isRemoteScript(element) {
     if (element.tagName === 'SCRIPT') {
       let src = element.getAttribute('src')
@@ -303,13 +259,28 @@ window.CapybaraLockstep = (function() {
     }
   }
 
+  function trackOldUnpoly() {
+    // CapybaraLockstep.track() is called as the first script in the head.
+    // Unpoly will be loaded after us, so we wait until DOMContentReady.
+    whenReady(function() {
+      // Unpoly 0.x would wait one task after DOMContentLoaded before booting.
+      // There's a slim chance that Capybara can observe the page before compilers have run.
+      // Unpoly 1.0+ runs compilers on DOMContentLoaded, so there's no issue.
+      if (window.up?.version?.startsWith('0.')) {
+        startWork('Old Unpoly')
+        setTimeout(function () {
+          stopWork('Old Unpoly')
+        })
+      }
+    })
+  }
+
   function track() {
+    trackOldUnpoly()
     trackFetch()
     trackXHR()
-    trackInteraction()
     trackRemoteElements()
     trackJQuery()
-    trackHydration()
   }
 
   function synchronize(callback) {

data/lib/capybara-lockstep/lockstep.rb

@@ -68,6 +68,8 @@ module Capybara
               if (protocol === 'data:' || protocol == 'about:') {
                 done(#{ERROR_PAGE_MISSING.to_json})
               } else if (document.readyState === 'complete') {
+                // WebDriver always waits for the `load` event after a visit(),
+                // unless a different page load strategy was configured.
                 synchronize()
               } else {
                 window.addEventListener('load', synchronize)
@@ -88,9 +90,14 @@ module Capybara
             end
           end
         rescue ::Selenium::WebDriver::Error::ScriptTimeoutError
-          log "Could not synchronize within #{timeout} seconds"
-          # Don't raise an error, this may happen if the server is slow to respond.
-          # We will retry on the next Capybara synchronize call.
+          timeout_message = "Could not synchronize within #{timeout} seconds"
+          log timeout_message
+          if timeout_with == :error
+            raise Timeout, timeout_message
+          else
+            # Don't raise an error, this may happen if the server is slow to respond.
+            # We will retry on the next Capybara synchronize call.
+          end
         rescue ::Selenium::WebDriver::Error::UnexpectedAlertOpenError
           log ERROR_ALERT_OPEN
           # Don't raise an error, this will happen in an innocent test.

data/lib/capybara-lockstep/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Lockstep
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-lockstep
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara