capybara-typhoeus 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0820c824e03cd68ee1a99f9a9ec626319dd02246'
-  data.tar.gz: 1700cbb56c739ee026784f45559d24aad3dcfb11
+SHA256:
+  metadata.gz: 55d6e90d7b65fd3c7183b989c74e6532103382b684bda3b647e52d1dbfe04368
+  data.tar.gz: b1e22d5b2c32f7ac8ae85b6d13f05b8b16ab9ef2cc574368ba305824b14db16b
 SHA512:
-  metadata.gz: 5380f190381ab811f26cc83e978577b7d7a1da61d8834605a042a95aaf9514d6a25a6e2bca0c6904cf2f60497917a2bcecda99af33884be0abfa280bdb1cfdd4
-  data.tar.gz: e88365a2211cfd6b0ab886bfa460058f24afc9f4da37aae0daacd9527687569206dd742530b64e22e022ec8e76311b25a0cc1673413761f589efaf23f455c383
+  metadata.gz: 82ae5e119a7996fac56c8d24ac5551cd35aa466232e3f58a02cd4f1eec732ebafb096cd8134be1f37ae8cb1fcad0f1997279e8941f30e071288da16c682a371d
+  data.tar.gz: 4df5e80af597d8c6d90443cff1e705cc6aa51c394dee07b4c646d2a34b01f32a21029c2a5039a8f12d878095a715b1d5858d48fe90cb9b25f4823ecc166833b4

data/lib/capybara/typhoeus/browser.rb

@@ -4,6 +4,8 @@ module Typhoeus
       [301, 302, 303, 307].include? code
     end
 
+    alias_method :status, :code
+
     def [](key)
       headers[key]
     end
@@ -12,7 +14,14 @@ end
 
 class Capybara::Typhoeus::Browser < Capybara::RackTest::Browser
 
+  LastRequest = Struct.new(:method, :url, :params, :headers) do
+    def path
+      URI.parse(url).path
+    end
+  end
+
   attr_accessor :request_body
+  attr_reader :last_request
   attr_reader :last_response
 
   def reset_cache!
@@ -21,6 +30,11 @@ class Capybara::Typhoeus::Browser < Capybara::RackTest::Browser
     super
   end
 
+  def refresh
+    reset_cache!
+    send(last_request.method, last_request.url, last_request.params, last_request.headers)
+  end
+
   def current_url
     last_response ? last_response.effective_url : ""
   end
@@ -54,6 +68,7 @@ class Capybara::Typhoeus::Browser < Capybara::RackTest::Browser
 
   [:get, :post, :put, :delete, :head, :patch, :request].each do |method|
     define_method(method) do |url, params={}, headers={}, &block|
+      @last_request = LastRequest.new(method, url, params, headers)
       uri = URI.parse url
       opts = driver.with_options
       opts[:method] = method

data/spec/session/typhoeus_spec.rb

@@ -4,24 +4,59 @@ Capybara.register_driver :typhoeus_with_custom_timeout do |app|
   Capybara::Typhoeus::Driver.new app, timeout: 1
 end
 
-Capybara::SpecHelper.run_specs Capybara::Typhoeus::Session.new(:typhoeus, TestApp), "Typhoeus", capybara_skip: [
-  :js,
-  :screenshot,
-  :frames,
-  :windows,
-  :server,
-  :hover,
-  :modals,
-  :about_scheme,
-  :send_keys,
+module TestSessions
+  TyphoeusTest = Capybara::Session.new(:typhoeus, TestApp)
+  TyphoeusTestCustomTimeout = Capybara::Session.new(:typhoeus_with_custom_timeout, TestApp)
+end
+
+skipped_tests = %i[
+  js
+  modals
+  screenshot
+  frames
+  windows
+  send_keys
+  server
+  hover
+  about_scheme
+  download
+  css
+  scroll
 ]
+Capybara::SpecHelper.run_specs TestSessions::TyphoeusTest, 'Typhoeus', capybara_skip: skipped_tests do |example|
+  case example.metadata[:full_description]
+  when /#attach_file/
+    skip "Typhoeus driver doesn't support #attach_file"
+  when /#check/
+    skip "Typhoeus driver doesn't support #check"
+  when /#uncheck/
+    skip "Typhoeus driver doesn't support #uncheck"
+  when /#click/
+    skip "Typhoeus driver doesn't support #click"
+  when /#select/
+    skip "Typhoeus driver doesn't support #select"
+  when /#unselect/
+    skip "Typhoeus driver doesn't support #unselect"
+  when /has_css\? should support case insensitive :class and :id options/
+    skip "Nokogiri doesn't support case insensitive CSS attribute matchers"
+  end
+end
 
-describe Capybara::Typhoeus::Session do
+RSpec.describe Capybara::Typhoeus::Session do
 
   context "with typhoeus driver" do
-    it "should use Capybara::Typhoeus::Session" do
-      Capybara.current_driver = :typhoeus
-      Capybara.current_session.should be_instance_of described_class
+    let(:session) { TestSessions::TyphoeusTest }
+
+    describe '#driver' do
+      it 'should be a rack test driver' do
+        expect(session.driver).to be_an_instance_of(Capybara::Typhoeus::Driver)
+      end
+    end
+
+    describe '#mode' do
+      it 'should remember the mode' do
+        expect( session.mode ).to eq(:typhoeus)
+      end
     end
 
     context "basic authentication" do
@@ -38,14 +73,14 @@ describe Capybara::Typhoeus::Session do
       it "allow access with right credentials" do
         subject.authenticate_with "admin", "secret"
         subject.get "/"
-        subject.status_code.should be 200
-        subject.source.should == "Success!"
+        expect( subject.status_code ).to be 200
+        expect( subject.source ).to eq "Success!"
       end
 
       it "deny access with wrong credentials" do
         subject.authenticate_with "admin", "admin"
         subject.get "/"
-        subject.status_code.should be 401
+        expect( subject.status_code ).to be 401
       end
     end
 
@@ -54,12 +89,12 @@ describe Capybara::Typhoeus::Session do
 
       context "default" do
         it "is 3 seconds" do
-          subject.timeout.should == 3
+          expect( subject.timeout ).to eq 3
         end
 
         it "is used during request" do
           subject.get "/slow_response"
-          subject.should_not be_timed_out
+          expect( subject ).not_to be_timed_out
         end
       end
 
@@ -67,12 +102,12 @@ describe Capybara::Typhoeus::Session do
         subject{ described_class.new :typhoeus_with_custom_timeout, TestApp }
 
         it "is stored in options" do
-          subject.timeout.should == 1
+          expect( subject.timeout ).to eq 1
         end
 
         it "is used during request" do
           subject.get "/slow_response"
-          subject.should be_timed_out
+          expect( subject ).to be_timed_out
         end
       end
     end
@@ -81,15 +116,17 @@ describe Capybara::Typhoeus::Session do
       subject{ described_class.new :typhoeus, TestApp }
 
       it "with empty url" do
-        subject.host_url("").should =~ /\A#{Regexp.escape("http://127.0.0.1")}:\d+\z/
+        expect( subject.host_url("") ).to match /\A#{Regexp.escape("http://127.0.0.1")}:\d+\z/
       end
 
       it "with relative url" do
-        subject.host_url("/demo/test").should =~ /\A#{Regexp.escape("http://127.0.0.1")}:\d+\/demo\/test\z/
+        expect( subject.host_url("/demo/test") ).to match /\A#{Regexp.escape("http://127.0.0.1")}:\d+\/demo\/test\z/
       end
 
       it "with absolute url" do
-        subject.host_url("http://www.example.com:443/demo/test").should == "http://www.example.com:443/demo/test"
+        expect(
+          subject.host_url("http://www.example.com:443/demo/test")
+        ).to eq "http://www.example.com:443/demo/test"
       end
     end
 
@@ -102,20 +139,20 @@ describe Capybara::Typhoeus::Session do
       end
 
       it "body is nil be default" do
-        subject.request_body.should be_nil
+        expect( subject.request_body ).to be_nil
         subject.post "/"
-        subject.status_code.should be 200
-        subject.source.should == ""
+        expect( subject.status_code ).to be 200
+        expect( subject.source ).to eq ""
       end
 
       it "I can send data by setting the body" do
         body = "**raw file content**"
         subject.request_body = body
-        subject.request_body.should == body
+        expect( subject.request_body ).to eq body
         subject.post "/"
-        subject.status_code.should be 200
-        subject.source.should == body
-        subject.request_body.should be_nil
+        expect( subject.status_code ).to be 200
+        expect( subject.source ).to eq body
+        expect( subject.request_body ).to be_nil
       end
     end
   end

data/spec/spec_helper.rb

@@ -3,27 +3,6 @@ require "capybara/typhoeus"
 require "capybara/spec/spec_helper"
 require 'pry'
 
-module Capybara
-  module SpecHelper
-    class << self
-      alias_method :run_specs_without_skip, :run_specs
-      def run_specs(session, name, options={})
-        skip = [
-          "#attach_file",
-          "#check",
-          "#click_button",
-          "#click_link",
-          "#select",
-          "#uncheck",
-          "#unselect",
-        ]
-        @specs.reject!{|spec| skip.include? spec.first}
-        run_specs_without_skip session, name, options
-      end
-    end
-  end
-end
-
 RSpec.configure do |config|
   Capybara::SpecHelper.configure config
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Joseph HALTER
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  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: Typhoeus driver for Capybara, allowing testing of REST APIs
 email:
 - jonathan.tron@metrilio.com
@@ -135,11 +149,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Typhoeus driver for Capybara
 test_files:
-- spec/session/typhoeus_spec.rb
 - spec/spec_helper.rb
+- spec/session/typhoeus_spec.rb