aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-25 19:43:40 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-25 19:43:40 +0000
commit932622294194888cf7f9c5a10c082b75f0b7ab8d (patch)
tree4297e4d23d5670a7e5a3995773e221577877f1f4
parent7bcf4c66591d2108277e3c585fdd2eeca00348d9 (diff)
downloadrails-932622294194888cf7f9c5a10c082b75f0b7ab8d.tar.gz
rails-932622294194888cf7f9c5a10c082b75f0b7ab8d.tar.bz2
rails-932622294194888cf7f9c5a10c082b75f0b7ab8d.zip
Use example.com as standard (closes #4413) [anna]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4026 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/lib/action_controller/integration.rb4
-rw-r--r--railties/lib/console_app.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index 7d4a0f528b..cd905329e6 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -67,7 +67,7 @@ module ActionController
@cookies = {}
@controller = @request = @response = nil
- self.host = "www.example.test"
+ self.host = "www.example.com"
self.remote_addr = "127.0.0.1"
self.accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
@@ -102,7 +102,7 @@ module ActionController
# Set the host name to use in the next request.
#
- # session.host! "www.example.test"
+ # session.host! "www.example.com"
def host!(name)
@host = name
end
diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb
index 770b87de71..4c2126057a 100644
--- a/railties/lib/console_app.rb
+++ b/railties/lib/console_app.rb
@@ -8,7 +8,7 @@ Test::Unit.run = true
def app(create=false)
@app_integration_instance = nil if create
@app_integration_instance ||= new_session do |sess|
- sess.host! "www.example.test"
+ sess.host! "www.example.com"
end
end