touch_action 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 077f7c6670440d15c9b7ad71bcc803aea8d37a8a
+  data.tar.gz: 457853a034bcdb87a3bb100135fec0eb0fdeb8d0
+SHA512:
+  metadata.gz: d6f47ff42c9f1cefd26b047d2413a4d2eb4db5919dbb42b11b30bfd56129e22f8fb58cfcf9e73977fbef65f3a14f5dc8e86fc835bb6541e7001d455819b2b520
+  data.tar.gz: 1ae8e9abb5da2a00bc3fa55683918de1f18bf4295812b1269e10a78b17afc89cdd4f4b92c2246502047bfc48454ce95cef2532cd7092f9c7dca8578f34f965c6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.2.0
+
+* added execution block until YUI is loaded and gesture is performed
+* added readyState checking in order to wait for pages to load when using tap on links for example
+
 ## v1.1.0
 
 * fully refactored

data/lib/touch_action/capybara_rspec_helper.rb

@@ -6,8 +6,20 @@ module TouchAction
     module RspecHelper
 
       def touch_action locator, *args
+        page.driver.browser.manage.timeouts.script_timeout = 30
+        page.driver.browser.execute_async_script( TouchAction::ScriptGenerator.yui_loader )
         final_script = TouchAction::ScriptGenerator.generate_javascript(*args)
-        page.driver.browser.execute_script( final_script, locator )
+        page.driver.browser.execute_async_script( final_script, locator )
+        wait_for_page_ready_state
+      end
+
+    private
+      def wait_for_page_ready_state
+        sleep(0.5) # mobile browsers wait around 300ms when tapping to check if it isn's a double tap before triggering the link
+        end_time = Time.now + 30
+        while (page.driver.browser.execute_script('return document.readyState' != 'complete') || Time.now > end_time)
+          sleep(0.1)
+        end
       end
 
     end

data/lib/touch_action/javascripts/touch_action.js.erb

@@ -1,38 +1,15 @@
 (function( touch_action, $, undefined ) {
 
-  // private property
-  var execute_gesture = function() {
+  touch_action.perform_gesture = function(selenium_finalized_callback) {
+
     YUI().use('node-event-simulate', function(Y) {
       
       var node = Y.one(touch_action.element);
       node.simulateGesture(touch_action.gesture, touch_action.options);
         
-    });
-  };
-
-  // private method
-  function loadYui() { 
-
-    var head = document.getElementsByTagName('head')[0];
-    var script = document.createElement('script');
-    script.type = 'text/javascript';
-    script.src = "//yui.yahooapis.com/3.18.1/build/yui/yui-min.js";
-
-    script.onreadystatechange = execute_gesture;
-    script.onload = execute_gesture;
-
-    head.appendChild(script);
- 
-  };
-  // public method
-  touch_action.perform = function() {
-    
-    if (typeof YUI == 'undefined') {
-      loadYui();
-    } else {
-      execute_gesture();
-    };
+    });    
 
+    selenium_finalized_callback();
   };
 
 
@@ -44,4 +21,4 @@ touch_action.gesture = "<%=gesture%>";
 
 touch_action.options =  <%=options.to_json%>;
 
-touch_action.perform();
+touch_action.perform_gesture(arguments[arguments.length - 1]);

data/lib/touch_action/javascripts/yui_loader.js

@@ -0,0 +1,22 @@
+(function(callback) {
+    if (typeof YUI == 'undefined') {
+        var script = document.createElement('script');
+        var head = document.getElementsByTagName('head')[0];
+        var done = false;
+        script.onload = script.onreadystatechange = (function() {
+            if (!done && (!this.readyState || this.readyState == 'loaded' 
+                    || this.readyState == 'complete')) {
+                done = true;
+                script.onload = script.onreadystatechange = null;
+                head.removeChild(script);
+                callback();
+            }
+        });
+        script.type = 'text/javascript';
+        script.src = "//yui.yahooapis.com/3.18.1/build/yui/yui-min.js";
+        head.appendChild(script);
+    }
+    else {
+        callback();
+    }
+})(arguments[arguments.length - 1]);

data/lib/touch_action/script_generator.rb

@@ -13,6 +13,10 @@ module TouchAction
       rotate: {rotation: -75}
     }
 
+    def self.yui_loader
+      yui_loader_script = File.read(File.expand_path("../javascripts/yui_loader.js", __FILE__))
+    end
+
     def self.generate_javascript action, options = {}
       action = :flick if action == :swipe
       raise ArgumentError, "The touch action #{action} doesn't exist" unless ACTIONS_WITH_DEFAULT_OPTIONS[action]

