testcentricity_web 4.0.3 → 4.1.2

data/lib/devices/devices.yml

@@ -134,14 +134,6 @@
   :css_height: 869
   :default_orientation: portrait
   :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.1 Mobile/15E148 Safari/604.1"
-:android_phone:
-  :name: "Generic Android phone"
-  :os: android
-  :type: phone
-  :css_width: 360
-  :css_height: 640
-  :default_orientation: portrait
-  :user_agent: "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19"
 nexus6:
   :name: "Nexus 6 or 6P phone"
   :os: android
@@ -302,14 +294,6 @@ nexus6:
   :css_height: 768
   :default_orientation: landscape
   :user_agent: "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 EdgiOS/44.2.1 Mobile/15E148 Safari/605.1.15"
-:android_tablet:
-  :name: "Generic Android tablet"
-  :os: android
-  :type: tablet
-  :css_width: 1024
-  :css_height: 768
-  :default_orientation: landscape
-  :user_agent: "Mozilla/5.0 (Linux; U; Android 3.0; en-us; GT-P7100 Build/HRI83) AppleWebkit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
 :kindle_fire:
   :name: "Kindle Fire"
   :os: kindle

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.2'
 end

data/lib/testcentricity_web/web_core/page_object.rb

@@ -39,9 +39,9 @@ module TestCentricity
     #
     # @param element_hash [Hash] names of buttons (as a symbol) and CSS selectors or XPath expressions that uniquely identifies buttons
     # @example
-    #     buttons new_account_button:  'button#new-account',
-    #             save_button:         'button#save',
-    #             cancel_button:       'button#cancel'
+    #     buttons new_account_button: 'button#new-account',
+    #             save_button:        'button#save',
+    #             cancel_button:      'button#cancel'
     #
     def self.buttons(element_hash)
       element_hash.each(&method(:button))
@@ -63,11 +63,11 @@ module TestCentricity
     #
     # @param element_hash [Hash] names of text fields (as a symbol) and CSS selectors or XPath expressions that uniquely identifies text fields
     # @example
-    #       textfields  name_field:    'input#Name',
-    #                   title_field:   'input#Title',
-    #                   phone_field:   'input#PhoneNumber',
-    #                   fax_field:     'input#FaxNumber',
-    #                   email_field:   'input#Email'
+    #       textfields  name_field:  'input#Name',
+    #                   title_field: 'input#Title',
+    #                   phone_field: 'input#PhoneNumber',
+    #                   fax_field:   'input#FaxNumber',
+    #                   email_field: 'input#Email'
     #
     def self.textfields(element_hash)
       element_hash.each(&method(:textfield))
@@ -100,23 +100,22 @@ 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.
     #
     # @param element_hash [Hash] names of checkboxes (as a symbol) and CSS selectors or XPath expressions that uniquely identifies checkboxes
     # @example
-    #       checkboxes  hazmat_certified_check:  'input#hazmatCertified',
-    #                   epa_certified_check:     'input#epaCertified',
-    #                   dhs_certified_check:     'input#homelandSecurityCertified',
-    #                   carb_compliant_check:    'input#carbCompliant'
+    #       checkboxes  hazmat_certified_check: 'input#hazmatCertified',
+    #                   epa_certified_check:    'input#epaCertified',
+    #                   dhs_certified_check:    'input#homelandSecurityCertified',
+    #                   carb_compliant_check:   'input#carbCompliant'
     #
     def self.checkboxes(element_hash)
       element_hash.each(&method(:checkbox))
@@ -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

@@ -124,8 +124,8 @@ module TestCentricity
     # @param element_name [Symbol] name of UI object (as a symbol)
     # @param locator [String] CSS selector or XPath expression that uniquely identifies object
     # @example
-    #   element :undo_record_item,  "//li[@rn='Undo Record']/a"
-    #   element :basket_header,     'div.basket_header'
+    #   element :undo_record_item, "//li[@rn='Undo Record']/a"
+    #   element :basket_header,    'div.basket_header'
     #
     def self.element(element_name, locator)
       define_element(element_name, TestCentricity::UIElement, locator)
@@ -159,9 +159,9 @@ module TestCentricity
     #
     # @param element_hash [Hash] names of buttons (as a symbol) and CSS selectors or XPath expressions that uniquely identifies buttons
     # @example
-    #     buttons new_account_button:  'button#new-account',
-    #             save_button:         'button#save',
-    #             cancel_button:       'button#cancel'
+    #     buttons new_account_button: 'button#new-account',
+    #             save_button:        'button#save',
+    #             cancel_button:      'button#cancel'
     #
     def self.buttons(element_hash)
       element_hash.each(&method(:button))
@@ -183,11 +183,11 @@ module TestCentricity
     #
     # @param element_hash [Hash] names of text fields (as a symbol) and CSS selectors or XPath expressions that uniquely identifies text fields
     # @example
-    #       textfields  name_field:    'input#Name',
-    #                   title_field:   'input#Title',
-    #                   phone_field:   'input#PhoneNumber',
-    #                   fax_field:     'input#FaxNumber',
-    #                   email_field:   'input#Email'
+    #       textfields  name_field:  'input#Name',
+    #                   title_field: 'input#Title',
+    #                   phone_field: 'input#PhoneNumber',
+    #                   fax_field:   'input#FaxNumber',
+    #                   email_field: 'input#Email'
     #
     def self.textfields(element_hash)
       element_hash.each(&method(:textfield))
@@ -220,23 +220,22 @@ 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.
     #
     # @param element_hash [Hash] names of checkboxes (as a symbol) and CSS selectors or XPath expressions that uniquely identifies checkboxes
     # @example
-    #       checkboxes  hazmat_certified_check:  'input#hazmatCertified',
-    #                   epa_certified_check:     'input#epaCertified',
-    #                   dhs_certified_check:     'input#homelandSecurityCertified',
-    #                   carb_compliant_check:    'input#carbCompliant'
+    #       checkboxes  hazmat_certified_check: 'input#hazmatCertified',
+    #                   epa_certified_check:    'input#epaCertified',
+    #                   dhs_certified_check:    'input#homelandSecurityCertified',
+    #                   carb_compliant_check:   'input#carbCompliant'
     #
     def self.checkboxes(element_hash)
       element_hash.each(&method(:checkbox))
@@ -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.