Fix bug in support for HTTPS with Rails LM/BH

brynary · Aug 22, 2008 · dd82431 · dd82431
1 parent 206e65b
commit dd82431
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/lib/webrat/core/link.rb b/lib/webrat/core/link.rb
@@ -44,11 +44,9 @@ def href
     end
 
     def absolute_href
-      if href =~ %r{^https?://www.example.com(/.*)}
-        $LAST_MATCH_INFO.captures.first
-      elsif href =~ /^\?/
+      if href =~ /^\?/
         "#{@session.current_url}#{href}"
-      elsif href !~ /^\//
+      elsif href !~ %r{^https?://www.example.com(/.*)} && (href !~ /^\//)
         "#{@session.current_url}/#{href}"
       else
         href

diff --git a/lib/webrat/rails/rails_session.rb b/lib/webrat/rails/rails_session.rb
@@ -16,22 +16,22 @@ def saved_page_dir
 
     def get(url, data)
       update_protocol(url)
-      @integration_session.get_via_redirect(url, data)
+      @integration_session.get_via_redirect(remove_protocol(url), data)
     end
 
     def post(url, data)
       update_protocol(url)
-      @integration_session.post_via_redirect(url, data)
+      @integration_session.post_via_redirect(remove_protocol(url), data)
     end
 
     def put(url, data)
       update_protocol(url)
-      @integration_session.put_via_redirect(url, data)
+      @integration_session.put_via_redirect(remove_protocol(url), data)
     end
 
     def delete(url, data)
       update_protocol(url)
-      @integration_session.delete_via_redirect(url, data)
+      @integration_session.delete_via_redirect(remove_protocol(url), data)
     end
 
     def response_body
@@ -44,6 +44,14 @@ def response_code
 
   protected
 
+    def remove_protocol(href)
+      if href =~ %r{^https?://www.example.com(/.*)}
+        $LAST_MATCH_INFO.captures.first
+      else
+        href
+      end
+    end
+
     def update_protocol(href)
       if href =~ /^https:/
         @integration_session.https!(true)

diff --git a/spec/api/clicks_link_spec.rb b/spec/api/clicks_link_spec.rb
@@ -255,7 +255,7 @@
     @session.response_body = <<-EOS
       <a href="http://www.example.com/page/sub">Jump to sub page</a>
     EOS
-    @session.should_receive(:get).with("/page/sub", {})
+    @session.should_receive(:get).with("http://www.example.com/page/sub", {})
     @session.clicks_link "Jump to sub page"
   end