capybara-simulated 0.8.0 → 0.9.0

data/lib/capybara/simulated/driver.rb

@@ -52,7 +52,10 @@ module Capybara
           @@live.select!(&:weakref_alive?)
           @@live.filter_map {|ref| ref.__getobj__ rescue nil }
         }
-        drivers.each {|d| yield d if d.owner_thread == thread }
+        # A DISPOSED driver is not live: its runtime context is gone, so calling into it raises
+        # (`undefined method 'call' for nil` out of `run_loop_step`). `dispose` deregisters, but the
+        # predicate is the belt — a WeakRef stays in the list until GC actually collects.
+        drivers.each {|d| yield d if d.owner_thread == thread && !d.disposed? }
       end
 
       # `viewport: [w, h]` and `user_agent:` (typically supplied via
@@ -310,9 +313,18 @@ module Capybara
       # isolate per cross-origin file (hundreds over the suite); disposing here
       # incrementally is what reset_windows! already does for aux windows.
       def dispose
+        return if @disposed
+        @disposed = true
+        # Drop out of the live registry FIRST: everything below tears down the runtime this driver
+        # would be asked to step if `each_live_on_thread` still yielded it.
+        @@live_lock.synchronize { @@live.reject! {|ref| (ref.__getobj__ rescue nil).equal?(self) } }
         reset_windows!
         @browser.dispose rescue nil
       end
+
+      # Has this driver been permanently dropped? (A `reset!` between examples does NOT set this —
+      # that rebuilds the page on a live runtime.)
+      def disposed? = @disposed == true
       def go_back              = current_browser.go_back
       def go_forward           = current_browser.go_forward
       def reset_history!       = current_browser.reset_history!
@@ -362,6 +374,12 @@ module Capybara
         window_entries.find {|w| w[:handle] == handle }&.fetch(:browser)
       end
 
+      # Same, but for the operations that ADDRESS a window rather than probe for one: a closed or
+      # unknown handle is Capybara's `WindowError`, never a silent fall back to the current window.
+      def window_browser!(handle)
+        window_browser(handle) or raise Capybara::WindowError, "Unknown window handle: #{handle}"
+      end
+
       # Open (or, by `name`, reuse) an auxiliary window. `target="_blank"`
       # clicks and `window.open` both land here. A non-empty `name` that
       # matches an existing window navigates that window instead of opening a
@@ -425,7 +443,7 @@ module Capybara
 
       # `window.open(url, name)` from the `opener` window's JS. Resolves the URL
       # against the opener's document and records the opener relationship.
-      def open_window_from_js(opener_browser, url, name, opener_realm_id = 0)
+      def open_window_from_js(opener_browser, url, name, opener_realm_id = 0, about_base = nil, about_origin = nil)
         resolved = url.to_s.empty? ? nil : opener_browser.resolve_document_url(url)
         # Opening a blob: URL whose storage partition differs from the opener's
         # top-level site is forced NOOPENER (cross-partition-navigation): the new
@@ -441,7 +459,7 @@ module Capybara
         # cross-window scripting/adoption need no cross-isolate RPC. The opener's realm
         # id wires the popup's window.opener. Falls through to the separate-VM aux path
         # (cross-origin, or a URL we don't yet realm-load).
-        if (rid = opener_browser.open_window_realm(resolved, name: name, opener_realm_id: opener_realm_id))
+        if (rid = opener_browser.open_window_realm(resolved, name: name, opener_realm_id: opener_realm_id, about_base: about_base, about_origin: about_origin))
           return rid
         end
         open_aux_window(resolved, name: name, opener_handle: handle_for(opener_browser), source: opener_browser)
@@ -634,7 +652,14 @@ module Capybara
       def open_new_window(_kind = :tab)
         open_aux_window('about:blank')
       end
-      def window_size(_)           = [current_browser.viewport_width, current_browser.viewport_height]
+      # Every window has its own viewport, so these address the window the
+      # handle names — not the active one. `Capybara::Window#resize_to` on a
+      # background window must resize THAT window and leave the current one
+      # (and Capybara's idea of which window is current) alone.
+      def window_size(handle)
+        b = window_browser!(handle)
+        [b.viewport_width, b.viewport_height]
+      end
       def close_window(h)
         return if h == PRIMARY_HANDLE
         @aux_windows.reject! {|w|
@@ -655,19 +680,23 @@ module Capybara
         end
       end
       def switch_to_window(h)
-        if h == PRIMARY_HANDLE
-          @active_handle = nil
-        elsif @aux_windows.any? {|w| w[:handle] == h }
-          @active_handle = h
-        else
-          raise Capybara::WindowError, "Unknown window handle: #{h}"
-        end
+        window_browser!(h)   # unknown / already-closed handle → WindowError
+        @active_handle = (h == PRIMARY_HANDLE ? nil : h)
       end
-      def resize_window_to(_, w, h) = current_browser.set_viewport(w, h)
+      def resize_window_to(handle, w, h) = window_browser!(handle).set_viewport(w, h)
       # Forem's ahoy-tracking spec calls `driver.resize(w, h)` directly
       # rather than through `current_window.resize_to`.
       def resize(w, h) = current_browser.set_viewport(w, h)
-      def maximize_window(_)       ; nil ; end
+      # Both restore the window to the display it lives on (`Browser#screen_size`), which is where
+      # it started — so they undo a `resize_to` rather than doing nothing. Coarse: we model no
+      # window chrome, so a maximized window and a fullscreen one end up the same size (a real
+      # browser's fullscreen is taller by the chrome it hides).
+      def maximize_window(handle)   = restore_window_size(handle)
+      def fullscreen_window(handle) = restore_window_size(handle)
+      private def restore_window_size(handle)
+        b = window_browser!(handle)
+        b.set_viewport(*b.screen_size)
+      end
 
       def evaluate_script(script, *args)
         unwrap(current_browser.evaluate_script(script, args))