New Ferrum release compatibility

Author: route

cuprite.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency "capybara", ">= 2.1", "< 4"
-  s.add_runtime_dependency "ferrum",   "~> 0.6.0"
+  s.add_runtime_dependency "ferrum",   "~> 0.7.0"
 
   s.add_development_dependency "image_size", "~> 2.0"
   s.add_development_dependency "pdf-reader", "~> 2.1"

spec/integration/driver_spec.rb

@@ -525,16 +525,6 @@ def create_screenshot(file, *args)
       expect(@driver.evaluate_script("window.result")).to eq(3)
     end
 
-    it "operates a timeout when communicating with browser" do
-      begin
-        prev_timeout = @driver.timeout
-        @driver.timeout = 0.1
-        expect { @driver.visit(session_url("/cuprite/really_slow")) }.to raise_error(Ferrum::TimeoutError)
-      ensure
-        @driver.timeout = prev_timeout
-      end
-    end
-
     it "supports stopping the session", skip: Ferrum.windows? do
       driver = Capybara::Cuprite::Driver.new(nil)
       pid = driver.browser.process.pid
@@ -671,27 +661,41 @@ def create_screenshot(file, *args)
           )
       end
 
-      it "reports open resource requests", skip: true do
-        old_timeout = @session.driver.timeout
+      it "operates a timeout when communicating with browser" do
         begin
+          old_timeout = @driver.timeout
+          @driver.timeout = 0.1
+          expect {
+            @driver.visit(session_url("/cuprite/really_slow"))
+          }.to raise_error(
+            Ferrum::StatusError,
+            %r{there are still pending connections: http://.*/cuprite/really_slow}
+          )
+        ensure
+          @driver.timeout = old_timeout
+        end
+      end
+
+      it "reports open resource requests" do
+        begin
+          old_timeout = @session.driver.timeout
           @session.driver.timeout = 2
-          expect do
+          expect {
             @session.visit("/cuprite/visit_timeout")
-          end.to raise_error(Ferrum::StatusError, %r{resources still waiting http://.*/cuprite/really_slow})
+          }.to raise_error(
+            Ferrum::StatusError,
+            %r{there are still pending connections: http://.*/cuprite/really_slow}
+          )
         ensure
           @session.driver.timeout = old_timeout
         end
       end
 
-      it "does not report open resources where there are none", skip: true do
+      it "does not report open resources where there are none" do
         old_timeout = @session.driver.timeout
         begin
-          @session.driver.timeout = 2
-          expect do
-            @session.visit("/cuprite/really_slow")
-          end.to raise_error(Ferrum::StatusError) { |error|
-            expect(error.message).not_to include("resources still waiting")
-          }
+          @session.driver.timeout = 4
+          expect { @session.visit("/cuprite/really_slow") }.not_to raise_error
         ensure
           @session.driver.timeout = old_timeout
         end

spec/spec_helper.rb

@@ -15,10 +15,15 @@
 Capybara.register_driver(:cuprite) do |app|
   options = {}
   options.merge!(inspector: true) if ENV["INSPECTOR"]
-  options.merge!(logger: StringIO.new)
+  options.merge!(logger: StringIO.new) if ENV["TRAVIS"]
   driver = Capybara::Cuprite::Driver.new(app, options)
-  puts driver.browser.process.cmd.join(" ")
-  puts `"#{driver.browser.process.path}" -version --headless --no-gpu`
+  process = driver.browser.process
+
+  puts "Browser: #{process.browser_version}"
+  puts "Protocol: #{process.protocol_version}"
+  puts "V8: #{process.v8_version}"
+  puts "Webkit: #{process.webkit_version}"
+
   driver
 end
 
@@ -42,6 +47,13 @@ module TestSessions
     node #drag_to HTML5 should HTML5 drag and drop when scrolling needed
     node #drag_to HTML5 should drag HTML5 default draggable elements
     node #drag_to HTML5 should drag HTML5 default draggable element child
+    node #drag_to should simulate a single held down modifier key
+    node #drag_to should simulate multiple held down modifier keys
+    node #drag_to should support key aliases
+    node #drag_to HTML5 should preserve clientX/Y from last dragover event
+    node #drag_to HTML5 should simulate a single held down modifier key
+    node #drag_to HTML5 should simulate multiple held down modifier keys
+    node #drag_to HTML5 should support key aliases
     node Element#drop can drop a file
     node Element#drop can drop multiple files
     node Element#drop can drop strings
@@ -76,18 +88,25 @@ module TestSessions
     metadata[:skip] = true if metadata[:full_description].match(/#{regexes}/)
   end
 
-  config.before do
-    session = @session || TestSessions::Cuprite
-    session.driver.browser.logger.truncate(0)
-    session.driver.browser.logger.rewind
-  end
+  config.around do |example|
+    if ENV["TRAVIS"]
+      session = @session || TestSessions::Cuprite
+      session.driver.browser.logger.truncate(0)
+      session.driver.browser.logger.rewind
+    end
+
+    example.run
 
-  config.after do |example|
-    if example.exception
+    if ENV["TRAVIS"] && example.exception
       session = @session || TestSessions::Cuprite
       raise session.driver.browser.logger.string
     end
   end
 
+  config.after do
+    FileUtils.rm_rf(CUPRITE_ROOT + "/screenshots")
+    FileUtils.rm_rf(CUPRITE_ROOT + "/save_path_tmp")
+  end
+
   Capybara::SpecHelper.configure(config)
 end

spec/support/views/with_different_resources.erb

@@ -5,7 +5,7 @@
   </head>
 
   <body>
-    <img src="unexist.png">
+    <img src="/cuprite/unexist.png">
 
     <a href="/cuprite/redirect">Do redirect</a>
     <a href="/cuprite/status/201">Go to 201</a>