testcentricity_web 4.3.0 → 4.4.0

data/lib/testcentricity_web/web_elements/video.rb

@@ -1,44 +1,46 @@
 module TestCentricity
-  class Video < Media
-    def initialize(name, parent, locator, context)
-      super
-      @type = :video
-    end
+  module Elements
+    class Video < Media
+      def initialize(name, parent, locator, context)
+        super
+        @type = :video
+      end
 
-    # Return video Height property
-    #
-    # @return [Integer] video height
-    # @example
-    #   height = video_player.video_height
-    #
-    def video_height
-      obj, = find_element
-      object_not_found_exception(obj, :video)
-      obj.native.attribute('videoHeight').to_i
-    end
+      # Return video Height property
+      #
+      # @return [Integer] video height
+      # @example
+      #   height = video_player.video_height
+      #
+      def video_height
+        obj, = find_element
+        object_not_found_exception(obj, :video)
+        obj.native.attribute('videoHeight').to_i
+      end
 
-    # Return video Width property
-    #
-    # @return [Integer] video width
-    # @example
-    #   width = video_player.video_width
-    #
-    def video_width
-      obj, = find_element
-      object_not_found_exception(obj, :video)
-      obj.native.attribute('videoWidth').to_i
-    end
+      # Return video Width property
+      #
+      # @return [Integer] video width
+      # @example
+      #   width = video_player.video_width
+      #
+      def video_width
+        obj, = find_element
+        object_not_found_exception(obj, :video)
+        obj.native.attribute('videoWidth').to_i
+      end
 
-    # Return video poster property
-    #
-    # @return poster value
-    # @example
-    #   poster = video_player.poster
-    #
-    def poster
-      obj, = find_element
-      object_not_found_exception(obj, :video)
-      obj.native.attribute('poster')
+      # Return video poster property
+      #
+      # @return poster value
+      # @example
+      #   poster = video_player.poster
+      #
+      def poster
+        obj, = find_element
+        object_not_found_exception(obj, :video)
+        obj.native.attribute('poster')
+      end
     end
   end
 end

data/lib/testcentricity_web/world_extensions.rb

@@ -8,8 +8,21 @@ module WorldData
     # return if data objects have already been instantiated and registered
     return if TestCentricity::DataManager.loaded?
 
-    # register and instantiate all data objects
-    eval(TestCentricity::DataManager.register_data_objects(data_objects))
+    # instantiate all data objects
+    @data = {}
+    data_objects.each do |data_type, data_class|
+      @data[data_type] = data_class.new unless @data.has_key?(data_type)
+      # define data object accessor method
+      define_method(data_type) do
+        if instance_variable_defined?(:"@#{data_type}")
+          instance_variable_get(:"@#{data_type}")
+        else
+          instance_variable_set(:"@#{data_type}", TestCentricity::DataManager.find_data_object(data_type))
+        end
+      end
+    end
+    # register all data objects with DataManager
+    TestCentricity::DataManager.register_data_objects(@data)
   end
 end
 
@@ -20,7 +33,27 @@ module WorldPages
     # return if page objects have already been instantiated and registered
     return if TestCentricity::PageManager.loaded?
 
-    # register and instantiate all page objects
-    eval(TestCentricity::PageManager.register_page_objects(page_objects))
+    # instantiate all page objects
+    @pages = {}
+    page_objects.each do |page_object, page_class|
+      obj = page_class.new
+      @pages[page_object] = obj unless @pages.has_key?(page_object)
+      page_names = obj.page_name
+      page_names = Array(page_names) if page_names.is_a? String
+      page_names.each do |name|
+        page_key = name.gsub(/\s+/, '').downcase.to_sym
+        @pages[page_key] = obj unless @pages.has_key?(page_key)
+      end
+      # define page object accessor method
+      define_method(page_object) do
+        if instance_variable_defined?(:"@#{page_object}")
+          instance_variable_get(:"@#{page_object}")
+        else
+          instance_variable_set(:"@#{page_object}", TestCentricity::PageManager.find_page(page_object))
+        end
+      end
+    end
+    # register all page objects with PageManager
+    TestCentricity::PageManager.register_page_objects(@pages)
   end
 end

data/lib/testcentricity_web.rb

@@ -18,7 +18,7 @@ require 'testcentricity_web/data_objects/data_objects_helper'
 require 'testcentricity_web/data_objects/environment'
 require 'testcentricity_web/data_objects/excel_helper'
 
-require 'testcentricity_web/web_elements/ui_elements_helper'
+require 'testcentricity_web/web_elements/ui_element'
 require 'testcentricity_web/web_elements/button'
 require 'testcentricity_web/web_elements/checkbox'
 require 'testcentricity_web/web_elements/file_field'
@@ -43,21 +43,7 @@ module TestCentricity
     @page_objects = {}
 
     def self.register_page_objects(pages)
-      result = ''
-      pages.each do |page_object, page_class|
-        obj = page_class.new
-        @page_objects[page_object] = obj unless @page_objects.has_key?(page_object)
-        page_names = obj.page_name
-        page_names = Array(page_names) if page_names.is_a? String
-        page_names.each do |name|
-          page_key = name.gsub(/\s+/, '').downcase.to_sym
-          if page_key != page_object
-            @page_objects[page_key] = obj unless @page_objects.has_key?(page_key)
-          end
-          result = "#{result}def #{page_object};@#{page_object} ||= TestCentricity::PageManager.find_page(:#{page_object});end;"
-        end
-      end
-      result
+      @page_objects = pages
     end
 
     # Have all PageObjects been registered?
@@ -71,7 +57,7 @@ module TestCentricity
     end
 
     def self.find_page(page_name)
-      (page_name.is_a? String) ? page_id = page_name.gsub(/\s+/, '').downcase.to_sym : page_id = page_name
+      page_id = (page_name.is_a? String) ? page_name.gsub(/\s+/, '').downcase.to_sym : page_name
       page = @page_objects[page_id]
       raise "No page object defined for page named '#{page_name}'" unless page
       page
@@ -103,12 +89,7 @@ module TestCentricity
     @data_objects = {}
 
     def self.register_data_objects(data)
-      result = ''
-      data.each do |data_type, data_class|
-        @data_objects[data_type] = data_class.new unless @data_objects.has_key?(data_type)
-        result = "#{result}def #{data_type};@#{data_type} ||= TestCentricity::DataManager.find_data_object(:#{data_type});end;"
-      end
-      result
+      @data_objects = data
     end
 
     def self.find_data_object(data_object)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: appium_capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 8.0.0
-- !ruby/object:Gem::Dependency
-  name: cuke_modeler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 9.1.0
 - !ruby/object:Gem::Dependency
   name: docker-compose
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +154,16 @@ dependencies:
   name: appium_lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: browserstack-local
   requirement: !ruby/object:Gem::Requirement
@@ -210,22 +182,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.37.1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 3.39.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.37.1
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 3.39.2
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -300,22 +266,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.14.0
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
@@ -358,28 +318,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 description: |2-
 
       The TestCentricity™ Web core framework for desktop and mobile web browser-based app testing implements a Page Object
-      Model DSL for use with Cucumber, Capybara, and Selenium-Webdriver v4.x. The gem also facilitates the configuration of
-      the appropriate Selenium-Webdriver capabilities required to establish a connection with locally hosted desktop browsers,
+      Model DSL for use with Cucumber or RSpec, and Selenium-Webdriver v4.14. The gem also facilitates the configuration of
+      the appropriate Selenium-Webdriver capabilities required to establish connections to locally hosted desktop browsers,
       locally hosted emulated mobile browsers (iOS, Android, etc.) running within a local instance of Chrome, mobile Safari
-      browsers on iOS device simulators or physical iOS devices, mobile Chrome or Android browsers on Android Studio virtual
-      device emulators, or cloud hosted desktop or mobile web browsers (using BrowserStack, Sauce Labs, TestingBot, or
+      browsers on iOS device simulators or physical iOS devices, mobile Chrome browsers on Android Studio virtual device
+      emulators, or cloud hosted desktop or mobile web browsers (using BrowserStack, Sauce Labs, TestingBot, or
       LambdaTest services).
 email:
 - testcentricity@gmail.com
@@ -420,7 +366,7 @@ files:
 - lib/testcentricity_web/web_elements/select_list.rb
 - lib/testcentricity_web/web_elements/table.rb
 - lib/testcentricity_web/web_elements/textfield.rb
-- lib/testcentricity_web/web_elements/ui_elements_helper.rb
+- lib/testcentricity_web/web_elements/ui_element.rb
 - lib/testcentricity_web/web_elements/video.rb
 - lib/testcentricity_web/world_extensions.rb
 homepage: https://github.com/TestCentricity/testcentricity_web
@@ -428,6 +374,8 @@ licenses:
 - BSD-3-Clause
 metadata:
   changelog_uri: https://github.com/TestCentricity/testcentricity_web/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/TestCentricity/testcentricity_web/issues
+  wiki_uri: https://github.com/TestCentricity/testcentricity_web/wiki
   documentation_uri: https://www.rubydoc.info/gems/testcentricity_web
 post_install_message:
 rdoc_options: []
@@ -437,7 +385,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.5
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -445,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Capybara, Selenium-WebDriver
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Page Object Model Framework for desktop and mobile web testing