capybara-puppeteer-driver 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a084da1c3ac06585dea3d4451e01b816fccf701daff22df2b61c36ec414163
-  data.tar.gz: c5c3f0dc1de999c6a55fad8a969b2702ff669fb94c9b33f0c4f260e750a5c001
+  metadata.gz: 3c963d7aef431f126d37c528a69f7778c4f0bdf94e8ee4e221c37925a5eb1406
+  data.tar.gz: 248c36c1347e9449ef667f1b04380f9b6ecad3a2dbeb712b88eebda917ecbfb0
 SHA512:
-  metadata.gz: 0b76eb4692f1cfcaad5f7a1db172f2f56a6cce9b4327bda1ab8ea0235bb18e5bd781fdc75abe80a41f7b862628c696a5d7f6465657b82e0195be833d2400b1be
-  data.tar.gz: aa4df315c8b32dfb6a589386651f456963223c5f183f9f97cdbdc95b9556076fdd6470bae76a895fc909d474f99777cf214e98551061f79ab38601de438ab309
+  metadata.gz: bc64fe2cc0bc49b3cf5440983a1041a9a324e8aa047f7566fca1159280ccea3b9e0c0e44fb6d4c17e467d7e5aa1e37c793c81916074c3dbbc03fdd7e7743b78f
+  data.tar.gz: 135be36c6b2b66b9bbc4b2c74ec05b4435082837345b06d4031982fc0057ab594023b967dd9da064da0e48e9b2876376cf5f2009134d878e8cf6f790d66627d6

data/.github/workflows/rspec.yml

@@ -6,13 +6,12 @@ jobs:
   check:
     name: RSpec
     runs-on: ubuntu-latest
-    container: circleci/ruby:2.7.3-buster-node-browsers
     steps:
-      # @see https://docs.github.com/actions/reference/virtual-environments-for-github-hosted-runners#docker-container-filesystem
-      - name: Setup file system permissions
-        run: sudo chmod -R 777 $GITHUB_WORKSPACE /github /__w/_temp
       - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: gem install bundler:2.2.3 && bundle install --path vendor/bundle
-      - run: bundle exec rspec --format documentation
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.2
+          bundler-cache: true
+      - uses: browser-actions/setup-chrome@latest
+      - run: CHROME_EXECUTABLE_PATH=$(which chrome) bundle exec rspec --format documentation
         timeout-minutes: 45

data/capybara-puppeteer-driver.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'capybara'
-  spec.add_dependency 'puppeteer-ruby', '>= 0.35.0'
+  spec.add_dependency 'puppeteer-ruby', '>= 0.36.0'
   spec.add_development_dependency 'bundler', '~> 2.2.3'
   spec.add_development_dependency 'launchy', '>= 2.0.4'
   spec.add_development_dependency 'pry-byebug'

data/lib/capybara/puppeteer/browser.rb

@@ -66,6 +66,10 @@ module Capybara
       end
 
       def find_css(query, **options)
+        if query.start_with?('//')
+          return find_xpath(query, **options)
+        end
+
         assert_page_alive
 
         find_with(:query_selector_all, query, **options)

data/lib/capybara/puppeteer/node.rb

@@ -138,6 +138,17 @@ module Capybara
     end
     ::Puppeteer::ElementHandle.prepend(ElementHandlePatch)
 
+    module MousePatch
+      def capybara_async_wait_for_drag_intercepted(&block)
+        Concurrent::Promises.resolvable_future.tap do |f|
+          @client.once('Input.dragIntercepted') do |event|
+            f.fulfill(event['data'])
+          end
+        end
+      end
+    end
+    ::Puppeteer::Mouse.prepend(MousePatch)
+
     # ref:
     #   selenium:   https://github.com/teamcapybara/capybara/blob/master/lib/capybara/selenium/node.rb
     #   apparition: https://github.com/twalpole/apparition/blob/master/lib/capybara/apparition/node.rb
@@ -758,29 +769,33 @@ module Capybara
           @source.scroll_into_view_if_needed
 
           # down
-          position_from = center_of(@source)
-          @page.mouse.move(*position_from)
+          position_from = @source.clickable_point
+          drag_intercepted_promise = @page.mouse.capybara_async_wait_for_drag_intercepted
+          @page.mouse.move(position_from.x, position_from.y)
           @page.mouse.down
 
           @target.scroll_into_view_if_needed
 
           # move and up
           sleep_delay
-          position_to = center_of(@target)
+          position_to = @target.clickable_point
           with_key_pressing(drop_modifiers) do
-            @page.mouse.move(*position_to, steps: 6)
-            sleep_delay
+            @page.mouse.move(position_to.x, position_to.y, steps: 6)
+            if drag_intercepted_promise.fulfilled?
+              # dispatch HTML5 drag events
+              data = drag_intercepted_promise.value!
+              @page.mouse.drag_enter(position_to, data)
+              @page.mouse.drag_over(position_to, data)
+              sleep_delay
+              @page.mouse.drop(position_to, data)
+            else
+              sleep_delay
+            end
             @page.mouse.up
           end
           sleep_delay
         end
 
-        # @param element [Puppeteer::ElementHandle]
-        private def center_of(element)
-          box = element.bounding_box
-          [box.x + box.width / 2, box.y + box.height / 2]
-        end
-
         private def with_key_pressing(keys, &block)
           keys.each { |key| @page.keyboard.down(key) }
           block.call
@@ -801,6 +816,16 @@ module Capybara
 
           sleep @options[:delay]
         end
+
+        private def inject_drag_drop_event_with(drag_intercepted_promise, position_to)
+          unless drag_intercepted_promise.fulfilled?
+            return
+          end
+
+          data = drag_intercepted_promise.value!
+          @page.mouse.drag_enter(position_to, data)
+          @page.mouse.drag_over(position_to, data)
+        end
       end
 
       def drop(*args)

data/lib/capybara/puppeteer/page.rb

@@ -32,6 +32,8 @@ module Capybara
           @capybara_last_response = @capybara_all_responses[frame.url]
           @capybara_all_responses.clear
         end
+
+        self.drag_interception_enabled = true
       end
 
       private def capybara_dialog_event_handler

data/lib/capybara/puppeteer/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Puppeteer
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-puppeteer-driver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement