ae_page_objects 0.4.1.dt3 → 0.4.1.dt4

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '0.4.1.dt3'.freeze
+  VERSION = '0.4.1.dt4'.freeze
 end

data/lib/ae_page_objects/window.rb

@@ -1,33 +1,109 @@
 module AePageObjects
   class Window
-    class << self
-      def all
-        @all ||= {}
+
+    class Registry < Hash
+      def [](window_or_handle)
+        if window_or_handle.is_a?(Window)
+          super(window_or_handle.handle)
+        else
+          super(window_or_handle)
+        end
       end
 
-      def current
-        current_handle = Capybara.current_session.driver.browser.window_handle
+      def add(window)
+        self[window.handle] = window
+      end
+
+      def remove(window)
+        self.delete(window.handle)
+      end
+    end
+
+    class HandleManager
+      def self.all
+        browser.window_handles
+      end
 
-        window = all.keys.find do |window|
-          window.handle == current_handle
+      def self.current
+        # Accessing browser.window_handle tries to find an existing page, which will blow up
+        # if there isn't one. So... we look at the collection first as a guard.
+        if all.empty?
+          nil
+        else
+          browser.window_handle
         end
+      end
+
+      def self.switch_to(handle)
+        browser.switch_to.window(handle)
+      end
+
+      def self.browser
+        Capybara.current_session.driver.browser
+      end
+
+      def self.close(handle)
+        all_handles_before_close = all()
+        more_than_one_window     = (all_handles_before_close.size > 1)
+
+        # We must protect against closing the last window as doing so will quit the entire browser
+        # which would mess up subsequent tests.
+        # http://selenium.googlecode.com/git/docs/api/java/org/openqa/selenium/WebDriver.html#close()
+        return false unless more_than_one_window
+
+        current_handle_before_switch = current
+
+        # switch to the window to close
+        switch_to(handle)
+
+        browser.close
 
-        unless window
-          window = new(current_handle)
-          all[window] = window
+        # need to switch back to something. Use whatever was switched from originally unless we just
+        # closed that window, in which case just pick something else.
+        switch_to(current_handle_before_switch == handle ?  all.first : current_handle_before_switch)
+
+        true
+      end
+    end
+
+    class << self
+      def registry
+        @registry ||= Registry.new
+      end
+
+      def close_all
+        all.each(&:close)
+      end
+
+      def all
+        HandleManager.all.map do |handle|
+          find(handle)
         end
+      end
+
+      def find(handle)
+        registry[handle] || create(handle)
+      end
+
+      def current
+        current_handle = HandleManager.current
 
-        window
+        find(current_handle) if current_handle
+      end
+
+      def create(handle)
+        new(registry, handle)
       end
     end
 
     attr_reader :current_document, :handle
 
-    def initialize(handle)
-      @handle = handle
+    def initialize(registry, handle)
+      @registry         = registry
+      @handle           = handle
       @current_document = nil
 
-      self.class.all[self] = self
+      @registry.add(self)
     end
 
     def current_document=(document)
@@ -36,16 +112,15 @@ module AePageObjects
     end
 
     def switch_to
-      Capybara.current_session.driver.browser.switch_to.window(handle)
+      HandleManager.switch_to(handle)
       current_document
     end
 
     def close
-      self.current_document = nil
-
-      Capybara.current_session.execute_script("window.close();")
-
-      self.class.all.delete(self)
+      if HandleManager.close(@handle)
+        self.current_document = nil
+        @registry.remove(self)
+      end
     end
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: 4196270005
+  hash: -4200723772
   prerelease: 6
   segments: 
   - 0
   - 4
   - 1
   - dt
-  - 3
-  version: 0.4.1.dt3
+  - 4
+  version: 0.4.1.dt4
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -20,7 +20,6 @@ cert_chain: []
 date: 2013-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   name: capybara
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,10 +31,10 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id001
   prerelease: false
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
   name: appraisal
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,10 +47,10 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: mocha
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -64,10 +63,10 @@ dependencies:
         - 13
         - 3
         version: 0.13.3
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: selenium-webdriver
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,8 +77,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   prerelease: false
+  type: :development
+  requirement: *id004
 description: Capybara Page Objects pattern
 email: 
 - engineering@appfolio.com