testcentricity_web 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d93f63b0f93fc833deb465d8588ef93e30db5b171929da48ef8e4449450b8c7a
-  data.tar.gz: 1a73bbf1521c29b0b80ca2163461795cb24e24f65107c671b5aa581b17c55d20
+  metadata.gz: 8fdb6f0dda3633c2c5419bf6477bb60131814db02ece30fba81ca20dc0738a26
+  data.tar.gz: 7503ad522b8bcaa9e1befd791ca3d7ef6ca13728963e0a8a1d4ef11b93973c02
 SHA512:
-  metadata.gz: a250df9034b5246bc99bc9f395d8b461405a5900302814069afd1a50528bc773ba3842e53ab1b2f85fd216522f0b758a533077bfa0ec360edc25570dc6bdd02c
-  data.tar.gz: 856f31ba5173274eaec57ac27806a3308e939245c43fc21d5a05e62a959aece056db237b2cb5fbc67275ee6ce1edfe44eb146a0c6d3c2da40339336aa101ceba
+  metadata.gz: bd7f80d554ff6f37988a9531d3be6a6ca5f9db61c77ba6acb3c49634cb8b0a87bf9952ccd1eb5dbbebfa56ce511193dcbdd462fc90d4b9ac27352d570f0a0cf7
+  data.tar.gz: a7c7249a9042a327208d275be92a42465322984afdba99df2ea3dd9e9755a9a6cb311486bf618d2c3fa5306ce38d42e6d79d4d81c0a71d677879c39749910baa

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 # CHANGELOG
 All notable changes to this project will be documented in this file.
 
+## [4.1.0] - 28-FEB-2022
+
+### Added
+* TestCentricity now supports and integrates with Selenium-Webdriver version 4.1.
+* Added support for locally hosted Microsoft Edge desktop web browsers, including in `headless` mode.
+* Added `CheckBox.define_custom_elements` and `Radio.define_custom_elements` methods to support abstracted UI implementations
+  where the `input type="checkbox"` or `input type="radio"` object is hidden or obscured by a proxy object, typically a `label`.
+* Added support for `shutdownOtherSimulators` and `forceSimulatorSoftwareKeyboardPresence` capabilities for iOS simulators
+  when testing with Mobile Safari browser on iOS Simulators.
+
+### Changed
+* `checkbox` and `radio` methods no longer accept an optional `proxy`. Calling the `checkbox` or `radio` methods with a `proxy`
+  parameter will result in a `wrong number of arguments (given 3, expected 2) (ArgumentError)` exception. Use the `define_custom_elements`
+  method to specify the locator for an associated `proxy` and/or `label` element. The `define_custom_elements` method can be
+  called from an `initialize` method for the `PageObject` or `PageSection` where the `checkbox` or `radio` is instantiated.
+* Ruby version 2.7 or greater required.
+
+
 ## [4.0.3] - 30-DEC-2021
 
 ### Changed
@@ -9,6 +27,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 * No longer throws a `NoMethodError: undefined method 'World' for main:Object` error when using RSpec.
 
+
 ## [4.0.0] - 18-APR-2021
 
 ### Changed
@@ -39,17 +58,20 @@ All notable changes to this project will be documented in this file.
   * `UIElement.invoke_siebel_popup`
   * `UIElement.get_siebel_object_type`
 
+
 ## [3.3.0] - 14-MAR-2021
 
 ### Fixed
 * `WebDriverConnect.initialize_web_driver` method now correctly sets local Chrome browser Download directory when running
 with headless Chrome.
 
+
 ## [3.2.25] - 11-MAR-2021
 
 ### Added
 * Added `String.titlecase` method.
 
+
 ## [3.2.23] - 11-FEB-2021
 
 ### Changed
@@ -57,35 +79,41 @@ with headless Chrome.
   `:translate_downcase`, `:translate_capitalize`, and `:translate_titlecase` conversions to fall back to `:en` default
   locale if translated strings are missing from the current locale specified in `I18n.locale`.
 
