SurfCustomCalabash 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719a47490b3ee7c43b29dfff52939628a76d8a3e
-  data.tar.gz: 9f0a757d2fa132e512298c31fdd49ae5cba54257
+  metadata.gz: bc36d47dbb465e8902af53b0d6519f9caf644ef1
+  data.tar.gz: b6fab405830127ae15c75932c68ec40114b4cd74
 SHA512:
-  metadata.gz: d9093b915c8bf382758cf40fb47358ea73f910129ff397bd97337adb40365f4a8ceab6e018434c41d684a7edbfd5cb6e58bc7bcef8949520c920d70d0b9bb462
-  data.tar.gz: 3a7d4fea4a6cd56da9e1e351df84dc52f23714a01a81e6cc0754ba8c61431e0499bbd916495e5fe39956fa632925d31667563a7d03bcb5e6e1ac5f381bf36a4f
+  metadata.gz: 41d1423cf682108dbde016efebcfa9a36b7ab6ac77d409aafc01bede5a1dd5209d93440f9225fe64ed04a7724380925b7d01ea43b1c19815db8eeafc2051a307
+  data.tar.gz: 739e4e246b6c0f2b40691b7f8d75b61cc4059748a316d156906faf1b2b62533d772b0efc3e80134f83352e7b3ff760c6ce1e02fec1d199f4b35618a665eb156e

data/lib/SurfCustomCalabash/CommonMethods.rb

@@ -1,8 +1,5 @@
 require 'rspec/expectations'
 
-# module CommonMethods
-
-
   def enter_text_from_keyboard(text)
     wait_for_keyboard(:timeout=>5)
     keyboard_enter_text(text)
@@ -252,17 +249,68 @@ require 'rspec/expectations'
     sleep(1)
   end
 
+  # --------------------------------------------------Localization------------------------------------------------------
+  # get locale apps - Ru or Eng
+  # parameter - element with text
+  def get_app_location(element)
+    sleep(1.5)
+    if element_exists(element)
+      text_element = remember(element)
+      if check_cyrillic(text_element)
+        locale = 'RUS'
+      else
+        locale = 'ENG'
+      end
+    else
+      p "Fail localization"
+    end
+    p locale
+    return locale
+  end
+
+  # check cyrillic symbols in string
+  def check_cyrillic(str)
+    regexp = /\p{Cyrillic}+.*?\.?/
+    if str.match(regexp).nil?
+      return false
+    else
+      return true
+    end
+  end
+
   # if apps support two localization, this method check exists text in different locations
   def text_with_locale(text_locale1, text_locale2)
     sleep(1)
-    locale_el1 = "* {text CONTAINS '#{text_locale1}'}"
-    locale_el2 = "* {text CONTAINS '#{text_locale2}'}"
-    if element_exists(locale_el1)
-      return locale_el1
-    elsif element_exists(locale_el2)
-      return locale_el2
+
+    # $locale is global variables
+    # $locale setup in first app launch
+    if !$locale.nil?
+      if check_cyrillic(text_locale1)
+        rus_locale = "* {text CONTAINS '#{text_locale1}'}"
+        eng_locale = "* {text CONTAINS '#{text_locale2}'}"
+      elsif check_cyrillic(text_locale2)
+        rus_locale = "* {text CONTAINS '#{text_locale2}'}"
+        eng_locale = "* {text CONTAINS '#{text_locale1}'}"
+      end
+
+      if $locale == "RUS"
+        return rus_locale
+      elsif $locale == "ENG"
+        return eng_locale
+      end
     else
-      return ("No such query!")
+      # if $locale is not Rus or Eng
+      # wait element on screen with text_locale1 or text_locale2
+      locale_el1 = "* {text CONTAINS '#{text_locale1}'}"
+      locale_el2 = "* {text CONTAINS '#{text_locale2}'}"
+
+      if element_exists(locale_el1)
+        return locale_el1
+      elsif element_exists(locale_el2)
+        return locale_el2
+      else
+        return ("No such query!")
+      end
     end
   end
 
@@ -277,4 +325,3 @@ require 'rspec/expectations'
     end
   end
 
-# end

data/lib/SurfCustomCalabash/DroidMethods.rb

@@ -1,10 +1,6 @@
 require 'calabash-android'
 require 'SurfCustomCalabash/CommonMethods'
 
-# module DroidMethods
-#   include Calabash::Android::Operations
-#   include CommonMethods
-
   def close_keyboard
     if keyboard_visible?
       hide_soft_keyboard
@@ -91,4 +87,3 @@ require 'SurfCustomCalabash/CommonMethods'
     perform_action('drag', 50, 50, 15, 75, 4)
   end
 
-# end

data/lib/SurfCustomCalabash/IosMethods.rb

@@ -1,9 +1,6 @@
 require 'calabash-cucumber/ibase'
 require 'SurfCustomCalabash/CommonMethods'
 
-# module IosMethods
-#   include CommonMethods
-
   # tap on Done on keyboard
   def submit_keyboard
     if element_exists("* marked:'Toolbar Done Button'")
@@ -94,5 +91,3 @@ require 'SurfCustomCalabash/CommonMethods'
   def ptr
     swipe(:down, :offset => {:x => 0, :y => -200})
   end
-
-# end

data/lib/SurfCustomCalabash/version.rb

@@ -1,3 +1,3 @@
 module SurfCustomCalabash
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: SurfCustomCalabash
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alexey Hripunov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler