itms_automation 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2481f496f80a331329c1a1929a81b9020e439c115b13361aa1bdb0028c13bbe5
-  data.tar.gz: 6e4e510b6601947670f59cf5ccfb88dae5e5e6f6aa6bf45dcc71e146ea27c039
+  metadata.gz: 897907ab0ff6c78bcae35d678aa285987350c11426f5a8811ac03402656255e2
+  data.tar.gz: c01b97b08442ea253d20a306a313ed19742a6d859a756f827a194144bb2754f0
 SHA512:
-  metadata.gz: 0a8428f49bf58f222861f188227fe0a70f77d348c401f437054e9a5d6b1229cc666869f7896cb4da7f25cbf749b78e2dffcd66ad8ffc096b679fce30e783644c
-  data.tar.gz: 1b7963dd421b3dec632ab47726709eaa22199e74e119ecd67e8fd168148805ff93bd5c416b75bb3610a031235d53107b8762304cf860aae5aa0c0b08f53cb04f
+  metadata.gz: 6b0b55e6700794b6457785b8b362d7c2996ac0c58f013b7af1edd8de8a1b32258701f8a8805712f3caf534fe64211ce52220c8236a35d9039fa8646d4f09ddf9
+  data.tar.gz: 0a01a6f5818f2b5c19d734bbb9965c2e7249999a36e63d02d4ba09a8eeafc1b62f9d9b56a84caed0b8e5a139189e0a7f7e033a3f80784732b3692fa01cf133af

data/lib/itms_automation/database_steps_helper.rb

@@ -20,6 +20,8 @@ def create_database_connection config
     if !@connection.connected?
       raise "Error: Can't connect to database"
     end
+  rescue JSON::ParserError
+    raise "Create database connection error: Please check your connection configuration"
   rescue Exception => e
     raise "Create database connection error: #{e.message}"
   end
@@ -55,29 +57,41 @@ def print_sql_result
 end
 
 def verify_sql_result_contain expected_string
-  @expected = JSON.parse(expected_string)
-  is_contain = false
-  if @expected.kind_of?(Array) && @expected.length > @result.length
-    raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not includes your expected"
-  end
-  @result.each do |row|
-    is_contain = do_assertion_json(@expected, row)
-    break if !@expected.kind_of?(Array) && is_contain == true
-  end
-  unless is_contain
-    raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not includes your expected"
+  begin
+    @expected = JSON.parse(expected_string)
+    is_contain = false
+    if @expected.kind_of?(Array) && @expected.length > @result.length
+      raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not includes your expected"
+    end
+    @result.each do |row|
+      is_contain = do_assertion_json(@expected, row)
+      break if !@expected.kind_of?(Array) && is_contain == true
+    end
+    unless is_contain
+      raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not includes your expected"
+    end
+  rescue JSON::ParserError
+    raise "Verify SQL result contain error: Please check your expected"
+  rescue Exception => e
+    raise "Verify SQL result contain error: #{e.message}"
   end
 end
 
 def verify_sql_result_equal expected_string
-  @expected = JSON.parse(expected_string)
-  if !@expected.kind_of?(Array) || @expected.length != @result.length
-    raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not equal with your expected"
-  end
-  @result.each_with_index do |row, index|
-    is_contain = row.to_s == @expected[index].to_s
-    unless is_contain
+  begin
+    @expected = JSON.parse(expected_string)
+    if !@expected.kind_of?(Array) || @expected.length != @result.length
       raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not equal with your expected"
     end
+    @result.each_with_index do |row, index|
+      is_contain = row.to_s == @expected[index].to_s
+      unless is_contain
+        raise "Expected: #{@expected}\nGot: #{@result}\nQuery result not equal with your expected"
+      end
+    end
+  rescue JSON::ParserError
+    raise "Verify SQL result equal error: Please check your expected"
+  rescue Exception => e
+    raise "Verify SQL result equal error: #{e.message}"
   end
 end

data/lib/itms_automation/version.rb

@@ -1,3 +1,3 @@
 module ItmsAutomation
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

data/lib/itms_automation/web_steps_helper.rb

@@ -169,14 +169,11 @@ def execute_javascript(script)
   end
 end
 
-def execute_select(element, text)
-  #select(text, :xpath => element)
+def execute_select(element, option)
   foundElement = find_object(element)
   if foundElement != nil
     begin
-      option_value = page.evaluate_script("$(\"##{foundElement[:id]} option:contains('#{text}')\").val()")
-      page.execute_script("$('##{foundElement[:id]}').val('#{option_value}')")
-      page.execute_script("$('##{foundElement[:id]}').trigger('liszt:updated').trigger('change')")
+      Selenium::WebDriver::Support::Select.new(page.driver.browser.find_element(:xpath, "#{element}")).select_by(:text, "#{option}")
     rescue Exception => e
       raise "❌  ERROR: #{e}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itms_automation
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Anh Pham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver