itms_automation 2.3 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 904e4a78575ac33d7dface663087ef82e4ab44ad5113847e6202f270a1b24810
-  data.tar.gz: 712af3032a9d31b2c87faa33b2160d813ad8b86e64c9a2295cc8a4e33cb5dde4
+  metadata.gz: 8449e9bd1c31ed115ca78196653a0afce15d4b3ff2120fb8bec34eff820fa448
+  data.tar.gz: e4c592c5a209d0d2e40a9967521b1c518b09f213efc623a632e31dfbd9f44759
 SHA512:
-  metadata.gz: '0458938e63e8abf1dcf8b08af8aa1558e16b880cde45e59f37721ec1d17ec943a47995287f7ecb6a5336f9c5d946b6db420ac896e37e72fac0c5f6bd5d2a755d'
-  data.tar.gz: c9d84f9eaaf65f3eac427bcd7eb582376dba266d26e7d3aa7522b224609e59138174e732b0d5e88dbd9a2badfb1a99dde45f150fe8a0cc10e0806aa65e6444c4
+  metadata.gz: b8dfcd9f35bfd4a32f8a03ee064d210a9b4c0e75613cae2eb1989cd15ec992cb5d6960e2553fbefbbcef90e6a4a7d2c03e844637379ef272ebbef6c3b249d9a3
+  data.tar.gz: d1df9cbea128904e93376ab6c4d977434d7436240554849d34eabd392c1ff641ccb9db4eb274ed6eaf11d7ef1a409c833285ade940139fe015e88f77666e23f2

data/lib/itms_automation/auto_util.rb

@@ -305,7 +305,7 @@ def find_object string_object
         end
         if foundElements == nil or foundElements.length == 0
           continue_run_count += 1
-          print "Finding the object..." if continue_run_count == 2
+          print "Finding the object #{string_object}..." if continue_run_count == 2
           print "." if continue_run_count > 2
           currentTime = Time.new.to_i
           puts "" if (currentTime - startTime) >= $wait_time
@@ -700,3 +700,8 @@ def find_object_check_ref_object(ref_object, ref_type, target_element)
 
   return false;
 end
+
+def get_variable_name_from_text(text)
+  regex = /\${(.*?)}/
+  text[regex, 1]
+end

data/lib/itms_automation/version.rb

@@ -1,3 +1,3 @@
 module ItmsAutomation
-  VERSION = "2.3"
+  VERSION = "2.4"
 end

data/lib/itms_automation/web_steps_helper.rb

@@ -5,6 +5,8 @@ require "open-uri"
 def execute_openbrowser(url_site)
   start = Time.now
   begin
+    variable_name = get_variable_name_from_text(url_site)
+    url_site = get_var(variable_name) unless variable_name.nil?
     if url_site == ""
       print_log("failed", start, __method__, url_site)
       raise "Error: Null web page URL."
@@ -96,6 +98,8 @@ def execute_settext(element, text)
   foundElement = find_object(element)
   if foundElement != nil
     begin
+      variable_name = get_variable_name_from_text(text)
+      text = get_var(variable_name) unless variable_name.nil?
       foundElement.set(text)
       print_log("passed", start, __method__, element, text)
     rescue StandardError => e
@@ -125,6 +129,8 @@ def switch_to_window_by_title(window_title)
   @window_found = false
   page.driver.browser.window_handles.each { |handle|
     page.driver.browser.switch_to.window handle
+    variable_name = get_variable_name_from_text(window_title)
+    window_title = get_var(variable_name) unless variable_name.nil?
     if page.title == window_title
       @window_found = true
       print_log("passed", start, __method__, window_title)
@@ -162,6 +168,8 @@ end
 def verify_title(expected_title)
   start = Time.now
   begin
+    variable_name = get_variable_name_from_text(expected_title)
+    expected_title = get_var(variable_name) unless variable_name.nil?
     page_title = page.title
     expect(page_title).to eq expected_title
     print_log("passed", start, __method__, expected_title)
@@ -175,6 +183,8 @@ end
 def verify_alert_text(text)
   start = Time.now
   begin
+    variable_name = get_variable_name_from_text(text)
+    text = get_var(variable_name) unless variable_name.nil?
     alert = page.driver.browser.switch_to.alert.text
     expect(alert).to eq text
     print_log("passed", start, __method__, text)
@@ -238,6 +248,8 @@ end
 def execute_javascript(script)
   start = Time.now
   begin
+    variable_name = get_variable_name_from_text(script)
+    script = get_var(variable_name) unless variable_name.nil?
     page.execute_script(script)
     print_log("passed", start, __method__, script)
   rescue Exception => e
@@ -422,6 +434,8 @@ def verify_element_text(element, value)
   foundElement = find_object(element)
   if foundElement != nil
     begin
+      variable_name = get_variable_name_from_text(value)
+      value = get_var(variable_name) unless variable_name.nil?
       actual_value = foundElement.text()
       expect(actual_value).to eq value
       print_log("passed", start, __method__, element, value)
@@ -440,6 +454,8 @@ def verify_element_not_has_text(element, value)
   foundElement = find_object(element)
   if foundElement != nil
     begin
+      variable_name = get_variable_name_from_text(value)
+      value = get_var(variable_name) unless variable_name.nil?
       actual_value = foundElement.text()
       expect(actual_value).not_to eql value
       print_log("passed", start, __method__, element, value)
@@ -458,6 +474,8 @@ def verify_element_value(element, value)
   foundElement = find_object(element)
   if foundElement != nil
     begin
+      variable_name = get_variable_name_from_text(value)
+      value = get_var(variable_name) unless variable_name.nil?
       actual_value = foundElement.value()
       expect(actual_value).to eq value
       print_log("passed", start, __method__, element, value)
@@ -476,6 +494,8 @@ def verify_element_not_has_value(element, value)
   foundElement = find_object(element)
   if foundElement != nil
     begin
+      variable_name = get_variable_name_from_text(value)
+      value = get_var(variable_name) unless variable_name.nil?
       actual_value = foundElement.value()
       expect(actual_value).not_to eql value
       print_log("passed", start, __method__, element, value)
@@ -497,6 +517,9 @@ def execute_checkproperty(element, property, negate, value, isSpecialChar = fals
   end
   foundElement = find_object(element)
 
+  variable_name = get_variable_name_from_text(value)
+  value = get_var(variable_name) unless variable_name.nil?
+
   check = false
   if foundElement == nil and value == ""
     check = true

data/project/features/support/hooks.rb

@@ -28,43 +28,37 @@ end
 def getDriver
   case ENV['BROWSER']
   when "chrome"
-    @chrome_options = loadYAMLfile('config/chrome_options.yaml')
     Capybara.register_driver :selenium do |app|
-      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'],:desired_capabilities => Selenium::WebDriver::Remote::Capabilities.chrome(chromeOptions: @chrome_options))
+      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'],:desired_capabilities => Selenium::WebDriver::Remote::Capabilities.chrome())
     end
     Capybara.current_driver = :selenium
   when "firefox"
-    @firefox_options = loadYAMLfile('config/firefox_options.yaml')
     Capybara.register_driver :selenium do |app|
-      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.firefox(firefoxOptions: @firefox_options))
+      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.firefox())
     end
     Capybara.current_driver = :selenium
   when "safari"
