testcentricity_web 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96822ca8dbde37ff287240b75b43b772718a1234
-  data.tar.gz: c6280b47bb8bcabdd341c4e1b4ca7c4e2d51ff10
+  metadata.gz: 806f211293d85f601510b0cdb3781b2ad45167b1
+  data.tar.gz: 90809103ca8c65940aa028eefd1f6f67a5034dc6
 SHA512:
-  metadata.gz: 4f85fadd19e3fdb2ece83f9258dc2436cfe7d329e6f70ad103657403e3dda2a209b7cf12e61272340c4f0d5b0c5d8e0a42df019f7c459f98904cb7a22bc55ec3
-  data.tar.gz: 7c3ed7f24c11c96c87ef8bc9d362493bcf29d6b9fcd15bf488f00faccf7c0d036ba1ceadfbe2afb8f5c7eb9bfb6af1af4fc392a81ddf52d838e51503129a7b23
+  metadata.gz: ea592c42f81f9afb9a3be6bf34b3ff0692d050f38e9d8208a377b5ca0055f9e88b9736c25e2ba917515231df39a1cef369049dcbe3049a69fca5c1dd6efd306c
+  data.tar.gz: 9ab809c4fe958a3355645056af4a9c5ecc291f874b2b2a211650c799cba9ed19462d6aa34d1f2f894e798ade872a09a0fb0be30dd0e256434a53d2e9bbeb843b

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in testcentricity_web.gemspec
 gemspec
 
-gem 'redcarpet', :groups => [ :development, :test ]
+gem 'redcarpet', :groups => [:development, :test]

data/README.md

@@ -400,6 +400,10 @@ One common implementation is shown below:
       def registration_page
         @registration_page ||= RegistrationPage.new
       end
+    
+      def search_results_page
+        @search_results_page ||= SearchResultsPage.new
+      end
     end
         
     World(WorldPages)
@@ -474,7 +478,7 @@ Include the step definitions and code below in a `page_steps.rb` or `generic_ste
     Given(/^I am on the ([^\"]*) page$/) do |page_name|
       target_page = page_dispatcher(page_name)
       target_page.load_page if target_page
-      PageManager.set_current_page(target_page)
+      PageManager.current_page = target_page
     end
     
     When(/^I click the ([^\"]*) navigation link$/) do |link_name|
@@ -485,14 +489,14 @@ Include the step definitions and code below in a `page_steps.rb` or `generic_ste
     Then(/^I expect to see the ([^\"]*) page$/) do |page_name|
       target_page = page_dispatcher(page_name)
       target_page.verify_page_exists if target_page
-      PageManager.set_current_page(target_page)
+      PageManager.current_page = target_page
     end
     
     Then(/^I expect the ([^\"]*) page to be correctly displayed$/) do |page_name|
       target_page = page_dispatcher(page_name)
       target_page.verify_page_exists
       target_page.verify_page_ui
-      PageManager.set_current_page(target_page)
+      PageManager.current_page = target_page
     end
     
     
@@ -567,6 +571,8 @@ mobile web browsers, the `WEB_BROWSER` Environment Variable must be set to one o
 `iphone7_plus`        |`firefox` or `chrome` |414 x 736  |portrait  |iOS 10
 `android_phone`       |`firefox` or `chrome` |320 x 480  |portrait  |Android 4.0.1
 `nexus6`              |`firefox` or `chrome` |411 x 731  |portrait  |Android 6.0.1
+`pixel`               |`firefox` or `chrome` |411 x 731  |portrait  |Android 7.1
+`pixel_xl`            |`firefox` or `chrome` |411 x 731  |portrait  |Android 7.1
 `windows_phone7`      |`firefox` or `chrome` |320 x 480  |portrait  |Windows Phone OS 7.5
 `windows_phone8`      |`firefox` or `chrome` |320 x 480  |portrait  |Windows Phone OS 8.0
 `blackberry_z10`      |`firefox` or `chrome` |384 x 640  |portrait  |BlackBerry 10 OS
@@ -797,6 +803,8 @@ service(s) that you intend to connect with.
     google_nexus7:       WEB_BROWSER=google_nexus7       HOST_BROWSER=firefox <%= mobile %>
     google_nexus9:       WEB_BROWSER=google_nexus9       HOST_BROWSER=firefox <%= mobile %>
     google_nexus10:      WEB_BROWSER=google_nexus10      HOST_BROWSER=firefox <%= mobile %>
+    pixel:               WEB_BROWSER=pixel               HOST_BROWSER=firefox <%= mobile %>
+    pixel_xl:            WEB_BROWSER=pixel_xl            HOST_BROWSER=firefox <%= mobile %>
     windows_phone7:      WEB_BROWSER=windows_phone7      HOST_BROWSER=firefox <%= mobile %>
     windows_phone8:      WEB_BROWSER=windows_phone8      HOST_BROWSER=firefox <%= mobile %>
     blackberry_z10:      WEB_BROWSER=blackberry_z10      HOST_BROWSER=firefox <%= mobile %>

data/lib/devices/devices.yml

@@ -52,6 +52,18 @@ nexus6:
   :css_height: 731
   :default_orientation: portrait
   :user_agent: "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 6P Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.83 Mobile Safari/537.36"
+:pixel:
+  :name: "Google Pixel phone"
+  :css_width: 411
+  :css_height: 731
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (Linux; Android 7.1; Pixel Build/NAE63H; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.134 Mobile Safari/537.36"
+:pixel_xl:
+  :name: "Google Pixel XL phone"
+  :css_width: 411
+  :css_height: 731
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (Linux; Android 7.1; Pixel XL Build/NDE63N; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/54.0.2840.34 Mobile Safari/537.36"
 :windows_phone8:
   :name: "Generic Windows 8 phone"
   :css_width: 320

data/lib/testcentricity_web.rb

@@ -45,7 +45,7 @@ module TestCentricity
         if page_key != page_object
           @page_objects[page_key] = obj unless @page_objects.has_key?(page_key)
         end
-        result = "#{result}def #{page_object.to_s};@#{page_object.to_s} ||= TestCentricity::PageManager.find_page(:#{page_object.to_s});end;"
+        result = "#{result}def #{page_object};@#{page_object} ||= TestCentricity::PageManager.find_page(:#{page_object});end;"
       end
       result
     end
@@ -91,7 +91,9 @@ module TestCentricity
     # @example
     #   TestCentricity::PageManager.set_current_page(product_search_page)
     #
+    # @deprecated Please use {#current_page=} instead
     def self.set_current_page(page)
+      warn "[DEPRECATION] 'TestCentricity::PageManager.set_current_page' is deprecated.  Please use 'current_page=' instead."
       @current_page = page
     end
   end
@@ -104,7 +106,7 @@ module TestCentricity
       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.to_s};@#{data_type.to_s} ||= TestCentricity::DataManager.find_data_object(:#{data_type.to_s});end;"
+        result = "#{result}def #{data_type};@#{data_type} ||= TestCentricity::DataManager.find_data_object(:#{data_type});end;"
       end
       result
     end

data/lib/testcentricity_web/browser_helper.rb

@@ -115,7 +115,7 @@ module TestCentricity
         height = device[:css_height]
         default_orientation = device[:default_orientation].to_sym
         if orientation
-          (orientation.downcase.to_sym == default_orientation) ?
+          orientation.downcase.to_sym == default_orientation ?
               size = [width, height] :
               size = [height, width]
         else

data/lib/testcentricity_web/data_objects_helper.rb

@@ -4,8 +4,8 @@ require 'json'
 
 module TestCentricity
 
-  XL_PRIMARY_DATA_PATH  ||= 'features/test_data/'
-  XL_PRIMARY_DATA_FILE  ||= "#{XL_PRIMARY_DATA_PATH}data.xls"
+  XL_PRIMARY_DATA_PATH ||= 'features/test_data/'
+  XL_PRIMARY_DATA_FILE ||= "#{XL_PRIMARY_DATA_PATH}data.xls"
 
 
   class DataObject
@@ -17,13 +17,19 @@ module TestCentricity
       @hash_table = data
     end
 
+    # @deprecated Please use {#current=} instead
     def self.set_current(current)
+      warn "[DEPRECATION] 'TestCentricity::DataObject.set_current' is deprecated.  Please use 'current=' instead."
       @current = current
     end
 
     def self.current
       @current
     end
+
+    def self.current=(current)
+      @current = current
+    end
   end
 
 
@@ -56,12 +62,12 @@ module TestCentricity
     end
 
     def read_excel_row_data(sheet, row_name, parallel = false)
-      (parallel == :parallel && ENV['PARALLEL']) ? row_spec = "#{row_name}#{ENV['TEST_ENV_NUMBER']}" : row_spec = row_name
+      parallel == :parallel && ENV['PARALLEL'] ? row_spec = "#{row_name}#{ENV['TEST_ENV_NUMBER']}" : row_spec = row_name
       ExcelData.read_row_data(pick_excel_data_source(sheet, row_spec), sheet, row_spec)
     end
 
     def read_excel_pool_data(sheet, row_name, parallel = false)
-      (parallel == :parallel && ENV['PARALLEL']) ? row_spec = "#{row_name}#{ENV['TEST_ENV_NUMBER']}" : row_spec = row_name
+      parallel == :parallel && ENV['PARALLEL'] ? row_spec = "#{row_name}#{ENV['TEST_ENV_NUMBER']}" : row_spec = row_name
       ExcelData.read_row_from_pool(pick_excel_data_source(sheet, row_name), sheet, row_spec)
     end
 

data/lib/testcentricity_web/elements/table.rb

@@ -78,11 +78,11 @@ module TestCentricity
         page.all(:xpath, "#{@locator}/#{@table_header}/#{@header_row}/#{@header_column}", :visible => :all).count
       else
         if @table_section.nil?
-          (row_count == 1) ?
+          row_count == 1 ?
               page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_row}/#{@table_column}", :visible => :all).count :
               page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_row}[2]/#{@table_column}", :visible => :all).count
         else
-          (row_count == 1) ?
+          row_count == 1 ?
               page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_section}/#{@table_row}/#{@table_column}", :visible => :all).count :
               page.all(:xpath, "#{@locator}/#{@table_body}/#{@table_section}[2]/#{@table_row}/#{@table_column}", :visible => :all).count
         end
@@ -194,7 +194,7 @@ module TestCentricity
     def get_row_data(row)
       row_count = get_row_count
       raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      (row > 1) ?
+      row > 1 ?
           set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}[#{row}]") :
           set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}")
       value = get_value if exists?
@@ -291,7 +291,7 @@ module TestCentricity
     def get_row_attribute(row, attrib)
       row_count = get_row_count
       raise "Row #{row} exceeds number of rows (#{row_count}) in table #{object_ref_message}" if row > row_count
-      (row > 1) ?
+      row > 1 ?
           set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}[#{row}]") :
           set_alt_locator("#{@locator}/#{@table_body}/#{@table_row}")
       result = get_native_attribute(attrib)

data/lib/testcentricity_web/environment.rb

@@ -14,7 +14,7 @@ module TestCentricity
         data = read_json_node_data('environments.json', environ_name)
       end
       @current = Environ.new(data)
-      Environ.set_current(@current)
+      Environ.current = @current
     end
   end
 
@@ -79,7 +79,9 @@ module TestCentricity
       @session_time_stamp
     end
 
+    # @deprecated Please use {#browser=} instead
     def self.set_browser(browser)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_browser' is deprecated.  Please use 'browser=' instead."
       @browser = browser.downcase.to_sym
     end
 
@@ -91,7 +93,9 @@ module TestCentricity
       @browser
     end
 
+    # @deprecated Please use {#os=} instead
     def self.set_os(os)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_os' is deprecated.  Please use 'os=' instead."
       @os = os
     end
 
@@ -103,7 +107,9 @@ module TestCentricity
       @os
     end
 
+    # @deprecated Please use {#device=} instead
     def self.set_device(device)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_device' is deprecated.  Please use 'device=' instead."
       @device = device
     end
 
@@ -115,7 +121,9 @@ module TestCentricity
       @device
     end
 
+    # @deprecated Please use {#device_type=} instead
     def self.set_device_type(type)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_device_type' is deprecated.  Please use 'device_type=' instead."
       @device_type = type.downcase
     end
 
@@ -127,7 +135,9 @@ module TestCentricity
       @device_type
     end
 
+    # @deprecated Please use {#platform=} instead
     def self.set_platform(platform)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_platform' is deprecated.  Please use 'platform=' instead."
       @platform = platform
     end
 
@@ -151,7 +161,9 @@ module TestCentricity
       @signed_in
     end
 
+    # @deprecated Please use {#portal_state=} instead
     def self.set_portal_state(portal_state)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_portal_state' is deprecated.  Please use 'portal_state=' instead."
       @portal_status = portal_state
     end
 
@@ -163,7 +175,9 @@ module TestCentricity
       @portal_status
     end
 
+    # @deprecated Please use {#portal_context=} instead
     def self.set_portal_context(portal_context)
+      warn "[DEPRECATION] 'TestCentricity::Environ.set_portal_context' is deprecated.  Please use 'portal_context=' instead."
       @portal_context = portal_context
     end
 

data/lib/testcentricity_web/page_objects_helper.rb

@@ -28,7 +28,7 @@ module TestCentricity
     #   element :siebel_busy,  "//html[contains(@class, 'siebui-busy')]"
     #
     def self.element(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::UIElement.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::UIElement.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     # Declare and instantiate a collection of generic UI Elements for this page object.
@@ -54,7 +54,7 @@ module TestCentricity
     #   button :login_button,    "//input[@id='submit_button']"
     #
     def self.button(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Button.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Button.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     # Declare and instantiate a collection of buttons for this page object.
@@ -80,7 +80,7 @@ module TestCentricity
     #   textfield :password_field, 'consumer_password'
     #
     def self.textfield(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::TextField.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::TextField.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     # Declare and instantiate a collection of text fields for this page object.
@@ -109,7 +109,7 @@ module TestCentricity
     #   checkbox :accept_terms_checkbox, 'input#accept_terms_conditions', :accept_terms_label
     #
     def self.checkbox(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::CheckBox.new("#{element_name}", self, "#{locator}", :page, #{proxy});end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::CheckBox.new("#{element_name}", self, "#{locator}", :page, #{proxy});end))
     end
 
     # Declare and instantiate a collection of checkboxes for this page object.
@@ -137,7 +137,7 @@ module TestCentricity
     #   radio :decline_terms_radio, '#decline_terms_conditions', :decline_terms_label
     #
     def self.radio(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Radio.new("#{element_name}", self, "#{locator}", :page, #{proxy});end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Radio.new("#{element_name}", self, "#{locator}", :page, #{proxy});end))
     end
 
     # Declare and instantiate a collection of radio buttons for this page object.
@@ -164,7 +164,7 @@ module TestCentricity
     #   label :rollup_price_label, "//div[contains(@id, 'Rollup Item Price')]"
     #
     def self.label(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Label.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Label.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     def self.labels(element_hash)
@@ -182,7 +182,7 @@ module TestCentricity
     #   link :shopping_basket_link, "//a[@href='shopping_basket']"
     #
     def self.link(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Link.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Link.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     def self.links(element_hash)
@@ -199,7 +199,7 @@ module TestCentricity
     #   table :payments_table, "//table[@class='payments_table']"
     #
     def self.table(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Table.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Table.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     def self.tables(element_hash)
@@ -217,7 +217,7 @@ module TestCentricity
     #   selectlist :gender_select,     "//select[@id='customer_gender']"
     #
     def self.selectlist(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::SelectList.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::SelectList.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     def self.selectlists(element_hash)
@@ -234,7 +234,7 @@ module TestCentricity
     #   list :x_axis_list, 'g.x-axis'
     #
     def self.list(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::List.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::List.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     def self.lists(element_hash)
@@ -252,7 +252,7 @@ module TestCentricity
     #   image :corporate_logo_image, "//img[@alt='MyCompany_logo']"
     #
     def self.image(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Image.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Image.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     def self.images(element_hash)
@@ -269,7 +269,7 @@ module TestCentricity
     #   filefield :attach_file, 's_SweFileName'
     #
     def self.filefield(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::FileField.new("#{element_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::FileField.new("#{element_name}", self, "#{locator}", :page);end))
     end
 
     # Instantiate a single PageSection object for this page object.
@@ -280,7 +280,7 @@ module TestCentricity
     #   section :search_form, SearchForm
     #
     def self.section(section_name, class_name, locator = nil)
-      class_eval(%(def #{section_name.to_s};@#{section_name.to_s} ||= #{class_name.to_s}.new("#{section_name}", self, "#{locator}", :page);end))
+      class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, "#{locator}", :page);end))
     end
 
     def self.sections(section_hash)
@@ -299,7 +299,7 @@ module TestCentricity
       else
         visit "#{environment.protocol}://#{environment.user_id}:#{environment.password}@#{url}"
       end
-      Environ.set_portal_state(:open)
+      Environ.portal_state = :open
     end
 
     def verify_page_exists
@@ -327,7 +327,7 @@ module TestCentricity
         navigate_to
       end
       verify_page_exists
-      PageManager.set_current_page(self)
+      PageManager.current_page = self
     end
 
     def verify_page_contains(content)
@@ -424,7 +424,7 @@ module TestCentricity
           end
 
           if state.is_a?(Hash) && state.length == 1
-            error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property.to_s} property to"
+            error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property to"
             state.each do |key, value|
               case key
               when :lt, :less_than
@@ -456,7 +456,7 @@ module TestCentricity
               end
             end
           else
-            ExceptionQueue.enqueue_assert_equal(state, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property.to_s} property")
+            ExceptionQueue.enqueue_assert_equal(state, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property")
           end
         end
       end
@@ -491,7 +491,7 @@ module TestCentricity
             when :checkbox
               data_field.set_checkbox_state(data_param.to_bool)
             when :selectlist
-              (data_field.get_siebel_object_type == 'JComboBox') ?
+              data_field.get_siebel_object_type == 'JComboBox' ?
                   data_field.set("#{data_param}\t") :
                   data_field.choose_option(data_param)
             when :radio

data/lib/testcentricity_web/page_sections_helper.rb

@@ -37,7 +37,7 @@ module TestCentricity
     #   element :basket_header,     'div.basket_header'
     #
     def self.element(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::UIElement.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::UIElement.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     # Declare and instantiate a collection of generic UI Elements for this page section.
@@ -63,7 +63,7 @@ module TestCentricity
     #   button :login_button,    "//input[@id='submit_button']"
     #
     def self.button(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Button.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Button.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     # Declare and instantiate a collection of buttons for this page section.
@@ -89,7 +89,7 @@ module TestCentricity
     #   textfield :password_field, 'input#consumer_password'
     #
     def self.textfield(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::TextField.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::TextField.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     # Declare and instantiate a collection of text fields for this page section.
@@ -118,7 +118,7 @@ module TestCentricity
     #   checkbox :accept_terms_checkbox, 'input#accept_terms_conditions', :accept_terms_label
     #
     def self.checkbox(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::CheckBox.new("#{element_name}", self, "#{locator}", :section, #{proxy});end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::CheckBox.new("#{element_name}", self, "#{locator}", :section, #{proxy});end))
     end
 
     # Declare and instantiate a collection of checkboxes for this page section.
@@ -146,7 +146,7 @@ module TestCentricity
     #   radio :decline_terms_radio, 'input#decline_terms_conditions', :decline_terms_label
     #
     def self.radio(element_name, locator, proxy = nil)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Radio.new("#{element_name}", self, "#{locator}", :section, #{proxy});end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Radio.new("#{element_name}", self, "#{locator}", :section, #{proxy});end))
     end
 
     # Declare and instantiate a collection of radio buttons for this page section.
@@ -173,7 +173,7 @@ module TestCentricity
     #   label :rollup_price_label, "//div[contains(@id, 'Rollup Item Price')]"
     #
     def self.label(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Label.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Label.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     def self.labels(element_hash)
@@ -191,7 +191,7 @@ module TestCentricity
     #   link :shopping_basket_link, "//a[@href='shopping_basket']"
     #
     def self.link(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Link.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Link.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     def self.links(element_hash)
@@ -208,7 +208,7 @@ module TestCentricity
     #   table :payments_table, "//table[@class='payments_table']"
     #
     def self.table(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Table.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Table.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     def self.tables(element_hash)
@@ -226,7 +226,7 @@ module TestCentricity
     #   selectlist :gender_select,     "//select[@id='customer_gender']"
     #
     def self.selectlist(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::SelectList.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::SelectList.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     def self.selectlists(element_hash)
@@ -243,7 +243,7 @@ module TestCentricity
     #   list :y_axis_list, 'g.y_axis'
     #
     def self.list(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::List.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::List.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     def self.lists(element_hash)
@@ -261,7 +261,7 @@ module TestCentricity
     #   image :corporate_logo_image, "//img[@alt='MyCompany_logo']"
     #
     def self.image(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::Image.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::Image.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     def self.images(element_hash)
@@ -278,7 +278,7 @@ module TestCentricity
     #   filefield :attach_file, 's_SweFileName'
     #
     def self.filefield(element_name, locator)
-      class_eval(%(def #{element_name.to_s};@#{element_name.to_s} ||= TestCentricity::FileField.new("#{element_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::FileField.new("#{element_name}", self, "#{locator}", :section);end))
     end
 
     # Instantiate a single PageSection object within this PageSection object.
@@ -289,7 +289,7 @@ module TestCentricity
     #   section :search_form, SearchForm
     #
     def self.section(section_name, class_name, locator = nil)
-      class_eval(%(def #{section_name.to_s};@#{section_name.to_s} ||= #{class_name.to_s}.new("#{section_name}", self, "#{locator}", :section);end))
+      class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, "#{locator}", :section);end))
     end
 
     def self.sections(section_hash)
@@ -299,7 +299,7 @@ module TestCentricity
     end
 
     def get_locator
-      (@locator.empty? && defined?(section_locator)) ? locator = section_locator : locator = @locator
+      @locator.empty? && defined?(section_locator) ? locator = section_locator : locator = @locator
       (@context == :section && !@parent.nil? && !@parent.get_locator.nil?) ? "#{@parent.get_locator}|#{locator}" : locator
     end
 
@@ -356,7 +356,7 @@ module TestCentricity
       visible = false
       visible = section.visible? if exists
       # the section is visible if it exists and it is not invisible
-      (exists && visible) ? true : false
+      exists && visible ? true : false
     end
 
     # Is Section object hidden (not visible)?
@@ -495,7 +495,7 @@ module TestCentricity
           end
 
           if state.is_a?(Hash) && state.length == 1
-            error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property.to_s} property to"
+            error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property to"
             state.each do |key, value|
               case key
               when :lt, :less_than
@@ -527,7 +527,7 @@ module TestCentricity
               end
             end
           else
-            ExceptionQueue.enqueue_assert_equal(state, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property.to_s} property")
+            ExceptionQueue.enqueue_assert_equal(state, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property")
           end
         end
       end
@@ -563,7 +563,7 @@ module TestCentricity
             when :checkbox
               data_field.set_checkbox_state(data_param.to_bool)
             when :selectlist
-              (data_field.get_siebel_object_type == 'JComboBox') ?
+              data_field.get_siebel_object_type == 'JComboBox' ?
                   data_field.set("#{data_param}\t") :
                   data_field.choose_option(data_param)
             when :radio

data/lib/testcentricity_web/ui_elements_helper.rb

@@ -164,7 +164,7 @@ module TestCentricity
         invisible = !obj.visible? if exists
       end
       # the object is visible if it exists and it is not invisible
-      (exists && !invisible) ? true : false
+      exists && !invisible ? true : false
     end
 
     # Is UI object hidden (not visible)?

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '1.0.17'
+  VERSION = '1.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler