From 0842fafd63e82051a27d8d0fe6c3cba0551799b1 Mon Sep 17 00:00:00 2001
From: Daniel Grana <dangra@gmail.com>
Date: Mon, 27 Apr 2009 06:47:26 +0000
Subject: [PATCH] useragent: add unittests to mw and prepare to remove UA from
 downloader handlers

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%401088
---
 .../contrib/downloadermiddleware/useragent.py | 13 ++++--
 .../test_downloadermiddleware_useragent.py    | 45 +++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 scrapy/trunk/scrapy/tests/test_downloadermiddleware_useragent.py

diff --git a/scrapy/trunk/scrapy/contrib/downloadermiddleware/useragent.py b/scrapy/trunk/scrapy/contrib/downloadermiddleware/useragent.py
index 6bda3e85f..ddf51cb89 100644
--- a/scrapy/trunk/scrapy/contrib/downloadermiddleware/useragent.py
+++ b/scrapy/trunk/scrapy/contrib/downloadermiddleware/useragent.py
@@ -1,7 +1,14 @@
+"""Set User-Agent header per spider or use a default value from settings"""
+
+from scrapy.conf import settings
+
+
 class UserAgentMiddleware(object):
     """This middleware allows spiders to override the user_agent"""
 
-    def process_request(self, request, spider):
-        if getattr(spider, 'user_agent', None):
-            request.headers.setdefault('User-Agent', spider.user_agent)
+    default_useragent = settings.get('USER_AGENT')
 
+    def process_request(self, request, spider):
+        ua = getattr(spider, 'user_agent', self.default_useragent)
+        if ua:
+            request.headers.setdefault('User-Agent', ua)
diff --git a/scrapy/trunk/scrapy/tests/test_downloadermiddleware_useragent.py b/scrapy/trunk/scrapy/tests/test_downloadermiddleware_useragent.py
new file mode 100644
index 000000000..091567ffd
--- /dev/null
+++ b/scrapy/trunk/scrapy/tests/test_downloadermiddleware_useragent.py
@@ -0,0 +1,45 @@
+from unittest import TestCase
+
+from scrapy.spider import spiders
+from scrapy.http import Request
+from scrapy.contrib.downloadermiddleware.useragent import UserAgentMiddleware
+from scrapy.conf import settings
+
+
+class CookiesMiddlewareTest(TestCase):
+
+    def setUp(self):
+        spiders.spider_modules = ['scrapy.tests.test_spiders']
+        spiders.reload()
+        self.spider = spiders.fromdomain('scrapytest.org')
+        self.mw = UserAgentMiddleware()
+
+    def tearDown(self):
+        del self.mw
+
+    def test_default_agent(self):
+        self.mw.default_useragent = 'default_useragent'
+        req = Request('http://scrapytest.org/')
+        assert self.mw.process_request(req, self.spider) is None
+        self.assertEquals(req.headers['User-Agent'], 'default_useragent')
+
+    def test_spider_agent(self):
+        self.spider.user_agent = 'spider_useragent'
+        req = Request('http://scrapytest.org/')
+        assert self.mw.process_request(req, self.spider) is None
+        self.assertEquals(req.headers['User-Agent'], 'spider_useragent')
+
+    def test_header_agent(self):
+        self.mw.default_useragent = 'default_useragent'
+        self.spider.user_agent = 'spider_useragent'
+        req = Request('http://scrapytest.org/', headers={'User-Agent': 'header_useragent'})
+        assert self.mw.process_request(req, self.spider) is None
+        self.assertEquals(req.headers['User-Agent'], 'header_useragent')
+
+    def test_no_agent(self):
+        self.mw.default_useragent = None
+        self.spider.user_agent = None
+        req = Request('http://scrapytest.org/')
+        assert self.mw.process_request(req, self.spider) is None
+        assert 'User-Agent' not in req.headers
+