testcentricity 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8df99002fffdad6e8c19cb1876b94eafd25de5
-  data.tar.gz: 712b44489736893404dfd43fea536e597b9d16e5
+  metadata.gz: ba8bb419286dffb3e7f9cf89b8dc5aa6744870d4
+  data.tar.gz: 3b5886e903439cb5755a211a6aa75f799b267c9e
 SHA512:
-  metadata.gz: 8823c6bb677e8e9d5a3a6b3887de392633a90ed95ce4357f3688c3304bdbba75347c819200b78dfb2398b30dccc3bec1e10056c02b703f7d27665ab28c7eeb65
-  data.tar.gz: 53cd51a09cdcb77996a7e0fc4113802f0e1e3ad0ec3d1452f26c85623ec7aec04b94e93dfea8cd3b60aee12d0f42071a15ccc0e91ed566bb4b2f1f79cf3e09a4
+  metadata.gz: 79d250c941affcdbf496fe2c646fe9f963a911c5e7c49f43f84f0135a67421e739ac36a5168d5a0a7e2e90d31d9d2a5ee4711bc5e11447c1905d3086beccbae5
+  data.tar.gz: 484ff58e76a7a0a549a5f4ad2695915f0a3598aa16df7bfbe5a667471a4a118fdb4639d05ff7bcd0609bbd8e360a85da9b7298926397f3fec82b56c4905ce0da

data/README.md

@@ -925,6 +925,7 @@ the `WEB_BROWSER` Environment Variable must be set to one of the values from the
 `ipad_pro_10_5`       |`chrome`        |1112 x 834 |landscape |iOS 11
 `ipad_chrome`         |`chrome`        |1024 x 768 |landscape |iOS 10 - Mobile Chrome browser for iOS
 `ipad_firefox`        |`chrome`        |1024 x 768 |landscape |iOS 10 - Mobile Firefox browser for iOS
+`ipad_edge`           |`chrome`        |1024 x 768 |landscape |iOS 10 - Mobile Edge browser for iOS
 `android_tablet`      |`chrome`        |1024 x 768 |landscape |Android 3.0
 `kindle_fire`         |`chrome`        |1024 x 600 |landscape |
 `kindle_firehd7`      |`chrome`        |800 x 480  |landscape |Fire OS 3
@@ -1226,6 +1227,7 @@ service(s) that you intend to connect with.
     ipad_pro_10_5:       WEB_BROWSER=ipad_pro_10_5       HOST_BROWSER=chrome <%= mobile %>
     ipad_chrome:         WEB_BROWSER=ipad_chrome         HOST_BROWSER=chrome <%= mobile %>
     ipad_firefox:        WEB_BROWSER=ipad_firefox        HOST_BROWSER=chrome <%= mobile %>
+    ipad_edge:           WEB_BROWSER=ipad_edge           HOST_BROWSER=chrome <%= mobile %>
     iphone:              WEB_BROWSER=iphone              HOST_BROWSER=chrome <%= mobile %>
     iphone4:             WEB_BROWSER=iphone4             HOST_BROWSER=chrome <%= mobile %>
     iphone5:             WEB_BROWSER=iphone5             HOST_BROWSER=chrome <%= mobile %>

data/lib/testcentricity/app_core/appium_connect_helper.rb

@@ -36,73 +36,9 @@ module TestCentricity
         browser = ENV['WEB_BROWSER']
         case browser.downcase.to_sym
         when :appium
-          desired_capabilities = {
-              caps: {
-                  platformName:    ENV['APP_PLATFORM_NAME'],
-                  platformVersion: ENV['APP_VERSION'],
-                  deviceName:      ENV['APP_DEVICE'],
-                  automationName:  ENV['AUTOMATION_ENGINE']
-              }
-          }
-          capabilities = desired_capabilities[:caps]
-          capabilities[:avd]                    = ENV['APP_DEVICE'] if ENV['APP_PLATFORM_NAME'].downcase.to_sym == :android
-          capabilities[:orientation]            = ENV['ORIENTATION'].upcase if ENV['ORIENTATION']
-          capabilities[:language]               = ENV['LANGUAGE'] if ENV['LANGUAGE']
-          capabilities[:locale]                 = ENV['LOCALE'].gsub('-', '_') if ENV['LOCALE']
-          capabilities[:newCommandTimeout]      = ENV['NEW_COMMAND_TIMEOUT'] if ENV['NEW_COMMAND_TIMEOUT']
-          capabilities[:noReset]                = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
-          capabilities[:fullReset]              = ENV['APP_FULL_RESET'] if ENV['APP_FULL_RESET']
-          capabilities[:webkitDebugProxyPort]   = ENV['WEBKIT_DEBUG_PROXY_PORT'] if ENV['WEBKIT_DEBUG_PROXY_PORT']
-          capabilities[:webDriverAgentUrl]      = ENV['WEBDRIVER_AGENT_URL'] if ENV['WEBDRIVER_AGENT_URL']
-          capabilities[:wdaLocalPort]           = ENV['WDA_LOCAL_PORT'] if ENV['WDA_LOCAL_PORT']
-          capabilities[:usePrebuiltWDA]         = ENV['USE_PREBUILT_WDA'] if ENV['USE_PREBUILT_WDA']
-          capabilities[:useNewWDA]              = ENV['USE_NEW_WDA'] if ENV['USE_NEW_WDA']
-          capabilities[:startIWDP]              = ENV['START_IWDP'] if ENV['START_IWDP']
-          capabilities[:autoWebview]            = ENV['AUTO_WEBVIEW'] if ENV['AUTO_WEBVIEW']
-          capabilities[:chromedriverExecutable] = ENV['CHROMEDRIVER_EXECUTABLE'] if ENV['CHROMEDRIVER_EXECUTABLE']
-          capabilities[:autoWebviewTimeout]     = ENV['AUTO_WEBVIEW_TIMEOUT'] if ENV['AUTO_WEBVIEW_TIMEOUT']
-
-          if ENV['UDID']
-            capabilities[:udid]           = ENV['UDID']
-            capabilities[:bundleId]       = ENV['BUNDLE_ID'] if ENV['BUNDLE_ID']
-            capabilities[:xcodeOrgId]     = ENV['TEAM_ID'] if ENV['TEAM_ID']
-            capabilities[:xcodeSigningId] = ENV['TEAM_NAME'] if ENV['TEAM_NAME']
-            capabilities[:appActivity]    = ENV['APP_ACTIVITY'] if ENV['APP_ACTIVITY']
-            capabilities[:appPackage]     = ENV['APP_PACKAGE'] if ENV['APP_PACKAGE']
-          end
-
-          if ENV['APP']
-            capabilities[:app] = ENV['APP']
-          else
-            if Environ.is_android?
-              capabilities[:app] = Environ.current.android_apk_path
-            elsif Environ.is_ios?
-              Environ.is_device? ?
-                  capabilities[:app] = Environ.current.ios_ipa_path :
-                  capabilities[:app] = Environ.current.ios_app_path
-            end
-          end
+          desired_capabilities = appium_local_capabilities
         when :browserstack
-          endpoint = "http://#{ENV['BS_USERNAME']}:#{ENV['BS_AUTHKEY']}@hub-cloud.browserstack.com/wd/hub"
-
-          capabilities = {}
-          capabilities['device']     = ENV['BS_DEVICE']
-          capabilities['os_version'] = ENV['BS_OS_VERSION']
-          capabilities['app']        = "bs://#{ENV['APP_URL']}" if ENV['APP_URL']
-          capabilities['app']        = ENV['APP_ID'] if ENV['APP_ID']
-          capabilities['realMobile'] = true
-          capabilities['project']    = ENV['AUTOMATE_PROJECT'] if ENV['AUTOMATE_PROJECT']
-          capabilities['build']      = ENV['AUTOMATE_BUILD'] if ENV['AUTOMATE_BUILD']
-          capabilities['deviceOrientation']  = ENV['ORIENTATION'] if ENV['ORIENTATION']
-          capabilities['browserstack.debug'] = true
-          capabilities['browserstack.video'] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
-          capabilities['browserstack.debug'] = 'true'
-
-          appium_lib_options = { server_url: endpoint }
-          desired_capabilities = {
-              appium_lib:  appium_lib_options,
-              caps:        capabilities
-          }
+          desired_capabilities = browserstack_capabilities
         end
       else
         base_path = 'config'
