watir-scroll 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cceab63479c924c0d51f2db30eb14965d9f4bd60
+  data.tar.gz: 06e0b59749583cf76f3de1cfe2dc0e0591b993c4
+SHA512:
+  metadata.gz: 464e8bd295266dea9a9f78a4895e3d158819e6577285c7c9c511efc44052f771a0c750b3f3ee348613d4ee8455782c6e86f3483639c17815d3dbc884097128fc
+  data.tar.gz: 550afb45f418fc3f966d41bbf0e3884324da96c5f01ee1a91d35a6e0926de69f1934219fe91c5f646cc7e298d87ddbc9227fa5ad6946e863762605683bb8c418

data/.travis.yml

@@ -1,6 +1,8 @@
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - export DISPLAY=:99
+  - sh -e /etc/init.d/xvfb start
+  - spec/support/travis.sh
+  - export PATH="$(pwd)/bin:$PATH"

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Alex Rodionov
+Copyright (c) 2016 Alex Rodionov
 
 MIT License
 

data/README.md

@@ -1,4 +1,4 @@
-# watir-scroll [![Build Status](https://travis-ci.org/p0deje/watir-scroll.png?branch=master)](https://travis-ci.org/p0deje/watir-scroll) [![Gem Version](https://badge.fury.io/rb/watir-scroll.png)](http://badge.fury.io/rb/watir-scroll)
+# watir-scroll [![Build Status](https://travis-ci.org/p0deje/watir-scroll.svg?branch=master)](https://travis-ci.org/p0deje/watir-scroll) [![Gem Version](https://badge.fury.io/rb/watir-scroll.svg)](http://badge.fury.io/rb/watir-scroll)
 
 Scrolling API for [watir-webdriver](http://github.com/watir/watir-webdriver).
 
@@ -24,14 +24,24 @@ $ gem install watir-scroll
 
 ## Usage
 
-```ruby
-button = browser.button(:text => 'Click')
+### Scrolling on Browser Window Level
 
+```ruby
 browser.scroll.to :top      # scrolls to the top of the page
 browser.scroll.to :center   # scrolls to the center of the page
 browser.scroll.to :bottom   # scrolls to the bottom of the page
 browser.scroll.to [10, 10]  # scrolls to coordinates x and y
-browser.scroll.to button    # scrolls to element
+```
+
+### Scrolling To Elements
+
+
+```ruby
+button = browser.button(text: 'Click')
+
+button.scroll.to          # scrolls element to the top
+button.scroll.to :center  # scrolls element to the center
+button.scroll.to :bottom  # scrolls element to the bottom
 ```
 
 ## Contributing

data/Rakefile

@@ -7,4 +7,3 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 task default: :spec
-

data/lib/watir-scroll.rb

@@ -1,4 +1,6 @@
 require "watir-webdriver"
 require "watir-scroll/browser"
-require "watir-scroll/scroll"
+require "watir-scroll/browser/scroll"
+require "watir-scroll/element"
+require "watir-scroll/element/scroll"
 require "watir-scroll/version"

data/lib/watir-scroll/{scroll.rb → browser/scroll.rb}

@@ -8,18 +8,16 @@ module Watir
 
       #
       # Scrolls to position.
-      # @param [Symbol, Watir::Element, Array<Fixnum>] param
+      # @param [Symbol, Array<Fixnum>] param
       #
       def to(param)
         args = case param
                when :top, :start
                  'window.scrollTo(0, 0);'
                when :center
-                 'window.scrollTo(document.body.scrollWidth / 2, document.body.scrollHeight / 2);'
+                 'window.scrollTo(window.outerWidth / 2, window.outerHeight / 2);'
                when :bottom, :end
                  'window.scrollTo(0, document.body.scrollHeight);'
-               when Watir::Element
-                 ['arguments[0].scrollIntoView();', param]
                when Array
                  ['window.scrollTo(arguments[0], arguments[1]);', Integer(param[0]), Integer(param[1])]
                else

data/lib/watir-scroll/element.rb

@@ -0,0 +1,13 @@
+module Watir
+  class Element
+
+    #
+    # Returns scrolling object.
+    # @return [Scroll]
+    #
+    def scroll
+      Scroll.new(self)
+    end
+
+  end # Element
+end # Watir

data/lib/watir-scroll/element/scroll.rb

@@ -0,0 +1,36 @@
+module Watir
+  class Element
+    class Scroll
+
+      def initialize(element)
+        @element = element
+      end
+
+      #
+      # Scrolls to element.
+      # @param [Symbol] param
+      #
+      def to(param = :top)
+        args = case param
+               when :top, :start
+                 ['arguments[0].scrollIntoView();', @element]
+               when :center
+                 script = <<-JS
+                   var elementRect = arguments[0].getBoundingClientRect();
+                   var top = elementRect.top - (window.innerHeight / 2);
+                   var left = elementRect.left - (window.innerWidth / 2);
+                   window.scrollTo(left, top);
+                 JS
+                 [script, @element]
+               when :bottom, :end
+                 ['arguments[0].scrollIntoView(false);', @element]
+               else
+                 raise ArgumentError, "Don't know how to scroll element to: #{param}!"
+               end
+
+        @element.browser.execute_script(*args)
+      end
+
+    end # Scroll
+  end # Element
+end # Watir

data/lib/watir-scroll/version.rb

@@ -2,7 +2,7 @@ module Watir
   class Browser
     class Scroll
 
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
 
     end # Scroll
   end # Browser

data/spec/spec_helper.rb

@@ -1,55 +1,24 @@
 require "watir-scroll"
 
-HTML = <<-HTML
-  <html>
-    <head>
-      <script>
-        function elementInViewport(el) {
-          var top = el.offsetTop;
-          var left = el.offsetLeft;
-          var width = el.offsetWidth;
-          var height = el.offsetHeight;
-
-          while(el.offsetParent) {
-            el = el.offsetParent;
-            top += el.offsetTop;
-            left += el.offsetLeft;
-          }
-
-          return (
-            top < (window.pageYOffset + window.innerHeight) &&
-            left < (window.pageXOffset + window.innerWidth) &&
-            (top + height) > window.pageYOffset &&
-            (left + width) > window.pageXOffset
-          );
-        }
-      </script>
-    </head>
-    <body>
-      <button>Top</button
-      #{'<br />' * 300}
-      <button>Bottom</button
-    </body>
-  </html>
-HTML
-
-
 RSpec.configure do |spec|
   spec.before(:all) do
-    @browser = Watir::Browser.new
-    @browser.goto "data:text/html,#{HTML}"
+    opts = {}
+    if ENV['TRAVIS']
+      Selenium::WebDriver::Chrome.path = "#{File.dirname(__FILE__)}/../bin/google-chrome"
+      opts[:args] = ['no-sandbox']
+    end
+    @browser = Watir::Browser.new(:chrome, opts)
   end
 
   spec.after(:all) do
     @browser.quit
   end
 
-  spec.after(:each) do
-    @browser.refresh
+  spec.before(:each) do
+    @browser.goto "file://#{File.dirname(__FILE__)}/support/test.html"
   end
 
-
   def visible?(el)
-    @browser.execute_script('return elementInViewport(arguments[0]);', el)
+    @browser.execute_script('return isElementInViewport(arguments[0]);', el)
   end
 end

data/spec/support/test.html

@@ -0,0 +1,32 @@
+<html>
+  <head>
+    <script>
+      function isElementInViewport(el) {
+        var top = el.offsetTop;
+        var left = el.offsetLeft;
+        var width = el.offsetWidth;
+        var height = el.offsetHeight;
+
+        while (el.offsetParent) {
+          el = el.offsetParent;
+          top += el.offsetTop;
+          left += el.offsetLeft;
+        }
+
+        return (
+          top < (window.pageYOffset + window.innerHeight) &&
+          left < (window.pageXOffset + window.innerWidth) &&
+          (top + height) > window.pageYOffset &&
+          (left + width) > window.pageXOffset
+        );
+      }
+    </script>
+  </head>
+  <body>
+    <div style="height: 180%; position: relative;">
+      <button style="position: absolute;">Top</button>
+      <button style="position: absolute; top: 50%;">Center</button>
+      <button style="position: absolute; bottom: 0;">Bottom</button>
+    </div>
+  </body>
+</html>

data/spec/support/travis.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+mkdir bin/
+
+# https://omahaproxy.appspot.com
+# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/
+CHROME_REVISION=386257
+curl -L -O "http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/${CHROME_REVISION}/chrome-linux.zip"
+unzip chrome-linux.zip
+ln -s "$(pwd)/chrome-linux/chrome" "$(pwd)/bin/google-chrome"
+
+CHROMEDRIVER_VERSION=$(curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+curl -L -O "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
+unzip chromedriver_linux64.zip
+ln -s "$(pwd)/chromedriver" "$(pwd)/bin/chromedriver"

data/spec/{watir-scroll_spec.rb → watir-scroll/browser_spec.rb}

@@ -1,32 +1,29 @@
 require "spec_helper"
 
-describe "watir-scoll" do
+describe Watir::Browser do
   describe "#scroll.to" do
     it "scrolls to the top of the page" do
       @browser.scroll.to :bottom
       @browser.scroll.to :top
       expect(visible?(@browser.button(text: 'Top'))).to eq(true)
+      expect(visible?(@browser.button(text: 'Center'))).to eq(true)
       expect(visible?(@browser.button(text: 'Bottom'))).to eq(false)
     end
 
     it "scrolls to the center of the page" do
       @browser.scroll.to :center
       expect(visible?(@browser.button(text: 'Top'))).to eq(false)
+      expect(visible?(@browser.button(text: 'Center'))).to eq(true)
       expect(visible?(@browser.button(text: 'Bottom'))).to eq(false)
     end
 
     it "scrolls to the bottom of the page" do
       @browser.scroll.to :bottom
       expect(visible?(@browser.button(text: 'Top'))).to eq(false)
+      expect(visible?(@browser.button(text: 'Center'))).to eq(true)
       expect(visible?(@browser.button(text: 'Bottom'))).to eq(true)
     end
 
-    it "scrolls to element" do
-      button = @browser.button(text: 'Bottom')
-      @browser.scroll.to button
-      expect(visible?(button)).to eq(true)
-    end
-
     it "scrolls to coordiantes" do
       button = @browser.button(text: 'Bottom')
       @browser.scroll.to [button.wd.location.x, button.wd.location.y]

data/spec/watir-scroll/element_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Watir::Element do
+  describe "#scroll.to" do
+    it "scrolls to element (top)" do
+      @browser.button(text: 'Center').scroll.to
+      expect(visible?(@browser.button(text: 'Top'))).to eq(false)
+      expect(visible?(@browser.button(text: 'Center'))).to eq(true)
+      expect(visible?(@browser.button(text: 'Bottom'))).to eq(true)
+    end
+
+    it "scrolls to element (center)" do
+      @browser.button(text: 'Center').scroll.to :center
+      expect(visible?(@browser.button(text: 'Top'))).to eq(false)
+      expect(visible?(@browser.button(text: 'Center'))).to eq(true)
+      expect(visible?(@browser.button(text: 'Bottom'))).to eq(false)
+    end
+
+    it "scrolls to element (bottom)" do
+      @browser.button(text: 'Center').scroll.to :bottom
+      expect(visible?(@browser.button(text: 'Top'))).to eq(true)
+      expect(visible?(@browser.button(text: 'Center'))).to eq(true)
+      expect(visible?(@browser.button(text: 'Bottom'))).to eq(false)
+    end
+
+    it "raises error when scroll param is not vaild" do
+      expect { @browser.button(text: 'Top').scroll.to(:blah) }.to raise_error(ArgumentError)
+    end
+  end
+end

data/watir-scroll.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,78 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: watir-scroll
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2016-09-01 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: :runtime
   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.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: '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: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Scrolling API for watir-webdriver
@@ -81,50 +86,51 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/watir-scroll.rb
 - lib/watir-scroll/browser.rb
-- lib/watir-scroll/scroll.rb
+- lib/watir-scroll/browser/scroll.rb
+- lib/watir-scroll/element.rb
+- lib/watir-scroll/element/scroll.rb
 - lib/watir-scroll/version.rb
 - spec/spec_helper.rb
-- spec/watir-scroll_spec.rb
+- spec/support/test.html
+- spec/support/travis.sh
+- spec/watir-scroll/browser_spec.rb
+- spec/watir-scroll/element_spec.rb
 - watir-scroll.gemspec
 homepage: https://github.com/p0deje/watir-scroll
 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'
-      segments:
-      - 0
-      hash: 435878204713146797
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 435878204713146797
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Scrolling API for watir-webdriver
 test_files:
 - spec/spec_helper.rb
-- spec/watir-scroll_spec.rb
+- spec/support/test.html
+- spec/support/travis.sh
+- spec/watir-scroll/browser_spec.rb
+- spec/watir-scroll/element_spec.rb