capybara-typhoeus 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d47a174ccfacb40f34d85580cc59edeb5504498
-  data.tar.gz: 4c68438940a7ced8999b840e73a31badc8bc8ce3
+  metadata.gz: 976fa14fb8f2e89fafd33627cccad6fc6eb5e608
+  data.tar.gz: 8bdfbdad63eb49903137ededceda11a0601033c8
 SHA512:
-  metadata.gz: 0ba0d5e3e65479ef80b00bde6be3ee9cd1c6330352412f723e708fd248b961a14cac7db6dd05e848d165161752cdd469ac2ebd3a972f53271318671a0d9587c4
-  data.tar.gz: fb8a7ab2d5cd59c3454ebf3abb13b09140c3d6ea65e37ca3445c2ffb0b2adfce6df123e99a3137b0f74fdfd0224570c9fdf86057bd2bb1f6631dba5cb9cd57cc
+  metadata.gz: 01eebe64bf5ba365d3839e54f8ff6128dd3d67fc9079cc41cbc04e9d067493a84cbad75cf1334149d509ac036e3ca26b107f042eeb788cefb4bb23af47047ded
+  data.tar.gz: 95dd04c59b0c133f4de0c64690ba8045d9fe553019747e06b24b2626c2e110640b56a1058ba57947f0b5d33e7c80efe617219c5d4c302b678fcceaecf49d76bc

data/lib/capybara/typhoeus/session.rb

@@ -4,21 +4,7 @@ class Capybara::Typhoeus::Session < Capybara::Session
     define_method(method) do |url, params={}, headers={}, &block|
       @touched = true
 
-      if url !~ /^http/ and Capybara.app_host
-        url = Capybara.app_host + url.to_s
-      end
-
-      if @server
-        url = "http://#{@server.host}:#{@server.port}" + url.to_s unless url =~ /^http/
-
-        if Capybara.always_include_port
-          uri = URI.parse url
-          uri.port = @server.port if uri.port == uri.default_port
-          url = uri.to_s
-        end
-      end
-
-      driver.send method, url, params, headers, &block
+      driver.send method, host_url(url), params, headers, &block
     end
   end
 
@@ -30,4 +16,22 @@ class Capybara::Typhoeus::Session < Capybara::Session
     driver.timed_out?
   end
 
+  def host_url(url)
+    if url !~ /^http/ and Capybara.app_host
+      url = Capybara.app_host + url.to_s
+    end
+
+    if @server
+      url = "http://#{@server.host}:#{@server.port}" + url.to_s unless url =~ /^http/
+
+      if Capybara.always_include_port
+        uri = URI.parse url
+        uri.port = @server.port if uri.port == uri.default_port
+        url = uri.to_s
+      end
+    end
+
+    url
+  end
+
 end

data/spec/session/typhoeus_spec.rb

@@ -68,5 +68,21 @@ describe Capybara::Typhoeus::Session do
         end
       end
     end
+
+    context "#host_url returns url with scheme, host, port and path" 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/
+      end
+
+      it "with relative url" do
+        subject.host_url("/demo/test").should =~ /\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"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joseph HALTER