From 98d52176ad3208ae2d307a2ed52aaee176105164 Mon Sep 17 00:00:00 2001 From: Lawrence Pit Date: Wed, 5 Nov 2008 14:20:47 +1100 Subject: [PATCH] fix following fully qualified local links --- lib/webrat/core/link.rb | 2 +- spec/api/clicks_link_spec.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/webrat/core/link.rb b/lib/webrat/core/link.rb index 89e532f..b894f7f 100644 --- a/lib/webrat/core/link.rb +++ b/lib/webrat/core/link.rb @@ -54,7 +54,7 @@ module Webrat def absolute_href if href =~ /^\?/ "#{@session.current_url}#{href}" - elsif href !~ %r{^https?://www.example.com(/.*)} && (href !~ /^\//) + elsif href !~ %r{^https?://} && (href !~ /^\//) "#{@session.current_url}/#{href}" else href diff --git a/spec/api/clicks_link_spec.rb b/spec/api/clicks_link_spec.rb index 3bfe6f7..b464563 100644 --- a/spec/api/clicks_link_spec.rb +++ b/spec/api/clicks_link_spec.rb @@ -270,10 +270,11 @@ describe "clicks_link" do end it "should follow fully qualified local links" do + @session.stub!(:current_url).and_return("/page") @session.response_body = <<-EOS - Jump to sub page + Jump to sub page EOS - @session.should_receive(:get).with("http://www.example.com/page/sub", {}) + @session.should_receive(:get).with("http://subdomain.example.com/page/sub", {}) @session.clicks_link "Jump to sub page" end