ae_page_objects 0.4.1 → 0.5.1

data/lib/ae_page_objects.rb

@@ -23,6 +23,7 @@ module AePageObjects
     autoload :Visitable,        'ae_page_objects/concerns/visitable'
   end
   
+  autoload :Window,            'ae_page_objects/window'
   autoload :Node,              'ae_page_objects/node'
   autoload :Document,          'ae_page_objects/document'
   autoload :Element,           'ae_page_objects/element'

data/lib/ae_page_objects/document.rb

@@ -1,11 +1,16 @@
 module AePageObjects
   class Document < Node
     include Concerns::Visitable
+
+    attr_reader :window
     
     def initialize
       super(Capybara.current_session)
-    end
 
+      @window = Window.current
+      @window.current_document = self
+    end
+    
     def document
       self
     end

data/lib/ae_page_objects/element.rb

@@ -96,7 +96,7 @@ module AePageObjects
       if @locator
         locator = eval_locator(@locator)
         if ! locator.empty?
-          return parent.find(*locator)
+          return parent.node.find(*locator)
         end
       end
       

data/lib/ae_page_objects/elements/collection.rb

@@ -1,9 +1,15 @@
 module AePageObjects
   class Collection < Element
+    include Enumerable
+
     class << self
       attr_accessor :item_class
 
-    private
+      def default_item_locator
+        @default_item_locator ||= [:xpath, ".//*"]
+      end
+
+      private
       def inherited(subclass)
         subclass.item_class = self.item_class
       end
@@ -15,11 +21,15 @@ module AePageObjects
       self.class.item_class
     end
 
+    def item_xpath
+      @item_xpath ||= Capybara::Selector.normalize(*eval_locator(@item_locator)).xpaths.first
+    end
+
     def at(index, &block)
       if index >= size || index < 0
         nil
       else
-        self.item_class.new(self, :name => index, :locator => [:xpath, "#{row_xpath}[#{index + 1}]"], &block)
+        item_at(index, &block)
       end
     end
 
@@ -33,43 +43,32 @@ module AePageObjects
       end
     end
 
-    def all
-      [].tap do |all|
-        self.each { |item| all << item }
-      end
-    end
-    
     def size
-      node.all(:xpath, row_xpath).size
-    end
-    
-    def first(&block)
-      self.at(0, &block)
+      node.all(:xpath, item_xpath).size
     end
 
     def last(&block)
       self.at(size - 1, &block)
     end
-    
-    def add_more(&block)
-      append
-      last(&block)
-    end
 
-    def row_xpath
-      @row_xpath || ".//*[contains(@class, 'item-list')]//*[contains(@class,'row') and not(contains(@style,'display'))]"
-    end
-    
-  protected
+  private
   
     def configure(options)
       super
       
-      @row_xpath = options.delete(:row_xpath)
+      @item_locator = options.delete(:item_locator) || self.class.default_item_locator
     end
-  
-    def append
-      node.find('.js-add-item').click
+
+    def item_at(index, &block)
+      ElementProxy.new(item_class_at(index), self, :name => index, :locator => item_locator_at(index), &block)
+    end
+
+    def item_class_at(index)
+      item_class
+    end
+
+    def item_locator_at(index)
+      [:xpath, "#{item_xpath}[#{index + 1}]"]
     end
   end
 end

data/lib/ae_page_objects/util/singleton.rb

@@ -1,5 +1,6 @@
 module AePageObjects
   module Singleton
+
     def instance
       @instance ||= new
     end

data/lib/ae_page_objects/version.rb

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

data/lib/ae_page_objects/window.rb

@@ -0,0 +1,126 @@
+module AePageObjects
+  class Window
+
+    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 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
+
+      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
+
+        # 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
+
+        find(current_handle) if current_handle
+      end
+
+      def create(handle)
+        new(registry, handle)
+      end
+    end
+
+    attr_reader :current_document, :handle
+
+    def initialize(registry, handle)
+      @registry         = registry
+      @handle           = handle
+      @current_document = nil
+
+      @registry.add(self)
+    end
+
+    def current_document=(document)
+      @current_document.send(:stale!) if @current_document
+      @current_document = document
+    end
+
+    def switch_to
+      HandleManager.switch_to(handle)
+      current_document
+    end
+
+    def close
+      if HandleManager.close(@handle)
+        self.current_document = nil
+        @registry.remove(self)
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 1
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-19 00:00:00 Z
+date: 2013-10-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   name: capybara
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,54 +29,9 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  name: appraisal
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
-  requirement: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  name: mocha
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 13
-        - 3
-        version: 0.13.3
-  requirement: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  name: selenium-webdriver
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
   prerelease: false
+  type: :runtime
+  requirement: *id001
 description: Capybara Page Objects pattern
 email: 
 - engineering@appfolio.com
@@ -113,6 +67,7 @@ files:
 - lib/ae_page_objects/util/internal_helpers.rb
 - lib/ae_page_objects/util/singleton.rb
 - lib/ae_page_objects/version.rb
+- lib/ae_page_objects/window.rb
 homepage: http://github.com/appfolio/ae_page_objects
 licenses: 
 - MIT