+
 ## [3.2.22] - 09-FEB-2021
 
 ### Fixed
 * Updated `PageObject.verify_ui_states` and `PageSection.verify_ui_states` methods to correctly handle `:translate_upcase`,
   `:translate_downcase`, `:translate_capitalize`, and `:translate_titlecase` conversions for Arrays of `String`.
   
+
 ## [3.2.21] - 04-FEB-2021
 
 ### Changed
 * `UIElement.hover_at` method now accepts an optional `visible` parameter to allow hovering over UI elements that are not
   visible.
 
+
 ## [3.2.20] - 21-JAN-2021
 
 ### Changed
 * `UIElement.hover` method now accepts an optional `visible` parameter to allow hovering over UI elements that are not
 visible.
 
+
 ## [3.2.19] - 05-JAN-2021
 
 ### Fixed
 * `SelectList.choose_option` and `SelectList.get_options` methods now wait up to 5 seconds for list drop menu to appear.
 
+
 ## [3.2.18] - 12-AUG-2020
 
 ### Fixed
 * Updated `PageObject.verify_ui_states` and `PageSection.verify_ui_states` methods to correctly handle `:row`, `:column`,
 `:cell`, `:item`, and `:attribute` properties.
 
+
 ## [3.2.17] - 19-JUNE-2020
 
 ### Changed
@@ -93,28 +121,33 @@ visible.
 * Updated `Table.get_row_count`, `Table.get_column_count`, and `Table.get_table_cell_locator` methods to support tables
 with row headers in row #1.
 
+
 ## [3.2.16] - 13-MAY-2020
 
 ### Changed
 * `WebDriverConnect.initialize_web_driver` method now sets local Chrome and Firefox browser Download directory to separate
 folders for each parallel test thread when using `parallel_tests` gem to run tests in concurrent threads.
 
+
 ## [3.2.15] - 06-APR-2020
 
 ### Fixed
 * `PageObject.populate_data_fields` and `PageSection.populate_data_fields` methods accept `String` or `Boolean` values
 for checkboxes and radio buttons.
 
+
 ## [3.2.14] - 06-APR-2020
 
 ### Added
 * Added `UIElement.scroll_to` method.
 
+
 ## [3.2.13] - 24-MAR-2020
 
 ### Added
 * Added `PageObject.send_keys` method.
 
+
 ## [3.2.12] - 11-MAR-2020
 
 ### Added
@@ -122,26 +155,31 @@ for checkboxes and radio buttons.
 * Updated `PageObject.verify_ui_states` and `PageSection.verify_ui_states` methods to support verification of the
 `focused` property.
 
+
 ## [3.2.11] - 10-MAR-2020
 
 ### Added
 * Added `PageSection.verify_focus_order` method.
 
+
 ## [3.2.10] - 09-MAR-2020
 
 ### Added
 * Added `PageObject.verify_focus_order` method.
 
+
 ## [3.2.9] - 12-FEB-2020
 
 ### Fixed
 * Fixed `UIElement.wait_until_value_is`, `List.wait_until_item_count_is`, and `Table.wait_until_row_count_is`' methods.
 
+
 ## [3.2.8] - 08-FEB-2020
 
 ### Fixed
 * Fixed `UIElement.visible?` method that was broken in release 3.2.7.
 
+
 ## [3.2.7] - 05-FEB-2020
 
 ### Added
@@ -151,11 +189,13 @@ for checkboxes and radio buttons.
 * Updated `PageObject.verify_ui_states` and `PageSection.verify_ui_states` methods to support verification of the
 `crossorigin`, `preload`, and `poster` properties.
 
+
 ## [3.2.6] - 31-JAN-2020
 
 ### Changed
 * `Audio.volume` and `Video.volume` methods now return a `Float`.
 
+
 ## [3.2.5] - 25-JAN-2020
 
 ### Added
@@ -166,11 +206,13 @@ for checkboxes and radio buttons.
 ### Fixed
 * Fixed `UIElement.aria_multiselectable?` method.
 