@@ -215,6 +151,82 @@ module TestCentricity
       set_context(contexts.last)
       puts "Current context = #{$driver.current_context}" if ENV['DEBUG']
     end
+
+    private
+
+    def self.appium_local_capabilities
+      desired_capabilities = {
+          caps: {
+              platformName:    ENV['APP_PLATFORM_NAME'],
+              platformVersion: ENV['APP_VERSION'],
+              deviceName:      ENV['APP_DEVICE'],
+              automationName:  ENV['AUTOMATION_ENGINE']
+          }
+      }
+      capabilities = desired_capabilities[:caps]
+      capabilities[:avd]                    = ENV['APP_DEVICE'] if ENV['APP_PLATFORM_NAME'].downcase.to_sym == :android
+      capabilities[:orientation]            = ENV['ORIENTATION'].upcase if ENV['ORIENTATION']
+      capabilities[:language]               = ENV['LANGUAGE'] if ENV['LANGUAGE']
+      capabilities[:locale]                 = ENV['LOCALE'].gsub('-', '_') if ENV['LOCALE']
+      capabilities[:newCommandTimeout]      = ENV['NEW_COMMAND_TIMEOUT'] if ENV['NEW_COMMAND_TIMEOUT']
+      capabilities[:noReset]                = ENV['APP_NO_RESET'] if ENV['APP_NO_RESET']
+      capabilities[:fullReset]              = ENV['APP_FULL_RESET'] if ENV['APP_FULL_RESET']
+      capabilities[:webkitDebugProxyPort]   = ENV['WEBKIT_DEBUG_PROXY_PORT'] if ENV['WEBKIT_DEBUG_PROXY_PORT']
+      capabilities[:webDriverAgentUrl]      = ENV['WEBDRIVER_AGENT_URL'] if ENV['WEBDRIVER_AGENT_URL']
+      capabilities[:wdaLocalPort]           = ENV['WDA_LOCAL_PORT'] if ENV['WDA_LOCAL_PORT']
+      capabilities[:usePrebuiltWDA]         = ENV['USE_PREBUILT_WDA'] if ENV['USE_PREBUILT_WDA']
+      capabilities[:useNewWDA]              = ENV['USE_NEW_WDA'] if ENV['USE_NEW_WDA']
+      capabilities[:startIWDP]              = ENV['START_IWDP'] if ENV['START_IWDP']
+      capabilities[:autoWebview]            = ENV['AUTO_WEBVIEW'] if ENV['AUTO_WEBVIEW']
+      capabilities[:chromedriverExecutable] = ENV['CHROMEDRIVER_EXECUTABLE'] if ENV['CHROMEDRIVER_EXECUTABLE']
+      capabilities[:autoWebviewTimeout]     = ENV['AUTO_WEBVIEW_TIMEOUT'] if ENV['AUTO_WEBVIEW_TIMEOUT']
+
+      if ENV['UDID']
+        capabilities[:udid]           = ENV['UDID']
+        capabilities[:bundleId]       = ENV['BUNDLE_ID'] if ENV['BUNDLE_ID']
+        capabilities[:xcodeOrgId]     = ENV['TEAM_ID'] if ENV['TEAM_ID']
+        capabilities[:xcodeSigningId] = ENV['TEAM_NAME'] if ENV['TEAM_NAME']
+        capabilities[:appActivity]    = ENV['APP_ACTIVITY'] if ENV['APP_ACTIVITY']
+        capabilities[:appPackage]     = ENV['APP_PACKAGE'] if ENV['APP_PACKAGE']
+      end
+
+      if ENV['APP']
+        capabilities[:app] = ENV['APP']
+      else
+        if Environ.is_android?
+          capabilities[:app] = Environ.current.android_apk_path
+        elsif Environ.is_ios?
+          Environ.is_device? ?
+              capabilities[:app] = Environ.current.ios_ipa_path :
+              capabilities[:app] = Environ.current.ios_app_path
+        end
+      end
+      desired_capabilities
+    end
+
+    def self.browserstack_capabilities
+      endpoint = "http://#{ENV['BS_USERNAME']}:#{ENV['BS_AUTHKEY']}@hub-cloud.browserstack.com/wd/hub"
+
+      capabilities = {}
+      capabilities['device']     = ENV['BS_DEVICE']
+      capabilities['os_version'] = ENV['BS_OS_VERSION']
+      capabilities['app']        = "bs://#{ENV['APP_URL']}" if ENV['APP_URL']
+      capabilities['app']        = ENV['APP_ID'] if ENV['APP_ID']
+      capabilities['realMobile'] = true
+      capabilities['project']    = ENV['AUTOMATE_PROJECT'] if ENV['AUTOMATE_PROJECT']
+      capabilities['build']      = ENV['AUTOMATE_BUILD'] if ENV['AUTOMATE_BUILD']
+      capabilities['deviceOrientation']  = ENV['ORIENTATION'] if ENV['ORIENTATION']
+      capabilities['browserstack.debug'] = true
+      capabilities['browserstack.video'] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
+      capabilities['browserstack.debug'] = 'true'
+
+      appium_lib_options = { server_url: endpoint }
+      desired_capabilities = {
+          appium_lib:  appium_lib_options,
+          caps:        capabilities
+      }
+      desired_capabilities
+    end
   end
 end
 

data/lib/testcentricity/app_core/screen_objects_helper.rb

@@ -15,17 +15,8 @@ module TestCentricity
       define_method(trait_name.to_s, &block)
     end
 
-    # def self.element(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppUIElement.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.element(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppUIElement.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppUIElement, locator)
     end
 
     def self.elements(element_hash)
@@ -34,17 +25,8 @@ module TestCentricity
       end
     end
 
-    # def self.button(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppButton.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.button(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppButton.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppButton, locator)
     end
 
     def self.buttons(element_hash)
@@ -53,17 +35,8 @@ module TestCentricity
       end
     end
 
-    # def self.textfield(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppTextField.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.textfield(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppTextField.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppTextField, locator)
     end
 
     def self.textfields(element_hash)
@@ -72,17 +45,8 @@ module TestCentricity
       end
     end
 
-    # def self.switch(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSwitch.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.switch(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppSwitch.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppSwitch, locator)
     end
 
     def self.switches(element_hash)
@@ -91,17 +55,8 @@ module TestCentricity
       end
     end
 
-    # def self.checkbox(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppCheckBox.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.checkbox(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppCheckBox.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppCheckBox, locator)
     end
 
     def self.checkboxes(element_hash)
@@ -110,17 +65,8 @@ module TestCentricity
       end
     end
 
-    # def self.label(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppLabel.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.label(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppLabel.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppLabel, locator)
     end
 
     def self.labels(element_hash)
@@ -129,17 +75,8 @@ module TestCentricity
       end
     end
 
-    # def self.list(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppList.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.list(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppList.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppList, locator)
     end
 
     def self.lists(element_hash)
@@ -148,17 +85,8 @@ module TestCentricity
       end
     end
 
-    # def self.selectlist(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSelectList.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.selectlist(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppSelectList.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppSelectList, locator)
     end
 
     def self.selectlists(element_hash)
@@ -167,17 +95,8 @@ module TestCentricity
       end
     end
 
-    # def self.image(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppImage.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.image(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppImage.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppImage, locator)
     end
 
     def self.images(element_hash)
