watir-scroll 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce4bc5bebb0484cddc169c4c7ffad221e3d1c27e
-  data.tar.gz: 8e463985f87b471e4a4fa1b3637c1f5237ea1bef
+  metadata.gz: 5e8291e46790f58afdf548a985a2c7295aa969b3
+  data.tar.gz: 5c9539242ff3222ea90a5a41eaefd8f14090e9fd
 SHA512:
-  metadata.gz: d8201882db22a17dffd6f1f5ee9b02da6fec269684d3074a4afd9f8fb791f2526e0c0557a2183f1a81ce75b5b07ee81af19657a53c8199fa50165c1155c0561c
-  data.tar.gz: 3a3f7a8219ef77c52c5b87ecf625199624e217d049374bf2fedf714c9e8c0da30d7b51999953dc06d7f06ba23ae048c05a7d9c3d55a5c5f1c1f5ccdc86399eaa
+  metadata.gz: 61629d89d7a642a9b001c2c9c0343e7dc0cc2fd19a0a671b1eb12abecd0e1b1b2d389ed10f48dbce04a09ba25e57afc69e15267a56ca1d9de5d40b19ee68b579
+  data.tar.gz: 41f383d3058e8f9677d0b53f68f3708c8519a646db3f55deeaa73cdc33705f36f15243b0fc645fac3207722fb2649c9c3b6b586db06988502ff1d7541fc41c46

data/README.md

@@ -31,6 +31,14 @@ 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.by 10, 10    # scrolls to left and down by 10 pixels
+browser.scroll.by -10, -10  # scrolls to right and top by 10 pixels
+```
+
+You can also chain the calls:
+
+```ruby
+browser.scroll.to(:top).by(0, 100)  # scrolls to the top of the page and 100 pixels down
 ```
 
 ### Scrolling To Elements
@@ -42,8 +50,17 @@ 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
+button.scroll.by 10, 10   # scrolls to left and down by 10 pixels
+button.scroll.by -10, -10 # scrolls to right and top by 10 pixels
 ```
 
+You can also chain the calls:
+
+```ruby
+button.scroll.to.by(0, 100) # scrolls to the button and 100 pixels down
+```
+
+
 ## Contributing
 
 1. Fork it

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

@@ -23,8 +23,19 @@ module Watir
                else
                  raise ArgumentError, "Don't know how to scroll to: #{param}!"
                end
+        @browser.execute_script(*args)
 
-         @browser.execute_script(*args)
+        self
+      end
+
+      #
+      # Scrolls by offset.
+      # @param [Fixnum] left Horizontal offset
+      # @param [Fixnum] top Vertical offset
+      #
+      def by(left, top)
+        @browser.execute_script('window.scrollBy(arguments[0], arguments[1]);', Integer(left), Integer(top))
+        self
       end
 
     end # Scroll

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

@@ -16,9 +16,10 @@ module Watir
                  ['arguments[0].scrollIntoView();', @element]
                when :center
                  script = <<-JS
+                   var bodyRect = document.body.getBoundingClientRect();
                    var elementRect = arguments[0].getBoundingClientRect();
-                   var top = elementRect.top - (window.innerHeight / 2);
-                   var left = elementRect.left - (window.innerWidth / 2);
+                   var left = (elementRect.left - bodyRect.left) - (window.innerWidth / 2);
+                   var top = (elementRect.top - bodyRect.top) - (window.innerHeight / 2);
                    window.scrollTo(left, top);
                  JS
                  [script, @element]
@@ -27,8 +28,19 @@ module Watir
                else
                  raise ArgumentError, "Don't know how to scroll element to: #{param}!"
                end
-
         @element.browser.execute_script(*args)
+
+        self
+      end
+
+      #
+      # Scrolls by offset.
+      # @param [Fixnum] left Horizontal offset
+      # @param [Fixnum] top Vertical offset
+      #
+      def by(left, top)
+        @element.execute_script('window.scrollBy(arguments[0], arguments[1]);', Integer(left), Integer(top))
+        self
       end
 
     end # Scroll

data/spec/watir-scroll/browser_spec.rb

@@ -24,12 +24,18 @@ describe Watir::Browser do
       expect(visible?(@browser.button(text: 'Bottom'))).to eq(true)
     end
 
-    it "scrolls to coordiantes" do
+    it "scrolls to coordinates" do
       button = @browser.button(text: 'Bottom')
       @browser.scroll.to [button.wd.location.x, button.wd.location.y]
       expect(visible?(button)).to eq(true)
     end
 
+    it "scrolls by offset" do
+      button = @browser.button(text: 'Bottom')
+      @browser.scroll.by(0, button.wd.location.y)
+      expect(visible?(button)).to eq(true)
+    end
+
     it "raises error when scroll point is not vaild" do
       expect { @browser.scroll.to(:blah) }.to raise_error(ArgumentError)
     end

data/spec/watir-scroll/element_spec.rb

@@ -23,6 +23,20 @@ describe Watir::Element do
       expect(visible?(@browser.button(text: 'Bottom'))).to eq(false)
     end
 
+    it "scrolls to element multiple times" do
+      2.times do
+        @browser.button(text: 'Center').scroll.to(:center)
+        expect(visible?(@browser.button(text: 'Top'))).to eq(false)
+      end
+    end
+
+    it "scrolls by offset" do
+      @browser.button(text: 'Bottom').scroll.to.by(-10000, -10000) # simulate scrolling 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 "raises error when scroll param is not vaild" do
       expect { @browser.button(text: 'Top').scroll.to(:blah) }.to raise_error(ArgumentError)
     end

data/watir-scroll.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watir-scroll"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = "Alex Rodionov"
   spec.email         = "p0deje@gmail.com"
   spec.description   = "Scrolling API for Watir"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-scroll
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Scrolling API for Watir