capybara-experience 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f9abbe2b8c449fd5757456f39cf7c376adbf1fb456ed462cb452adf4cb5aa6
-  data.tar.gz: 4a8c6b7d01a40beaa5653a46693272239dfbb826f7403c8ff16549bf0a3ed6d3
+  metadata.gz: fa23c291ab266996334e99319fcfd89632d9aed1ebe672841f6a1fcbf9a1f4bf
+  data.tar.gz: 3ef627697145e07f4a780ae21b9ff85d1d2c57d824cdf93e15f7c921bd756779
 SHA512:
-  metadata.gz: 3889ec278546633b65a980942773fec6c0f5517812328ed687eeff7056774ada49f3e9fe96f460b18df380c512eb30fdf171bbf87500358887887e6621efb8e4
-  data.tar.gz: d950c605b5aa346db94b184a56d39f5c12b8f97c6f594a5a2fe2f3a8059fc2588bd7e970d090871b950ee8e06128aea9b341e24ff9de09d8bb260df8ba3c1ee4
+  metadata.gz: 2b10d6314a8a1d958b3d9e195abca3084cde7daeb8c48010765ee052f3d52191eb9166bee74f4d419bd1a4f21eb34fb6b2a82da1a1a35c55ff9dcd1ff1fc0ac8
+  data.tar.gz: dacf0ca724bae746890fd5c9a7a3a4a2e3503500644878c05b8965af00b34c9e062ade9f8379ea83cfc2fe17c557c5822c6acc6ff5af6d945e4ca3b3e8b0bca6

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+Gemfile.lock

data/capybara-experience.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+
+  spec.add_runtime_dependency "capybara", "~> 3.0"
 end

data/lib/capybara/experience/pool.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+require "singleton"
+
+module Capybara
+  class Experience
+    class Pool < Hash
+      include Singleton
+
+      def [](key)
+        super(key) || begin
+          driver, _session_name, app_object_id = key.split(":")
+          take(driver: driver, app_object_id: app_object_id, key: key)
+        end
+      end
+
+      def take(driver: Capybara.current_driver, app_object_id: Capybara.app.object_id, key: nil)
+        session = idle.find { |s| s.mode == driver && s.app.object_id == app_object_id }
+        if session
+          idle.delete(session)
+          self[key] = delete(session_key(session)) if key
+        else
+          session = ::Capybara::Session.new(driver.to_sym, Capybara.app)
+          key ||= session_key(session)
+          self[key] = session
+        end
+
+        session
+      end
+
+      def idle
+        @idle ||= []
+      end
+
+      def taken
+        values - idle
+      end
+
+      def reset_idle!
+        each do |key, session|
+          self[session_key(session)] = delete[key]
+        end
+        @idle = values
+
+        nil
+      end
+
+      private
+
+      def session_key(session)
+        "#{session.mode}:#{session.object_id}:#{session.app.object_id}"
+      end
+    end
+  end
+end

data/lib/capybara/experience/rspec.rb

@@ -29,6 +29,9 @@ module Capybara
 
     RSpec.configure do |config|
       config.include BehaviorDSL
+      config.prepend_after :each, type: :feature, js: true do
+        Capybara::Experience::Pool.instance.reset_idle!
+      end
     end
   end
 end

data/lib/capybara/experience/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   class Experience
-    VERSION = "0.2"
+    VERSION = "0.3"
   end
 end

data/lib/capybara/experience.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require "capybara/dsl"
-require "capybara/experience/session"
+require "capybara/experience/pool"
 
 module Capybara
   class Experience
@@ -23,28 +23,35 @@ module Capybara
     delegate :driver, to: :page
 
     def page
-      @page ||= Experience::Session.next(driver: driver_name)
+      @page ||= Experience::Pool.instance.take(driver: driver_name)
+
+      Capybara::Screenshot.final_session_name = @page.object_id if defined?(Capybara::Screenshot)
+
+      @page
     end
 
     def self.wait_for_pending_requests
-      Experience::Session.pool.taken.each do |session|
+      Experience::Pool.taken.each do |session|
         session.server.try(:wait_for_pending_requests)
       end
     end
 
-    def save_and_open_screenshot_full(path = nil, options = {})
-      save_and_open_screenshot(path, options.merge(full: true))
-    end
+    class Error < StandardError; end
 
-    def click_with_js(element)
-      xpath = element.path
-      execute_script <<~JS
-        document.evaluate('#{xpath}', document, null, XPathResult.ANY_TYPE, null)
-          .iterateNext()
-          .click()
-      JS
-    end
+    module UnifySessionPool
+      def page
+        Capybara::Screenshot.final_session_name = Capybara.session_name if defined?(Capybara::Screenshot)
 
-    class Error < StandardError; end
+        super
+      end
+
+      private
+
+      def session_pool
+        @session_pool ||= Experience::Pool.instance
+      end
+    end
   end
+
+  singleton_class.prepend Experience::UnifySessionPool
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-experience
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Ryan Ong
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Abstractions for Capybara to manage multiple user sessions, encapsulate
   shared test behavior, and semantically contextualize test code.
 email:
@@ -73,8 +87,8 @@ files:
 - capybara-experience.gemspec
 - lib/capybara-experience.rb
 - lib/capybara/experience.rb
+- lib/capybara/experience/pool.rb
 - lib/capybara/experience/rspec.rb
-- lib/capybara/experience/session.rb
 - lib/capybara/experience/version.rb
 homepage: https://github.com/ryanong/capybara-experience
 licenses: []

data/lib/capybara/experience/session.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-module Capybara
-  class Experience
-    module Session
-      class << self
-        def next(driver:)
-          pool.next(driver)
-        end
-
-        def create(driver)
-          ::Capybara::Session.new(driver, Capybara.app)
-        end
-
-        def pool
-          @pool ||= Pool.new
-        end
-      end
-
-      class Pool
-        attr_accessor :idle, :taken
-
-        def initialize
-          @idle = []
-          @taken = []
-        end
-
-        def next(driver)
-          take_idle(driver) || create(driver)
-        end
-
-        def release
-          taken.each(&:reset!)
-          idle.concat(taken)
-          taken.clear
-        end
-
-        private
-
-        def take_idle(driver)
-          idle.find { |s| s.mode == driver }.tap do |session|
-            if session
-              idle.delete(session)
-              taken.push(session)
-            end
-          end
-        end
-
-        def create(driver)
-          ::Capybara::Experience::Session.create(driver).tap do |session|
-            taken.push(session)
-          end
-        end
-      end
-    end
-  end
-end