capybara-simulated 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999617de5641feceb00fff9d815cb9afeac95fc885c2d9893681a0e8a2be3905
-  data.tar.gz: fb61725ff06cb94851337b4b818d2fdeef2fdf130d00617b02aaed0b13d2799d
+  metadata.gz: 3d7b5f908d1c75a41fabf90b90c779ae21813de6a4620a7b574e4dfca69134cf
+  data.tar.gz: 57ddffb46aca509cd981106c4ac0ad421d38956c52fba5d439add59ae2e10aab
 SHA512:
-  metadata.gz: c7643ae9ebd341be18df9b7cfea6b21ef2fa4c6c83fd9904010d253ffaae4b3680a173961990522c1c39b259e5130d459ecc734145da186d6a4678c47de5458c
-  data.tar.gz: '09e4ea2fa27a537ddf0c7d11e2292e420dd468de4ec2607723cb9c23b39ca4a480d44a5b6d2871e66f882b445aa59875c5e56855078adcb0d53eb2adb7fb5f72'
+  metadata.gz: 576d88b9d8fe7d0c480e8ad7309e7861d9be563a95ab992f6d870f66c06a12d0255f779622ac25e7bab19aa7c6868bf929593e31fe146b4b3fe4d01e3447a37b
+  data.tar.gz: 8cfe9a00eff04e4df4d8aa3b1938f122001a00bc7e15f0f3c5b92975fd51c82b2d115aa9b5031ead063a236e4b4c81159ec9d947ea7e5df948e165d5047f3055

data/lib/capybara/simulated/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Simulated
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/vendor/js/prelude.js

@@ -131,6 +131,7 @@
   globalThis.__csim_runTimers = function (ms) {
     const advance = (typeof ms === 'number') ? Math.max(0, ms) : Infinity;
     _virtualClock += advance;
+    let everFired = false;
     while (true) {
       let fired = false;
       const due = [];
@@ -141,10 +142,13 @@
         _timers.delete(id);
         try { t.fn(); } catch (_) {}
         fired = true;
+        everFired = true;
       }
       if (!fired) break;
     }
+    return everFired;
   };
+  globalThis.__csim_pendingTimerCount = function () { return _timers.size; };
   globalThis.__csim_clearTimers = function () {
     _timers.clear();
     _virtualClock = 0;

data/vendor/js/runtime.js

@@ -11,6 +11,19 @@
 
   const handles = new Map();
   let nextHandleId = 0;
+
+  // Capybara's `have_text` matchers and several internal checks call into
+  // `visibleText` repeatedly against the same handle while polling. The
+  // text-collection walks happy-dom's textContent / styles each call, so
+  // re-running it 1000+ times per spec adds up. Cache by handle and drop
+  // the whole cache the moment any mutating runtime method runs (or
+  // `drainTimers` advances the virtual clock — Stimulus / Turbo timers
+  // may have rewritten the page). The cache is intentionally narrow:
+  // we measured a broader MutationObserver-driven cache as a wash, since
+  // the dispatch overhead ate the cache wins; pinning a bare `Map.clear()`
+  // to known-mutating call sites is much cheaper.
+  const visibleTextCache = new Map();
+  function clearReadCache() { if (visibleTextCache.size) visibleTextCache.clear(); }
   let currentWindow = null;
   let currentDocument = null;
   let activeHandleId = null;
@@ -47,6 +60,7 @@
       catch (_) {}
     }
     handles.clear();
+    visibleTextCache.clear();
     nextHandleId = 0;
     activeHandleId = null;
     modalQueue.length = 0;
@@ -890,8 +904,9 @@
 
   function drainTimers(ms) {
     if (typeof globalThis.__csim_runTimers === 'function') {
-      try { globalThis.__csim_runTimers(ms); } catch (_) {}
+      try { return !!globalThis.__csim_runTimers(ms); } catch (_) {}
     }
+    return false;
   }
 
   // happy-dom has no layout engine, so getBoundingClientRect always returns
@@ -1308,10 +1323,13 @@
     },
     allText(id)     { return String(lookup(id).textContent || ''); },
     visibleText(id) {
+      const cached = visibleTextCache.get(id);
+      if (cached !== undefined) return cached;
       const el = lookup(id);
       // If any ancestor of `el` is hidden, the element renders nothing.
-      if (!visibleAncestorChainOk(el)) return '';
-      return String(visibleTextOf(el));
+      const txt = visibleAncestorChainOk(el) ? String(visibleTextOf(el)) : '';
+      visibleTextCache.set(id, txt);
+      return txt;
     },
     path(id)        { return String(buildXPath(lookup(id))); },
     rect(id) {
@@ -1350,6 +1368,7 @@
     },
 
     setValue(id, value) {
+      clearReadCache();
       const el = lookup(id);
       const tag = (el.tagName || '').toUpperCase();
       const type = (el.type || (el.getAttribute && el.getAttribute('type')) || '').toLowerCase();
@@ -1457,6 +1476,7 @@
     },
 
     selectOption(id) {
+      clearReadCache();
       const opt = lookup(id);
       const select = opt.parentNode && (opt.parentNode.tagName === 'SELECT'
         ? opt.parentNode
@@ -1475,6 +1495,7 @@
       return true;
     },
     unselectOption(id) {
+      clearReadCache();
       const opt = lookup(id);
       const select = opt.closest && opt.closest('select');
       if (!select || !isMultipleSelect(select)) return false;
@@ -1521,8 +1542,8 @@
                           boolPropOrAttr(lookup(id), 'readonly'); },
     multiple(id) { return boolPropOrAttr(lookup(id), 'multiple'); },
 
-    focus(id)  { activeHandleId = id; lookup(id).dispatchEvent(makeEvent('focus', {bubbles: false})); return true; },
-    blur(id)   { lookup(id).dispatchEvent(makeEvent('blur', {bubbles: false})); if (activeHandleId === id) activeHandleId = null; return true; },
+    focus(id)  { clearReadCache(); activeHandleId = id; lookup(id).dispatchEvent(makeEvent('focus', {bubbles: false})); return true; },
+    blur(id)   { clearReadCache(); lookup(id).dispatchEvent(makeEvent('blur', {bubbles: false})); if (activeHandleId === id) activeHandleId = null; return true; },
     activeElement() {
       // Honour the JS-side `document.activeElement` first — happy-dom
       // updates it when scripts call `focus()` directly, which the
@@ -1534,14 +1555,22 @@
     },
 
     hover(id) {
+      clearReadCache();
       const el = lookup(id);
       el.dispatchEvent(makeEvent('mouseover'));
       el.dispatchEvent(makeEvent('mouseenter', {bubbles: false}));
       return true;
     },
-    trigger(id, name) { lookup(id).dispatchEvent(makeEvent(name)); return true; },
-
-    drainTimers(ms) { drainTimers(ms); return true; },
+    trigger(id, name) { clearReadCache(); lookup(id).dispatchEvent(makeEvent(name)); return true; },
+
+    drainTimers(ms) {
+      // Only clear the read cache if a timer actually fired — most
+      // `advance_virtual_clock` calls from Ruby have nothing to do but
+      // tick the wall clock. Without this the visibleText cache is
+      // invalidated on every cross-bridge call and never hits.
+      if (drainTimers(ms)) clearReadCache();
+      return true;
+    },
 
     consumeHistoryPushed() {
       const v = _historyPushed;
@@ -1564,6 +1593,7 @@
     },
 
     click(id, button, modifiers, skipDown) {
+      clearReadCache();
       const el = lookup(id);
       activeHandleId = id;
       const m = Object.assign({button: button || 0}, modifiers || {});
@@ -1710,6 +1740,7 @@
     },
 
     doubleClick(id, modifiers) {
+      clearReadCache();
       const el = lookup(id);
       const m = Object.assign({button: 0}, modifiers || {});
       applyClickOffset(el, m);
@@ -1723,6 +1754,7 @@
       return {action: 'none'};
     },
     rightClick(id, modifiers, skipDown) {
+      clearReadCache();
       const el = lookup(id);
       const m = Object.assign({button: 2}, modifiers || {});
       applyClickOffset(el, m);
@@ -1738,6 +1770,7 @@
     // exposes `DragEvent` as a plain `Event`, so we paste `dataTransfer`
     // onto each event before dispatch.
     drop(id, items) {
+      clearReadCache();
       const el = lookup(id);
       const win = currentWindow;
       const dt = new win.DataTransfer();
@@ -1764,9 +1797,10 @@
       return true;
     },
 
-    submit(id) { return submitDescriptor(lookup(id), null); },
+    submit(id) { clearReadCache(); return submitDescriptor(lookup(id), null); },
 
     sendKeys(id, keys) {
+      clearReadCache();
       const el = lookup(id);
       const editable = (el.tagName === 'INPUT' || el.tagName === 'TEXTAREA');
       let formToSubmit = null;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-simulated
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Keita Urashima