From 4d2fac1a9c604423368e80b85190a8c47cacc6c5 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Sun, 1 Dec 2019 22:36:49 +0100
Subject: [PATCH] Make it easier to write tests for comic modules

This also adds a simple test for the "turnoff" module to demonstrate
these features.
---
 tests/httpmocks.py                   |  46 +++++++++++----------------
 tests/responses/turnoff-229.html.gz  | Bin 0 -> 241 bytes
 tests/responses/turnoff-home.html.gz | Bin 0 -> 6339 bytes
 tests/test_dosage.py                 |  23 ++++++++++----
 tests/test_modules.py                |  30 +++++++++++++++++
 tests/test_vote.py                   |   7 ++--
 6 files changed, 68 insertions(+), 38 deletions(-)
 create mode 100644 tests/responses/turnoff-229.html.gz
 create mode 100644 tests/responses/turnoff-home.html.gz
 create mode 100644 tests/test_modules.py

diff --git a/tests/httpmocks.py b/tests/httpmocks.py
index a0a12160a..da9d2b108 100644
--- a/tests/httpmocks.py
+++ b/tests/httpmocks.py
@@ -12,14 +12,11 @@ try:
 except ImportError:
     from backports.functools_lru_cache import lru_cache
 
-from responses import add, GET, POST
-
-
-_basedir = os.path.dirname(__file__)
+from responses import add, GET
 
 
 def _file(name):
-    return os.path.join(_basedir, 'responses', name)
+    return os.path.join(os.path.dirname(__file__), 'responses', name)
 
 
 @lru_cache()
@@ -34,27 +31,20 @@ def _img():
         return f.read()
 
 
+def page(url, pagename):
+    add(GET, url, _content(pagename))
+
+
+def png(url):
+    add(GET, url, _img(), content_type='image/jpeg')
+
+
+def jpeg(url):
+    add(GET, url, _img(), content_type='image/jpeg')
+
+
 def xkcd():
-    add(GET, 'https://xkcd.com/', _content('xkcd-1899'))
-    for page in (302, 303, 1898, 1899):
-        add(GET, 'https://xkcd.com/%i/' % page, _content('xkcd-%i' % page))
-    add(GET, re.compile(r'https://imgs\.xkcd\.com/.*\.png'), _img(), content_type='image/png')
-
-
-def bloomingfaeries():
-    add(GET, 'http://www.bloomingfaeries.com/', _content('bf-home'))
-    add(GET, 'http://www.bloomingfaeries.com/comic/public/bloomin-faeries-405/', _content('bf-405'))
-
-    add(GET, re.compile(r'http://www\.bloomingfaeries\.com/.*\.jpg'), _img(), content_type='image/jpeg')
-
-
-def zenpencils():
-    add(GET, 'https://zenpencils.com/', _content('zp-home'))
-    add(GET, 'https://zenpencils.com/comic/missing/', _content('zp-223'))
-    add(GET, 'https://zenpencils.com/comic/lifejacket/', _content('zp-222'))
-    add(GET, re.compile(r'https://cdn-zenpencils\.netdna-ssl\.com/wp-content/uploads/.*\.jpg'), _img(),
-        content_type='image/jpeg')
-
-
-def vote():
-    add(POST, 'https://buildbox.23.gs/count/', '')
+    page('https://xkcd.com/', 'xkcd-1899')
+    for num in (302, 303, 1898, 1899):
+        page('https://xkcd.com/%i/' % num, 'xkcd-%i' % num)
+    png(re.compile(r'https://imgs\.xkcd\.com/.*\.png'))
diff --git a/tests/responses/turnoff-229.html.gz b/tests/responses/turnoff-229.html.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d7896543ea96ecd8a9a342cbf8ba8d807be1d580
GIT binary patch
literal 241
zcmV<N01p2jiwFP!0000219gzyPJ=)Yh3|O^-e3R=)Mh0qR0=65HnuU|t=-{I>gw)N
zrB5$EO-xLBH*?N6Co@Azb!<G1lt`IJRHYj9ZVXFL`3af+jK@zdsHmEbz+@5_QH{KD
z)(wN^HNJN=(hlKG<prGKLJxWS!3gyID5fYSEqZ;6lDFc3|A8%jwJ2507P{fj17|fe
zR<3;?+M)jkMSLQh*YsrGX5DxG7|oQQcSW(;C-xjLF{3O2oA2wGCgFO0UZS;gH_O_|
re%w^ZI*8%nV3~@(1W)3ezu#TbVO+lyFw~cWVfxrFOKRHBIRO9w!Dw+|

literal 0
HcmV?d00001

diff --git a/tests/responses/turnoff-home.html.gz b/tests/responses/turnoff-home.html.gz
new file mode 100644
index 0000000000000000000000000000000000000000..be22e726b148050ead234df21785e0297220ee81
GIT binary patch
literal 6339
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
F002Jkdhh@M

literal 0
HcmV?d00001

diff --git a/tests/test_dosage.py b/tests/test_dosage.py
index 2fd5744ed..3896701f2 100644
--- a/tests/test_dosage.py
+++ b/tests/test_dosage.py
@@ -5,12 +5,14 @@
 
 from __future__ import absolute_import, division, print_function
 
+import json
+import re
+
 import pytest
 import responses
 
 import dosagelib.cmd
 import httpmocks
-import json
 
 
 def cmd(*options):
@@ -29,6 +31,9 @@ def cmd_err(*options):
 class TestDosage(object):
     """Test the dosage commandline client."""
 
+    # This shouldn't hit the network at all, so add responses without mocks to
+    # make sure it doesn't do that
+    @responses.activate
     def test_list_comics(self):
         for option in ("-l", "--list", "--singlelist"):
             cmd_ok(option)
@@ -62,10 +67,13 @@ class TestDosage(object):
 
     @responses.activate
     def test_fetch_html_and_rss_2(self, tmpdir):
-        httpmocks.bloomingfaeries()
+        httpmocks.page('http://www.bloomingfaeries.com/', 'bf-home')
+        httpmocks.page(re.compile('http://www.*faeries-405/'), 'bf-405')
+        httpmocks.png(re.compile(r'http://www\.bloomingfaeries\.com/.*\.jpg'))
+
         cmd_ok("--numstrips", "2", "--baseurl", "bla", "--basepath",
-               str(tmpdir), "--output", "rss", "--output", "html", "--adult",
-               "BloomingFaeries")
+            str(tmpdir), "--output", "rss", "--output", "html", "--adult",
+            "BloomingFaeries")
 
     @responses.activate
     def test_fetch_indexed(self, tmpdir):
@@ -74,8 +82,11 @@ class TestDosage(object):
 
     @responses.activate
     def test_json_page_key_bounce_and_multi_image(self, tmpdir):
-        httpmocks.zenpencils()
-        print(tmpdir)
+        httpmocks.page('https://zenpencils.com/', 'zp-home')
+        httpmocks.page('https://zenpencils.com/comic/missing/', 'zp-223')
+        httpmocks.page('https://zenpencils.com/comic/lifejacket/', 'zp-222')
+        httpmocks.jpeg(re.compile(r'https://cdn-.*\.jpg'))
+
         cmd_ok("-v", "-b", str(tmpdir), "-o", "json", "ZenPencils")
 
         directory = tmpdir.join('ZenPencils')
diff --git a/tests/test_modules.py b/tests/test_modules.py
new file mode 100644
index 000000000..bbf8325af
--- /dev/null
+++ b/tests/test_modules.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2019 Tobias Gruetzmacher
+
+from __future__ import absolute_import, division, print_function
+
+import re
+
+import responses
+
+import dosagelib.cmd
+import httpmocks
+
+
+def cmd(*options):
+    """'Fake' run dosage with given options."""
+    assert dosagelib.cmd.main(("--allow-multiple",) + options) == 0
+
+
+class TestModules(object):
+    """Test that specific comic modules work correctly."""
+
+    @responses.activate
+    def test_turnoff(self, tmpdir):
+        httpmocks.page('https://turnoff.us/', 'turnoff-home')
+        httpmocks.page('https://turnoff.us/geek/the-bad-design-punisher',
+            'turnoff-229')
+
+        httpmocks.png(re.compile(r'https://turnoff\.us/image/en/.*\.png'))
+
+        cmd('--numstrips', '2', '--basepath', str(tmpdir), 'turnoff')
diff --git a/tests/test_vote.py b/tests/test_vote.py
index c8d3fbb00..de3856cdc 100644
--- a/tests/test_vote.py
+++ b/tests/test_vote.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2017 Tobias Gruetzmacher
+# Copyright (C) 2015-2019 Tobias Gruetzmacher
 
 from __future__ import absolute_import, division, print_function
 
 import responses
 
 from dosagelib import scraper
-import httpmocks
 
 
 class ATestScraper(scraper._BasicScraper):
@@ -16,8 +15,8 @@ class ATestScraper(scraper._BasicScraper):
 
 
 class TestVote(object):
-
     @responses.activate
     def test_vote(self):
-        httpmocks.vote()
+        responses.add(responses.POST, 'https://buildbox.23.gs/count/', '')
+
         ATestScraper('Test_Test').vote()