-    @safari_options = loadYAMLfile('config/safari_options.yaml')
     Capybara.register_driver :selenium do |app|
-      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.safari(safariOptions: @safari_options))
+      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.safari())
     end
     Capybara.current_driver = :selenium
   when "ie"
-    @ie_options = loadYAMLfile('config/ie_options.yaml')
     Capybara.register_driver :selenium do |app|
-      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.internet_explorer(ieOptions: @ie_options))
+      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.internet_explorer())
     end
     Capybara.current_driver = :selenium
   when "chrome_headless"
-    @chrome_headless_options = loadYAMLfile('config/chrome_headless_options.yaml')
     Capybara.register_driver :selenium do |app|
-      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.chrome(chromeOptions: @chrome_headless_options))
+      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => Selenium::WebDriver::Remote::Capabilities.chrome(chromeOptions: { args: %w(headless disable-gpu) }))
     end
     Capybara.current_driver = :selenium
   when "remote"
-    @capabilities = loadYAMLfile('config/remote_options.yaml')
     Capybara.register_driver :selenium do |app|
-      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'], :desired_capabilities => @capabilities)
+      Capybara::Selenium::Driver.new(app, :url => ENV['SERVER_URL'])
     end
     Capybara.current_driver = :selenium
   else
-    raise "❌  ERROR: Unsupported browser: #{ENV['BROWSER']}. Available: chrome || chrome headless || firefox || safari || ie || remote"
+    raise "❌ ERROR: Unsupported browser: #{ENV['BROWSER']}. Available: chrome || chrome headless || firefox || safari || ie || remote"
   end
   unless ENV["SCREEN_RESOLUTION"].nil?
     screen_resolution = ENV["SCREEN_RESOLUTION"].split("x")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itms_automation
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.4'
 platform: ruby
 authors:
 - Anh Pham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -158,13 +158,6 @@ files:
 - project/Gemfile.lock
 - project/README.md
 - project/Rakefile
-- project/config/chrome_headless_options.yaml
-- project/config/chrome_options.yaml
-- project/config/firefox_headless_options.yaml
-- project/config/firefox_options.yaml
-- project/config/ie_options.yaml
-- project/config/remote_options.yaml
-- project/config/safari_options.yaml
 - project/cucumber.yml
 - project/features/TestSuite/WebGUI.feature
 - project/features/step_definitions/lib_steps/steps_definition.rb

data/project/config/chrome_headless_options.yaml

@@ -1 +0,0 @@
-args: ["--headless","--disable-gpu",--no-sandbox]

data/project/config/chrome_options.yaml

@@ -1,6 +0,0 @@
-args: ["--start-maximized","--disable-infobars","--incognito"]
-prefs: {
-      password_manager_enabled: false,
-      default_content_settings: {popups: 0},
-      content_settings: {pattern_pairs: {'*': {'multiple-automatic-downloads': 1}}}
-    }

data/project/config/firefox_headless_options.yaml

@@ -1 +0,0 @@
-browser.download.downloadDir: '/home/seluser'

data/project/config/firefox_options.yaml

@@ -1 +0,0 @@
-browser.download.downloadDir: '/home/seluser'

data/project/config/ie_options.yaml

@@ -1 +0,0 @@
-mobileEmulation: {deviceName: "iPhone X"}

data/project/config/remote_options.yaml

@@ -1,6 +0,0 @@
-args: ["--start-maximized","--disable-infobars","--incognito", "--user-agent='Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile    /9A334 Safari/7534.48.3'"]
-prefs: {
-      password_manager_enabled: false,
-      default_content_settings: {popups: 0},
-      content_settings: {pattern_pairs: {'*': {'multiple-automatic-downloads': 1}}}
-    }

data/project/config/safari_options.yaml

@@ -1 +0,0 @@
-mobileEmulation: {deviceName: "iPhone X"}