@@ -186,21 +105,12 @@ module TestCentricity
       end
     end
 
-    # def self.alert(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppAlert.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.alert(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppAlert.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::AppAlert, locator)
     end
 
-    def self.section(section_name, class_name, locator = 0)
-      class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, #{locator}, :page);end))
+    def self.section(section_name, obj, locator = 0)
+      define_page_element(section_name, obj, locator)
     end
 
     def self.sections(section_hash)
@@ -344,5 +254,16 @@ module TestCentricity
         end
       end
     end
+
+    private
+    
+    def self.define_page_element(element_name, obj, locator)
+      define_method(element_name) do
+        ivar_name = "@#{element_name}"
+        ivar = instance_variable_get(ivar_name)
+        return ivar if ivar
+        instance_variable_set(ivar_name, obj.new(element_name, self, locator, :page))
+      end
+    end
   end
 end

data/lib/testcentricity/app_core/screen_sections_helper.rb

@@ -80,17 +80,8 @@ module TestCentricity
       define_method(trait_name.to_s, &block)
     end
 
-    # def self.element(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppUIElement.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.element(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppUIElement.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppUIElement, locator)
     end
 
     def self.elements(element_hash)
@@ -99,17 +90,8 @@ module TestCentricity
       end
     end
 
-    # def self.button(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppButton.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.button(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppButton.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppButton, locator)
     end
 
     def self.buttons(element_hash)
@@ -118,17 +100,8 @@ module TestCentricity
       end
     end
 
-    # def self.textfield(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppTextField.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.textfield(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppTextField.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppTextField, locator)
     end
 
     def self.textfields(element_hash)
@@ -137,17 +110,8 @@ module TestCentricity
       end
     end
 
-    # def self.switch(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSwitch.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.switch(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppSwitch.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppSwitch, locator)
     end
 
     def self.switches(element_hash)
@@ -156,17 +120,8 @@ module TestCentricity
       end
     end
 
-    # def self.checkbox(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppCheckBox.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.checkbox(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppCheckBox.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppCheckBox, locator)
     end
 
     def self.checkboxes(element_hash)
@@ -175,17 +130,8 @@ module TestCentricity
       end
     end
 
-    # def self.label(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppLabel.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.label(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppLabel.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppLabel, locator)
     end
 
     def self.labels(element_hash)
@@ -194,17 +140,8 @@ module TestCentricity
       end
     end
 
-    # def self.list(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppList.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.list(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppList.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppList, locator)
     end
 
     def self.lists(element_hash)
@@ -213,17 +150,8 @@ module TestCentricity
       end
     end
 
-    # def self.selectlist(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSelectList.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.selectlist(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppSelectList.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppSelectList, locator)
     end
 
     def self.selectlists(element_hash)
@@ -232,17 +160,8 @@ module TestCentricity
       end
     end
 
-    # def self.image(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppImage.new("#{element_name}", self, #{locator}, :section);end))
-    # end
-
     def self.image(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::AppImage.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::AppImage, locator)
     end
 
     def self.images(element_hash)
@@ -251,10 +170,6 @@ module TestCentricity
       end
     end
 
-    # def self.alert(element_name, locator)
-    #   class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppAlert.new("#{element_name}", self, #{locator}, :page);end))
-    # end
-
     def self.alert(element_name, locator)
       define_method(element_name) do
         ivar_name = "@#{element_name}"
@@ -264,8 +179,8 @@ module TestCentricity
       end
     end
 
-    def self.section(section_name, class_name, locator = 0)
-      class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, #{locator}, :section);end))
+    def self.section(section_name, obj, locator = 0)
+      define_element(section_name, obj, locator)
     end
 
     def self.sections(section_hash)
@@ -487,5 +402,14 @@ module TestCentricity
     def section_not_found_exception(obj)
       raise ObjectNotFoundError.new("Section object '#{get_name}' (#{get_locator}) not found") unless obj
     end
