don't use request.domain as it's not always available

thibaudgg · Apr 2, 2011 · 3e5d923 · 3e5d923
1 parent 218510e
commit 3e5d923
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/capybara/spec/session/current_host_spec.rb b/lib/capybara/spec/session/current_host_spec.rb
@@ -13,7 +13,7 @@
     it "returns to the app host when visiting a relative url" do
       Capybara.app_host = "http://capybara1.elabs.se"
       @session.visit('http://capybara-testapp.heroku.com/host')
-      @session.body.should include('Current host is capybara-testapp.heroku.com')
+      @session.body.should include('Current host is http://capybara-testapp.heroku.com')
       @session.current_host.should == 'http://capybara-testapp.heroku.com'
       @session.visit('/host')
       @session.body.should include('Current host is http://capybara1.elabs.se')

diff --git a/lib/capybara/spec/test_app.rb b/lib/capybara/spec/test_app.rb
@@ -23,7 +23,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/host' do
-    "Current host is #{request.domain}"
+    "Current host is #{request.scheme}://#{request.host}"
   end
 
   get '/redirect/:times/times' do