<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[198] trunk: Fix Browser#goto regexp</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>198</dd>
<dt>Author</dt> <dd>jarib</dd>
<dt>Date</dt> <dd>2008-06-25 06:05:31 -0400 (Wed, 25 Jun 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Browser#goto regexp</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklibceleritybrowserrb">trunk/lib/celerity/browser.rb</a></li>
<li><a href="#trunkspecbrowser_specrb">trunk/spec/browser_spec.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklibceleritybrowserrb"></a>
<div class="modfile"><h4>Modified: trunk/lib/celerity/browser.rb (197 => 198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/lib/celerity/browser.rb 2008-06-19 11:27:48 UTC (rev 197)
+++ trunk/lib/celerity/browser.rb 2008-06-25 10:05:31 UTC (rev 198)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def goto(uri)
</span><del>- uri = "http://#{uri}" unless uri =~ %r{^https?://}
</del><ins>+ uri = "http://#{uri}" unless uri =~ %r{://}
</ins><span class="cx"> self.page = @webclient.getPage(uri)
</span><span class="cx"> uri
</span><span class="cx"> end
</span></span></pre></div>
<a id="trunkspecbrowser_specrb"></a>
<div class="modfile"><h4>Modified: trunk/spec/browser_spec.rb (197 => 198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/spec/browser_spec.rb 2008-06-19 11:27:48 UTC (rev 197)
+++ trunk/spec/browser_spec.rb 2008-06-25 10:05:31 UTC (rev 198)
</span><span class="lines">@@ -153,6 +153,13 @@
</span><span class="cx"> # it "should handle HTTPS" do
</span><span class="cx"> # pending
</span><span class="cx"> # end
</span><ins>+
+ it "should add http:// to URLs with no protocol specified" do
+ url = TEST_HOST[%r{http://(.*)}, 1]
+ url.should_not be_nil
+ @browser.goto(url)
+ @browser.url.should == "http://#{url}"
+ end
</ins><span class="cx">
</span><span class="cx"> it "should go to the given url without raising errors" do
</span><span class="cx"> lambda { @browser.goto(TEST_HOST + "/non_control_elements.html") }.should_not raise_error
</span></span></pre>
</div>
</div>
</body>
</html>