+
+    def self.define_element(element_name, obj, locator)
+      define_method(element_name) do
+        ivar_name = "@#{element_name}"
+        ivar = instance_variable_get(ivar_name)
+        return ivar if ivar
+        instance_variable_set(ivar_name, obj.new(element_name, self, locator, :section))
+      end
+    end
   end
 end

data/lib/testcentricity/version.rb

@@ -1,3 +1,3 @@
 module TestCentricity
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

data/lib/testcentricity/web_core/page_objects_helper.rb

@@ -28,12 +28,7 @@ module TestCentricity
     #   element :siebel_busy,  "//html[contains(@class, 'siebui-busy')]"
     #
     def self.element(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::UIElement.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::UIElement, locator)
     end
 
     # Declare and instantiate a collection of generic UI Elements for this page object.
@@ -59,12 +54,7 @@ module TestCentricity
     #   button :login_button,    "//input[@id='submit_button']"
     #
     def self.button(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Button.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::Button, locator)
     end
 
     # Declare and instantiate a collection of buttons for this page object.
@@ -90,12 +80,7 @@ module TestCentricity
     #   textfield :password_field, 'consumer_password'
     #
     def self.textfield(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::TextField.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::TextField, locator)
     end
 
     # Declare and instantiate a collection of text fields for this page object.
@@ -179,12 +164,7 @@ module TestCentricity
     #   label :rollup_price_label, "//div[contains(@id, 'Rollup Item Price')]"
     #
     def self.label(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Label.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::Label, locator)
     end
 
     def self.labels(element_hash)
@@ -202,12 +182,7 @@ module TestCentricity
     #   link :shopping_basket_link, "//a[@href='shopping_basket']"
     #
     def self.link(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Link.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::Link, locator)
     end
 
     def self.links(element_hash)
@@ -224,12 +199,7 @@ module TestCentricity
     #   table :payments_table, "//table[@class='payments_table']"
     #
     def self.table(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Table.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::Table, locator)
     end
 
     def self.tables(element_hash)
@@ -247,12 +217,7 @@ module TestCentricity
     #   selectlist :gender_select,     "//select[@id='customer_gender']"
     #
     def self.selectlist(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::SelectList.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::SelectList, locator)
     end
 
     def self.selectlists(element_hash)
@@ -269,12 +234,7 @@ module TestCentricity
     #   list :x_axis_list, 'g.x-axis'
     #
     def self.list(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::List.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::List, locator)
     end
 
     def self.lists(element_hash)
@@ -292,12 +252,7 @@ module TestCentricity
     #   image :corporate_logo_image, "//img[@alt='MyCompany_logo']"
     #
     def self.image(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Image.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::Image, locator)
     end
 
     def self.images(element_hash)
@@ -314,12 +269,7 @@ module TestCentricity
     #   filefield :attach_file, 's_SweFileName'
     #
     def self.filefield(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::FileField.new(element_name, self, locator, :page))
-      end
+      define_page_element(element_name, TestCentricity::FileField, locator)
     end
 
     def self.filefields(element_hash)
@@ -426,8 +376,13 @@ module TestCentricity
     # @example
     #   section :search_form, SearchForm
     #
-    def self.section(section_name, class_name, locator = nil)
-      class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, "#{locator}", :page);end))
+    def self.section(section_name, obj, locator = nil)
+      define_method(section_name) do
+        ivar_name = "@#{section_name}"
+        ivar = instance_variable_get(ivar_name)
+        return ivar if ivar
+        instance_variable_set(ivar_name, obj.new(section_name, self, "#{locator}", :page))
+      end
     end
 
     def self.sections(section_hash)
@@ -707,5 +662,16 @@ module TestCentricity
         end
       end
     end
+
+    private
+
+    def self.define_page_element(element_name, obj, locator)
+      define_method(element_name) do
+        ivar_name = "@#{element_name}"
+        ivar = instance_variable_get(ivar_name)
+        return ivar if ivar
+        instance_variable_set(ivar_name, obj.new(element_name, self, locator, :page))
+      end
+    end
   end
 end

