From 923421d6377f409013a51291adf9d043d9df5183 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Fri, 16 May 2014 22:43:53 -0700 Subject: [PATCH] rewrite_content: add a few tests for cs_, js_, remove redundant except --- pywb/rewrite/rewrite_content.py | 7 ++----- tests/test_integration.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pywb/rewrite/rewrite_content.py b/pywb/rewrite/rewrite_content.py index 4abb1bd0..ee28f75d 100644 --- a/pywb/rewrite/rewrite_content.py +++ b/pywb/rewrite/rewrite_content.py @@ -94,7 +94,7 @@ class RewriteContent: if isinstance(stream, ChunkedDataReader): stream.set_decomp('gzip') else: - stream = DecompressingBufferedReader(stream, decomp_type='gzip') + stream = DecompressingBufferedReader(stream) if rewritten_headers.charset: encoding = rewritten_headers.charset @@ -109,10 +109,7 @@ class RewriteContent: rule = self.ruleset.get_first_match(urlkey) - try: - rewriter_class = rule.rewriters[text_type] - except KeyError: - raise Exception('Unknown Text Type for Rewrite: ' + text_type) + rewriter_class = rule.rewriters[text_type] # for html, need to perform header insert, supply js, css, xml # rewriters diff --git a/tests/test_integration.py b/tests/test_integration.py index 54620084..9d0fad17 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -151,6 +151,17 @@ class TestWb: resp = self.testapp.get('/pywb/20140126200654/http://www.iana.org/_img/2013.1/rir-map.svg') assert resp.headers['Content-Length'] == str(len(resp.body)) + def test_replay_css_mod(self): + resp = self.testapp.get('/pywb/20140127171239cs_/http://www.iana.org/_css/2013.1/screen.css') + assert resp.status_int == 200 + assert resp.content_type == 'text/css' + + def test_replay_js_mod(self): + # an empty js file + resp = self.testapp.get('/pywb/20140126201054js_/http://www.iana.org/_js/2013.1/iana.js') + assert resp.status_int == 200 + assert resp.content_length == 0 + assert resp.content_type == 'application/x-javascript' def test_redirect_1(self): resp = self.testapp.get('/pywb/20140127171237/http://www.iana.org/')