site_prism 3.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9eaed0d98cdcffc5d23f9c8cadf03b5cb343a5f8e65b7f9d96334442112c115
-  data.tar.gz: 5286b415093777314940312fff696f080b980eefdb4f9d9f4134559da56155ea
+  metadata.gz: 484d33816dfd3b61f4ebd4c4e0b96418877c84730b3d5edacc214895c17ac565
+  data.tar.gz: 3c18ff1ba0590d025eea607b46bb44d733f67669d53fd5cc535491cc85e5eae1
 SHA512:
-  metadata.gz: 889e8c4aad04e3ba37d2742cdaeae1234a1665297c2fd295495fedf91eeefc7b0e21a118a63c4b86a7d2492a07685b92cf39792b6bc781a3e5e82b03720090ae
-  data.tar.gz: 828b1e6e1693c506dc082babb9bc51049a28d32aa04ea37483f8a2d89cde8e63a6392b0f4b85b52d33d22b084234d6b3ecb81e3941e6b4e7a4fe688c5469285c
+  metadata.gz: 55df767a6fe3d3a2234c94d69c496396bcab8fd095177e780d2c16bc30ad8f08d5339e0e02a9f65be3d46c58b8d16718c56c52b9482db515ef5084dcef17dbd4
+  data.tar.gz: 1bc2a80d5bb5926d4db0c209a14a6c368266329eb26e5ab8ddb17de7fbfbcb265f80b01edbdb9ded18e8d8a14f2ced7731f5cb1404c4fade0bda3aee9d2959d9

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2018, Nathaniel Ritmeyer & the Site Prism team
+Copyright (c) 2011-2019, Nathaniel Ritmeyer & the SitePrism team
 
 All rights reserved.
 

data/README.md

@@ -32,7 +32,7 @@ Here's an overview of how SitePrism is designed to be used:
 
 class Home < SitePrism::Page
   set_url '/index.htm'
-  set_url_matcher /google.com\/?/
+  set_url_matcher(/google.com\/?/)
 
   element :search_field, 'input[name="q"]'
   element :search_button, 'button[name="btnK"]'
@@ -41,7 +41,7 @@ class Home < SitePrism::Page
 end
 
 class SearchResults < SitePrism::Page
-  set_url_matcher /google.com\/results\?.*/
+  set_url_matcher(/google.com\/results\?.*/)
 
   section :menu, MenuSection, '#gbx3'
   sections :search_results, SearchResultSection, '#results li'
@@ -72,7 +72,7 @@ When(/^I navigate to the google home page$/) do
 end
 
 Then(/^the home page should contain the menu and the search form$/) do
-  @home.wait_for_menu # menu loads after a second or 2, give it time to arrive
+  @home.wait_until_menu_visible # menu loads after a second or 2, give it time to arrive
   expect(@home).to have_menu
   expect(@home).to have_search_field
   expect(@home).to have_search_button
@@ -89,7 +89,7 @@ Then(/^the search results page is displayed$/) do
 end
 
 Then(/^the search results page contains 10 individual search results$/) do
-  @results_page.wait_for_search_results
+  @results_page.wait_until_search_results_visible
   expect(@results_page).to have_search_results(count: 10)
 end
 
@@ -318,7 +318,7 @@ URL matchers by it by calling `set_url_matcher`:
 
 ```ruby
 class Account < SitePrism::Page
-  set_url_matcher %r{/accounts/\d+}
+  set_url_matcher(/accounts/\d+/)
 end
 ```
 
@@ -858,7 +858,7 @@ end
 @home.menu.search.click #=> clicks the search link in the home page menu
 @home.menu.search['href'] #=> returns the value for the href attribute of the capybara element representing the search link
 @home.menu.has_images? #=> returns true or false based on whether the link is present in the section on the page
-@home.menu.wait_for_images #=> waits for capybara's default wait time until the element appears in the page section
+@home.menu.wait_until_images_visible #=> waits for capybara's default wait time until the element is visible in the page section
 
 ```
 

data/lib/site_prism/element_checker.rb

@@ -3,7 +3,7 @@
 module SitePrism
   module ElementChecker
     def all_there?
-      elements_to_check.all? { |element| there?(element) }
+      elements_to_check.all? { |item_name| there?(item_name) }
     end
 
     def elements_present
@@ -13,21 +13,28 @@ module SitePrism
     private
 
     def elements_to_check
-      if self.class.expected_items
-        mapped_items.select { |el| self.class.expected_items.include?(el) }
+      if expected_items
+        SitePrism.logger.debug('Expected Items has been set.')
+        mapped_items.select { |item_name| expected_items.include?(item_name) }
       else
         mapped_items
       end
     end
 
     def mapped_items
-      return unless self.class.mapped_items
+      mapped_items_list.map(&:values).flatten
+    end
 
+    def mapped_items_list
       self.class.mapped_items.uniq
     end
 
-    def there?(element)
-      send("has_#{element}?")
+    def expected_items
+      self.class.expected_items
+    end
+
+    def there?(item_name)
+      send("has_#{item_name}?")
     end
   end
 end

data/lib/site_prism/element_container.rb

@@ -58,10 +58,10 @@ module SitePrism
 
     # rubocop:disable Metrics/ModuleLength
     module ClassMethods
-      attr_reader :mapped_items, :expected_items
+      attr_reader :expected_items
 
       def element(name, *find_args)
-        build(name, *find_args) do
+        build(:element, name, *find_args) do
           define_method(name) do |*runtime_args, &element_block|
             raise_if_block(self, name, !element_block.nil?, :element)
             _find(*merge_args(find_args, runtime_args))
@@ -70,7 +70,7 @@ module SitePrism
       end
 
       def elements(name, *find_args)
-        build(name, *find_args) do
+        build(:elements, name, *find_args) do
           define_method(name) do |*runtime_args, &element_block|
             raise_if_block(self, name, !element_block.nil?, :elements)
             _all(*merge_args(find_args, runtime_args))
@@ -84,7 +84,7 @@ module SitePrism
 
       def section(name, *args, &block)
         section_class, find_args = extract_section_options(args, &block)
-        build(name, *find_args) do
+        build(:section, name, *find_args) do
           define_method(name) do |*runtime_args, &runtime_block|
             section_element = _find(*merge_args(find_args, runtime_args))
             section_class.new(self, section_element, &runtime_block)
@@ -94,7 +94,7 @@ module SitePrism
 
       def sections(name, *args, &block)
         section_class, find_args = extract_section_options(args, &block)
-        build(name, *find_args) do
+        build(:sections, name, *find_args) do
           define_method(name) do |*runtime_args, &element_block|
             raise_if_block(self, name, !element_block.nil?, :sections)
             _all(*merge_args(find_args, runtime_args)).map do |element|
@@ -107,7 +107,7 @@ module SitePrism
       def iframe(name, klass, *args)
         element_find_args = deduce_iframe_element_find_args(args)
         scope_find_args = deduce_iframe_scope_find_args(args)
-        add_to_mapped_items(name)
+        map_item!(:iframe, name)
         add_iframe_helper_methods(name, *element_find_args)
         define_method(name) do |&block|
           raise MissingBlockError unless block
@@ -118,23 +118,26 @@ module SitePrism
         end
       end
 
-      def add_to_mapped_items(item)
+      def mapped_items
         @mapped_items ||= []
-        @mapped_items << item
       end
 
       private
 
-      def build(name, *find_args)
+      def build(type, name, *find_args)
         if find_args.empty?
           create_error_method(name)
         else
-          add_to_mapped_items(name)
+          map_item!(type, name)
           yield
         end
         add_helper_methods(name, *find_args)
       end
 
+      def map_item!(type, name)
+        mapped_items << { type => name }
+      end
+
       def add_helper_methods(name, *find_args)
         create_existence_checker(name, *find_args)
         create_nonexistence_checker(name, *find_args)
@@ -200,7 +203,7 @@ module SitePrism
       end
 
       def create_error_method(name)
-        SitePrism.logger.debug("#{name} has come from an item with 0 locators.")
+        SitePrism.logger.error("#{name} has come from an item with 0 locators.")
 
         define_method(name) do
           raise SitePrism::InvalidElementError

data/lib/site_prism/page.rb

@@ -21,7 +21,7 @@ module SitePrism
       end
 
       def url_matcher
-        @url_matcher || url
+        @url_matcher ||= url
       end
     end
 
@@ -31,7 +31,7 @@ module SitePrism
     # in order, with the default "displayed?" validation being ran _FIRST_
 
     def page
-      @page || Capybara.current_session
+      @page ||= Capybara.current_session
     end
 
     # Loads the page.

data/lib/site_prism/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SitePrism
-  VERSION = '3.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/lib/site_prism/waiter.rb

@@ -8,6 +8,7 @@ module SitePrism
       loop do
         return true if yield
         break if Time.now - start_time > wait_time
+
         sleep(0.05)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_prism
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: 3.0.1
 platform: ruby
 authors:
 - Nat Ritmeyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -31,7 +31,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.18'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -41,7 +41,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.18'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -79,56 +79,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A Page Object Model DSL for Capybara