data/lib/testcentricity/web_core/page_sections_helper.rb

@@ -140,12 +140,7 @@ module TestCentricity
     #   element :basket_header,     'div.basket_header'
     #
     def self.element(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::UIElement.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::UIElement, locator)
     end
 
     # Declare and instantiate a collection of generic UI Elements for this page section.
@@ -171,12 +166,7 @@ module TestCentricity
     #   button :login_button,    "//input[@id='submit_button']"
     #
     def self.button(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Button.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::Button, locator)
     end
 
     # Declare and instantiate a collection of buttons for this page section.
@@ -202,12 +192,7 @@ module TestCentricity
     #   textfield :password_field, 'input#consumer_password'
     #
     def self.textfield(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::TextField.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::TextField, locator)
     end
 
     # Declare and instantiate a collection of text fields for this page section.
@@ -291,12 +276,7 @@ module TestCentricity
     #   label :rollup_price_label, "//div[contains(@id, 'Rollup Item Price')]"
     #
     def self.label(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Label.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::Label, locator)
     end
 
     def self.labels(element_hash)
@@ -314,12 +294,7 @@ module TestCentricity
     #   link :shopping_basket_link, "//a[@href='shopping_basket']"
     #
     def self.link(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Link.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::Link, locator)
     end
 
     def self.links(element_hash)
@@ -336,12 +311,7 @@ module TestCentricity
     #   table :payments_table, "//table[@class='payments_table']"
     #
     def self.table(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Table.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::Table, locator)
     end
 
     def self.tables(element_hash)
@@ -359,12 +329,7 @@ module TestCentricity
     #   selectlist :gender_select,     "//select[@id='customer_gender']"
     #
     def self.selectlist(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::SelectList.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::SelectList, locator)
     end
 
     def self.selectlists(element_hash)
@@ -381,12 +346,7 @@ module TestCentricity
     #   list :y_axis_list, 'g.y_axis'
     #
     def self.list(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::List.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::List, locator)
     end
 
     def self.lists(element_hash)
@@ -404,12 +364,7 @@ module TestCentricity
     #   image :corporate_logo_image, "//img[@alt='MyCompany_logo']"
     #
     def self.image(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::Image.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::Image, locator)
     end
 
     def self.images(element_hash)
@@ -426,12 +381,7 @@ module TestCentricity
     #   filefield :attach_file, 's_SweFileName'
     #
     def self.filefield(element_name, locator)
-      define_method(element_name) do
-        ivar_name = "@#{element_name}"
-        ivar = instance_variable_get(ivar_name)
-        return ivar if ivar
-        instance_variable_set(ivar_name, TestCentricity::FileField.new(element_name, self, locator, :section))
-      end
+      define_element(element_name, TestCentricity::FileField, locator)
     end
 
     def self.filefields(element_hash)
@@ -538,8 +488,13 @@ module TestCentricity
     # @example
     #   section :search_form, SearchForm
     #
-    def self.section(section_name, class_name, locator = nil)
-      class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, "#{locator}", :section);end))
+    def self.section(section_name, obj, locator = nil)
+      define_method(section_name) do
+        ivar_name = "@#{section_name}"
+        ivar = instance_variable_get(ivar_name)
+        return ivar if ivar
+        instance_variable_set(ivar_name, obj.new(section_name, self, "#{locator}", :section))
+      end
     end
 
     def self.sections(section_hash)
@@ -928,5 +883,13 @@ module TestCentricity
       raise ObjectNotFoundError.new("Section object '#{get_name}' (#{get_locator}) not found") unless section
     end
 
+    def self.define_element(element_name, obj, locator)
+      define_method(element_name) do
+        ivar_name = "@#{element_name}"
+        ivar = instance_variable_get(ivar_name)
+        return ivar if ivar
+        instance_variable_set(ivar_name, obj.new(element_name, self, locator, :section))
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler