equal
deleted
inserted
replaced
118 req._url = url |
118 req._url = url |
119 res = self.app_handle_request(req, url) |
119 res = self.app_handle_request(req, url) |
120 yield res, req |
120 yield res, req |
121 |
121 |
122 def expected_content(self, js_files): |
122 def expected_content(self, js_files): |
123 content = u'' |
123 content = b'' |
124 for js_file in js_files: |
124 for js_file in js_files: |
125 dirpath, rid = self.config.locate_resource(js_file) |
125 dirpath, rid = self.config.locate_resource(js_file) |
126 if dirpath is not None: # ignore resources not found |
126 if dirpath is not None: # ignore resources not found |
127 with open(osp.join(dirpath, rid)) as f: |
127 with open(osp.join(dirpath, rid), 'rb') as f: |
128 content += f.read() + '\n' |
128 content += f.read() + b'\n' |
129 return content |
129 return content |
130 |
130 |
131 def test_cache(self): |
131 def test_cache(self): |
132 js_files = ('cubicweb.ajax.js', 'jquery.js') |
132 js_files = ('cubicweb.ajax.js', 'jquery.js') |
133 with self._publish_js_files(js_files) as (result, req): |
133 with self._publish_js_files(js_files) as (result, req): |