data/lib/touch_action/selenium-webdriver.rb

@@ -5,8 +5,21 @@ module TouchAction
   module SeleniumWebdriver
 
     def touch_action *args
+      Selenium::WebDriver::Timeouts.new(bridge).script_timeout= 30
+      bridge.executeAsyncScript( TouchAction::ScriptGenerator.yui_loader )
       final_script = TouchAction::ScriptGenerator.generate_javascript(*args)
-      bridge.executeScript( final_script, self )
+      bridge.executeAsyncScript( final_script, self )
+      wait_for_page_ready_state      
+    end
+
+  private
+
+    def wait_for_page_ready_state
+      sleep(0.5) # mobile browsers wait around 300ms when tapping to check if it isn's a double tap before triggering the link
+      end_time = Time.now + 30
+      while (bridge.executeScript('return document.readyState' != 'complete') || Time.now > end_time)
+        sleep(0.1)
+      end
     end
 
   end

data/lib/touch_action/version.rb

@@ -1,3 +1,3 @@
 module TouchAction
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/touch_action/watir-webdriver.rb

@@ -3,9 +3,21 @@ require "touch_action/script_generator"
 
 module TouchAction
   module WatirWebdriver
+
     def touch_action *args
+      browser.driver.manage.timeouts.script_timeout = 30
+      browser.driver.execute_async_script( TouchAction::ScriptGenerator.yui_loader )
       final_script = TouchAction::ScriptGenerator.generate_javascript(*args)
-      browser.execute_script( final_script, self )
+      browser.driver.execute_async_script( final_script, self.wd  )
+      wait_for_page_ready_state
+    end
+
+
+  private
+
+    def wait_for_page_ready_state
+      sleep(0.5) # mobile browsers wait around 300ms when tapping to check if it isn's a double tap before triggering the link
+      browser.wait
     end
   end
 

data/spec/features/tap_spec.rb

@@ -6,23 +6,27 @@ RSpec.describe TouchAction do
       @browser.goto('http://localhost:9292/tap')
       element = @browser.div(id: 'myElement')
       element.touch_action :tap
-      sleep(5)
       expect(element.text).to include('tap')
     end
 
     it 'should tap link bound by FastClick' do
       @browser.goto('http://localhost:9292/tap')
       @browser.a(id: 'fastclick').touch_action :tap
-      sleep(5)
       expect(@browser.p(id: 'fast-click-test').text).to include('1 times')
     end
 
     it "should tap using webdriver capybara", js: true, use_webdriver: :capybara do
       visit('http://localhost:9292/tap')
       touch_action '#myElement', :tap
-      sleep(5)
       expect(find("#myElement").text).to include('tap')
     end
 
+    it "should tap using selenium", js: true, use_webdriver: :selenium do
+      @browser.navigate.to('http://localhost:9292/tap')
+      element = @browser.find_element(:id, 'myElement')
+      element.touch_action :tap
+      expect(element.text).to include('tap')
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -14,12 +14,12 @@ Dir["./spec/support/**/*.rb"].sort.each { |f| require f}
 end
 
 
-case ENV['PLATFORM']
+case ENV['platform']
 when 'ios'
   capabilities = {
     :deviceName => 'iPhone 5s',
     :browserName => 'Safari',
-    :platformVersion => '8.1',
+    :platformVersion => '7.1',
     :platformName => 'iOS',
     :app => 'safari',
     :newCommandTimeout => 9999
@@ -46,7 +46,7 @@ ENV['browser'] ||= 'firefox'
 RSpec.configure do |config|
 
   config.before(:each) do |example|
-    if ENV['PLATFORM']
+    if ENV['platform']
       @browser = Watir::Browser.new(Selenium::WebDriver.for(:remote, :desired_capabilities => capabilities, :url => ENV['appium_url']))
     else
       case example.metadata[:use_webdriver] 

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: touch_action
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Ricardo Nacif
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds touch gestures simulation to Watir, Selenium and Capybara using
@@ -147,9 +130,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -159,6 +141,7 @@ files:
 - lib/touch_action.rb
 - lib/touch_action/capybara_rspec_helper.rb
 - lib/touch_action/javascripts/touch_action.js.erb
+- lib/touch_action/javascripts/yui_loader.js
 - lib/touch_action/script_generator.rb
 - lib/touch_action/selenium-webdriver.rb
 - lib/touch_action/version.rb
@@ -190,27 +173,26 @@ files:
 homepage: https://github.com/Ricardonacif/touch_action
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds touch gestures simulation to Watir-WebDriver, Selenium-WebDriver and
   Capybara using YUI JS.
 test_files:

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3-p547