+
 ## [3.2.4] - 16-JAN-2020
 
 ### Added
 * Added `Range` type `UIElement` to support interaction with and verification of HTML5 Input Range Slider Objects.
 
+
 ## [3.2.3] - 29-DEC-2019
 
 ### Added
@@ -203,6 +245,7 @@ properties:
   * `aria_multiselectable`
   * `aria_controls`
 
+
 ## [3.2.2] - 16-OCT-2019
 
 ### Added
@@ -212,6 +255,7 @@ properties:
 * Updated `PageObject.verify_ui_states` and `PageSection.verify_ui_states` methods to support verification of `indeterminate` property.
 * Updated device profiles for iPad Pro 12.9" 3rd Generation (iOS 13.1) with Mobile Safari browser.
 
+
 ## [3.2.1] - 03-OCT-2019
 
 ### Changed

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021, Tony Mrozinski
+Copyright (c) 2014-2022, Tony Mrozinski
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -4,14 +4,14 @@
 
 
 The TestCentricity™ Web core generic framework for desktop and mobile web browser-based app testing implements a Page Object and Data
-Object Model DSL for use with Cucumber, Capybara (version 3.x), and Selenium-Webdriver (version 3.x).
+Object Model DSL for use with Cucumber, Capybara (version 3.x), and Selenium-Webdriver (version 4.1).
 
 **An example project that demonstrates the implementation of a page object model framework using Cucumber and TestCentricity™ can be found [here](https://github.com/TestCentricity/tc_web_sample).**
 
 The TestCentricity™ Web gem supports running automated tests against the following web test targets:
-* locally hosted desktop browsers (Firefox, Chrome, Safari, or IE)
+* locally hosted desktop browsers (Firefox, Chrome, Edge, Safari, or IE)
 * locally hosted emulated iOS Mobile Safari, Android, Windows Phone, or Blackberry mobile browsers (running within a local instance of Chrome)
-* locally hosted "headless" Chrome or Firefox browsers
+* locally hosted "headless" Chrome, Firefox, or Edge browsers
 * desktop and emulated mobile web browsers hosted on Selenium Grid and Dockerized Selenium Grid environments
 * mobile Safari browsers on iOS device simulators or physical iOS devices (using Appium and XCode on OS X)
 * mobile Chrome or Android browsers on Android Studio virtual device emulators (using Appium and Android Studio on OS X)
@@ -727,11 +727,11 @@ To use these **PageManager** methods, include the step definitions and code belo
 
 ## Connecting to a Web Browser
 
-The `TestCentricity::WebDriverConnect.initialize_web_driver` method configures the appropriate Selenium-Webdriver capabilities required to establish a
-connection with a target web browser, and sets the base host URL of the web site you are running your tests against.
+The `TestCentricity::WebDriverConnect.initialize_web_driver` method configures the appropriate Selenium-Webdriver capabilities required to
+establish a connection with a target web browser, and sets the base host URL of the web site you are running your tests against.
 
-The `TestCentricity::WebDriverConnect.initialize_web_driver` method accepts a single optional parameter - the base host URL. Cucumber **Environment
-Variables** are used to specify the target local or remote web browser, and the various webdriver capability parameters required to configure
+The `TestCentricity::WebDriverConnect.initialize_web_driver` method accepts a single optional parameter - the base host URL. Cucumber
+**Environment Variables** are used to specify the target local or remote web browser, and the various webdriver capability parameters required to configure
 the connection.
 
 
@@ -746,6 +746,8 @@ values from the table below:
 `chrome_headless`  | OS X or Windows (headless - no visible UI)
 `firefox`          | OS X or Windows (Firefox version 55 or greater only)
 `firefox_headless` | OS X or Windows (headless - no visible UI)
+`edge`             | OS X or Windows
+`edge_headless`    | OS X or Windows (headless - no visible UI)
 `safari`           | OS X only
 `ie`               | Windows only (IE version 10.x or greater only)
 
@@ -947,6 +949,8 @@ Once your test environment is properly configured, the following **Environment V
 `LANGUAGE`          | [Optional] Language to set for the simulator.  e.g.  `fr`
 `ORIENTATION`       | [Optional] Set to `portrait` or `landscape` (only for iOS simulators)
 `NEW_COMMAND_TIMEOUT` | [Optional] Time (in Seconds) that Appium will wait for a new command from the client
+`SHOW_SIM_KEYBOARD` | [Optional] Show the simulator keyboard during text entry. Set to `true` or `false`
+`SHUTDOWN_OTHER_SIMS`| [Optional] Close any other running simulators. Set to `true` or `false`
 
 
 ### Mobile Chrome or Android browsers on Android Studio Virtual Device emulators
@@ -989,7 +993,7 @@ Sauce Labs, TestingBot, Gridlastic, or LambdaTest services. If your tests are ru
 #### Remote desktop browsers on the BrowserStack service
 
 For remotely hosted desktop web browsers on the BrowserStack service, the following **Environment Variables** must be set as described in
-the table below. Refer to the [Browserstack-specific capabilities chart page](https://www.browserstack.com/automate/capabilities)
+the table below. Refer to the [Browserstack-specific capabilities chart page](https://www.browserstack.com/automate/capabilities?tag=selenium-4)
 for information regarding the specific capabilities.
 
 **Environment Variable** | **Description**
@@ -1003,15 +1007,13 @@ for information regarding the specific capabilities.
 `BS_VERSION`       | [Optional] Refer to `browser_version` capability in chart. If not specified, latest stable version of browser will be used.
 `TUNNELING`        | Must be `true` if you are testing against internal/local servers (`true` or `false`). If `true`, the BrowserStack Local instance will be automatically started.
 `RESOLUTION`       | [Optional] Refer to supported screen `resolution` capability in chart
-`BROWSER_SIZE`     | [Optional] Specify width, height of browser window
 `RECORD_VIDEO`     | [Optional] Enable screen video recording during test execution (`true` or `false`)
 `TIME_ZONE`        | [Optional] Specify custom time zone. Refer to `browserstack.timezone` capability in chart
 `IP_GEOLOCATION`   | [Optional] Specify IP Geolocation. Refer to [IP Geolocation](https://www.browserstack.com/ip-geolocation) to select a country code.
-`SELENIUM_VERSION` | [Optional] Specify Selenium WebDriver version to use
-`CONSOLE_LOGS`     | [Optional] Used to capture browser console logs. Refer to `browserstack.console` capability in chart
-`WD_VERSION`       | [Optional] Specify browser-specific WebDriver version to use. Refer to `browserstack.geckodriver`, `browserstack.ie.driver`, and `browserstack.safari.driver` capabilities in chart
 `ALLOW_POPUPS`     | [Optional] Allow popups (`true` or `false`) - for Safari, IE, and Edge browsers only
 `ALLOW_COOKIES`    | [Optional] Allow all cookies (`true` or `false`) - for Safari browsers only
+`SCREENSHOTS`      | [Optional] Generate screenshots for debugging (`true` or `false`)
+`NETWORK_LOGS`     | [Optional] Capture network logs (`true` or `false`)
 
 If the BrowserStack Local instance is running (`TUNNELING` Environment Variable is `true`), call the`TestCentricity::WebDriverConnect.close_tunnel` method
 upon completion of your test suite to stop the Local instance. Place the code shown below in your `env.rb` or `hooks.rb` file.
@@ -1025,7 +1027,7 @@ upon completion of your test suite to stop the Local instance. Place the code sh
 #### Remote mobile browsers on the BrowserStack service
 
 For remotely hosted mobile web browsers on the BrowserStack service, the following **Environment Variables** must be set as described in
-the table below. Refer to the [Browserstack-specific capabilities chart page](https://www.browserstack.com/automate/capabilities)
+the table below. Refer to the [Browserstack-specific capabilities chart page](https://www.browserstack.com/automate/capabilities?tag=selenium-4)
 for information regarding the specific capabilities.
 
 **Environment Variable** | **Description**
@@ -1034,8 +1036,7 @@ for information regarding the specific capabilities.
 `BS_USERNAME`    | Must be set to your BrowserStack account user name
 `BS_AUTHKEY`     | Must be set to your BrowserStack account access key
 `BS_OS`          | Must be set to `ios` or `android`
-`BS_BROWSER`     | Must be set to `iPhone`, `iPad`, or `android`
-`BS_PLATFORM`    | Must be set to `MAC` (for iOS) or `ANDROID`
+`BS_BROWSER`     | Must be set to `Safari` (for iOS) or `Chrome` (for Android)
 `BS_DEVICE`      | Refer to `device` capability in chart
 `BS_REAL_MOBILE` | Set to `true` if running against a real device
 `DEVICE_TYPE`    | Must be set to `phone` or `tablet`
@@ -1044,7 +1045,9 @@ for information regarding the specific capabilities.
 `RECORD_VIDEO`   | [Optional] Enable screen video recording during test execution (`true` or `false`)
 `TIME_ZONE`      | [Optional] Specify custom time zone. Refer to `browserstack.timezone` capability in chart
 `IP_GEOLOCATION` | [Optional] Specify IP Geolocation. Refer to [IP Geolocation](https://www.browserstack.com/ip-geolocation) to select a country code.
-`CONSOLE_LOGS`   | [Optional] Used to capture browser console logs. Refer to `browserstack.console` capability in chart
+`SCREENSHOTS`    | [Optional] Generate screenshots for debugging (`true` or `false`)
+`NETWORK_LOGS`   | [Optional] Capture network logs (`true` or `false`)
+`APPIUM_LOGS`    | [Optional] Generate Appium logs (`true` or `false`)
 
 
 
@@ -1706,7 +1709,7 @@ landscape orientation running on the BrowserStack service:
 
 ## Copyright and License
 
-TestCentricity™ Framework is Copyright (c) 2014-2021, Tony Mrozinski.
+TestCentricity™ Framework is Copyright (c) 2014-2022, Tony Mrozinski.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/testcentricity_web/appium_server.rb

@@ -26,7 +26,7 @@ module TestCentricity
         puts 'Appium Server is starting'
       end
       # start new Appium Server
-      @process = ChildProcess.build(*parameters)
+      @process = ChildProcess.build
       process.start
       # wait until confirmation that Appium Server is running
       wait = Selenium::WebDriver::Wait.new(timeout: 30)

data/lib/testcentricity_web/data_objects/environment.rb

@@ -5,6 +5,8 @@ module TestCentricity
     attr_accessor	:environ_specific_data
 
     def self.find_environ(environ_name, source_type = :excel)
+      raise 'No environment specified' if environ_name.nil?
+
       data = case source_type
              when :excel
                ExcelData.read_row_data(XL_PRIMARY_DATA_FILE, 'Environments', environ_name)
@@ -13,11 +15,27 @@ module TestCentricity
                @generic_data ||= YAML.load_file(YML_PRIMARY_DATA_FILE)
                # read environment specific test data
                data_file = "#{PRIMARY_DATA_PATH}#{environ_name}_data.yml"
-               @environ_specific_data ||= YAML.load_file(data_file)
+               @environ_specific_data = if File.exist?(data_file)
+                                          YAML.load_file(data_file)
+                                        else
+                                          {}
+                                        end
 
                read('Environments', environ_name)
              when :json
-               read_json_node_data('environments.json', environ_name)
+               # read generic test data from data.json file
+               raw_data = File.read(JSON_PRIMARY_DATA_FILE)
+               @generic_data = JSON.parse(raw_data)
+               # read environment specific test data
+               data_file = "#{PRIMARY_DATA_PATH}#{environ_name}_data.json"
+               @environ_specific_data = if File.exist?(data_file)
+                                          raw_data = File.read(data_file)
+                                          JSON.parse(raw_data)
+                                        else
+                                          {}
+                                        end
+
+               read('Environments', environ_name)
              end
       @current = Environ.new(data)
       Environ.current = @current
@@ -47,6 +65,9 @@ module TestCentricity
     @session_id = Time.now.strftime('%d%H%M%S%L')
     @session_time_stamp = Time.now.strftime('%Y%m%d%H%M%S')
     @test_environment = ENV['TEST_ENVIRONMENT']
+    @a11y_standard = ENV['ACCESSIBILITY_STANDARD'] || 'best-practice'
+    @locale = ENV['LOCALE'] || 'en'
+    @language = ENV['LANGUAGE'] || 'English'
     @screen_shots = []
 
     attr_accessor :test_environment
@@ -111,9 +132,6 @@ module TestCentricity
       @dns	         = data['DNS']
       @db_username   = data['DB_USERNAME']
       @db_password   = data['DB_PASSWORD']
-      @a11y_standard = ENV['ACCESSIBILITY_STANDARD'] || 'best-practice'
-      @locale        = ENV['LOCALE'] || 'en'
-      @language      = ENV['LANGUAGE'] || 'English'
 
       super
     end
@@ -365,13 +383,13 @@ module TestCentricity
     def self.report_header
       report_header = "\n<b><u>TEST ENVIRONMENT</u>:</b> #{ENV['TEST_ENVIRONMENT']}\n"\
       "  <b>Browser:</b>\t #{Environ.browser.capitalize}\n"
-      report_header = "#{report_header}  <b>Device:</b>\t\t #{Environ.device_name}\n" if Environ.device_name
+      report_header = "#{report_header}  <b>Device:</b>\t #{Environ.device_name}\n" if Environ.device_name
       report_header = "#{report_header}  <b>Device OS:</b>\t #{Environ.device_os} #{Environ.device_os_version}\n" if Environ.device_os
       report_header = "#{report_header}  <b>Device type:</b>\t #{Environ.device_type}\n" if Environ.device_type
-      report_header = "#{report_header}  <b>Driver:</b>\t\t #{Environ.driver}\n" if Environ.driver
+      report_header = "#{report_header}  <b>Driver:</b>\t #{Environ.driver}\n" if Environ.driver
       report_header = "#{report_header}  <b>Grid:</b>\t\t #{Environ.grid}\n" if Environ.grid
-      report_header = "#{report_header}  <b>OS:</b>\t\t\t #{Environ.os}\n" if Environ.os
-      report_header = "#{report_header}  <b>Locale:</b>\t\t #{Environ.locale}\n" if Environ.locale
+      report_header = "#{report_header}  <b>OS:</b>\t\t #{Environ.os}\n" if Environ.os
+      report_header = "#{report_header}  <b>Locale:</b>\t #{Environ.locale}\n" if Environ.locale
       report_header = "#{report_header}  <b>Language:</b>\t #{Environ.language}\n" if Environ.language
       report_header = "#{report_header}  <b>Country:</b>\t #{ENV['COUNTRY']}\n" if ENV['COUNTRY']
       report_header = "#{report_header}  <b>WCAG Accessibility Standard:</b>\t #{ENV['ACCESSIBILITY_STANDARD']}\n" if ENV['ACCESSIBILITY_STANDARD']

data/lib/testcentricity_web/exception_queue_helper.rb

@@ -116,8 +116,8 @@ module TestCentricity
     end
 
     def self.enqueue_screenshot
-      timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-      filename = "Screenshot-#{timestamp}"
+      timestamp = Time.now.strftime('%Y%m%d%H%M%S%L')
+      filename = "Screenshot-#{timestamp}.png"
       path = File.join Dir.pwd, 'reports/screenshots/', filename
       # highlight the active UI element prior to taking a screenshot
       unless @active_ui_element.nil? || @mru_ui_element == @active_ui_element
@@ -126,14 +126,14 @@ module TestCentricity
       end
       # take screenshot
       if Environ.driver == :appium
-        AppiumConnect.take_screenshot("#{path}.png")
+        AppiumConnect.take_screenshot(path)
       else
-        Capybara.save_screenshot "#{path}.png"
+        Capybara.save_screenshot path
       end
       # unhighlight the active UI element
       @mru_ui_element.unhighlight unless @mru_ui_element.blank?
       # add screenshot to queue
-      puts "Screenshot saved at #{path}.png"
+      puts "Screenshot saved at #{path}"
       screen_shot = {path: path, filename: filename}
       Environ.save_screen_shot(screen_shot)
     end

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '4.0.3'
+  VERSION = '4.1.0'
 end

data/lib/testcentricity_web/web_core/page_object.rb

@@ -100,13 +100,12 @@ module TestCentricity
     #
     # @param element_name [Symbol] name of checkbox object (as a symbol)
     # @param locator [String] CSS selector or XPath expression that uniquely identifies object
-    # @param proxy [Symbol] Optional name (as a symbol) of proxy object to receive click actions
     # @example
     #   checkbox :remember_checkbox,     "//input[@id='RememberUser']"
-    #   checkbox :accept_terms_checkbox, 'input#accept_terms_conditions', :accept_terms_label
+    #   checkbox :accept_terms_checkbox, 'input#accept_terms_conditions'
     #
-    def self.checkbox(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::CheckBox.new("#{element_name}", self, "#{locator}", :page, #{proxy});end))
+    def self.checkbox(element_name, locator)
+      define_page_element(element_name, TestCentricity::CheckBox, locator)
     end
 
     # Declare and instantiate a collection of checkboxes for this page object.
@@ -126,13 +125,12 @@ module TestCentricity
     #
     # @param element_name [Symbol] name of radio object (as a symbol)
     # @param locator [String] CSS selector or XPath expression that uniquely identifies object
-    # @param proxy [Symbol] Optional name (as a symbol) of proxy object to receive click actions
     # @example
     #   radio :accept_terms_radio,  "//input[@id='Accept_Terms']"
-    #   radio :decline_terms_radio, '#decline_terms_conditions', :decline_terms_label
+    #   radio :decline_terms_radio, '#decline_terms_conditions'
     #
-    def self.radio(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Radio.new("#{element_name}", self, "#{locator}", :page, #{proxy});end))
+    def self.radio(element_name, locator)
+      define_page_element(element_name, TestCentricity::Radio, locator)
     end
 
     # Declare and instantiate a collection of radio buttons for this page object.

data/lib/testcentricity_web/web_core/page_section.rb

@@ -220,13 +220,12 @@ module TestCentricity
     #
     # @param element_name [Symbol] name of checkbox object (as a symbol)
     # @param locator [String] CSS selector or XPath expression that uniquely identifies object
-    # @param proxy [Symbol] Optional name (as a symbol) of proxy object to receive click actions
     # @example
     #   checkbox :remember_checkbox,     "//input[@id='RememberUser']"
-    #   checkbox :accept_terms_checkbox, 'input#accept_terms_conditions', :accept_terms_label
+    #   checkbox :accept_terms_checkbox, 'input#accept_terms_conditions'
     #
-    def self.checkbox(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::CheckBox.new("#{element_name}", self, "#{locator}", :section, #{proxy});end))
+    def self.checkbox(element_name, locator)
+      define_element(element_name, TestCentricity::CheckBox, locator)
     end
 
     # Declare and instantiate a collection of checkboxes for this page section.
@@ -246,13 +245,12 @@ module TestCentricity
     #
     # @param element_name [Symbol] name of radio object (as a symbol)
     # @param locator [String] CSS selector or XPath expression that uniquely identifies object
-    # @param proxy [Symbol] Optional name (as a symbol) of proxy object to receive click actions
     # @example
     #   radio :accept_terms_radio,  "//input[@id='Accept_Terms']"
-    #   radio :decline_terms_radio, 'input#decline_terms_conditions', :decline_terms_label
+    #   radio :decline_terms_radio, 'input#decline_terms_conditions'
     #
     def self.radio(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Radio.new("#{element_name}", self, "#{locator}", :section, #{proxy});end))
+      define_element(element_name, TestCentricity::Radio, locator)
     end
 
     # Declare and instantiate a collection of radio buttons for this page section.