SurfCustomCalabash 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5783c8d5dd0f7b7aa8faf7e231b7c550b4c32bdd
-  data.tar.gz: b0e76a7a96c1d707d3b627789b334c8502e07f5f
+  metadata.gz: 719a47490b3ee7c43b29dfff52939628a76d8a3e
+  data.tar.gz: 9f0a757d2fa132e512298c31fdd49ae5cba54257
 SHA512:
-  metadata.gz: 384d562cfc65bd410888bbeb61e8e7b9814d62ec680617254381442239939b6ca90f85b696226d7a43bfb42e979e602766d4bfd51195a80b6aa3f515745b3b27
-  data.tar.gz: 045a65d035bab415b2f99c1428446f23d97f0dd5f3db3e0bcd1dd7c677ffa12dba6e8e5793c7297d281bf51d2911ae568d59f66276b742cc65eeb1fa9cac0e8b
+  metadata.gz: d9093b915c8bf382758cf40fb47358ea73f910129ff397bd97337adb40365f4a8ceab6e018434c41d684a7edbfd5cb6e58bc7bcef8949520c920d70d0b9bb462
+  data.tar.gz: 3a7d4fea4a6cd56da9e1e351df84dc52f23714a01a81e6cc0754ba8c61431e0499bbd916495e5fe39956fa632925d31667563a7d03bcb5e6e1ac5f381bf36a4f

data/lib/SurfCustomCalabash/CommonMethods.rb

@@ -1,9 +1,9 @@
 require 'rspec/expectations'
 
-module CommonMethods
+# module CommonMethods
 
 
-  def enter_text(text)
+  def enter_text_from_keyboard(text)
     wait_for_keyboard(:timeout=>5)
     keyboard_enter_text(text)
   end
@@ -108,16 +108,6 @@ module CommonMethods
     end
   end
 
-  # Drag element from one place to place of other element
-  def drag_element(element_from , element_to)
-    x_from = get_coordinate_x(element_from)
-    y_from = get_coordinate_y(element_from)
-
-    x_to = get_coordinate_x(element_to)
-    y_to = get_coordinate_y(element_to)
-    drag_coordinates(x_from, y_from, x_to, y_to, 10, 0.5, 0.5)
-  end
-
   # -------------------------------------------------Asserts------------------------------------------------------------
   def assert_eql_with_rescue(element1, element2)
     begin
@@ -225,6 +215,15 @@ module CommonMethods
     return coordinate.to_i
   end
 
+  # Drag element from one place to place of other element
+  def drag_element(element_from , element_to)
+    x_from = get_coordinate_x(element_from)
+    y_from = get_coordinate_y(element_from)
+
+    x_to = get_coordinate_x(element_to)
+    y_to = get_coordinate_y(element_to)
+    drag_coordinates(x_from, y_from, x_to, y_to, 10, 0.5, 0.5)
+  end
 
   # if elements cross - return true, if not - false
   def cross_coordinate(element_front, element_behind)
@@ -255,12 +254,13 @@ module CommonMethods
 
   # if apps support two localization, this method check exists text in different locations
   def text_with_locale(text_locale1, text_locale2)
-    if element_exists("* {text BEGINSWITH '#{text_locale2}'}")
-      puts (element_exists("* {text BEGINSWITH '#{text_locale2}'}"))
-      return "* {text BEGINSWITH '#{text_locale2}'}"
-    elsif element_exists("* {text BEGINSWITH '#{text_locale1}'}")
-      puts(element_exists("* {text BEGINSWITH '#{text_locale1}'}"))
-      return "* {text BEGINSWITH '#{text_locale1}'}"
+    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
     else
       return ("No such query!")
     end
@@ -277,4 +277,4 @@ module CommonMethods
     end
   end
 
-end
+# end

data/lib/SurfCustomCalabash/DroidMethods.rb

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

data/lib/SurfCustomCalabash/IosMethods.rb

@@ -1,8 +1,17 @@
 require 'calabash-cucumber/ibase'
 require 'SurfCustomCalabash/CommonMethods'
 
-module IosMethods
-  include CommonMethods
+# module IosMethods
+#   include CommonMethods
+
+  # tap on Done on keyboard
+  def submit_keyboard
+    if element_exists("* marked:'Toolbar Done Button'")
+      touch("* marked:'Toolbar Done Button'")
+    else
+      tap_keyboard_action_key
+    end
+  end
 
   #----------------------------------------------Custom Swipe iOS-------------------------------------------------------
   def strong_swipe(dir)
@@ -86,4 +95,4 @@ module IosMethods
     swipe(:down, :offset => {:x => 0, :y => -200})
   end
 
-end
+# end

data/lib/SurfCustomCalabash/version.rb

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

metadata

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