Skip to content

Commit

Permalink
fix tests from merging develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AddisonSchiller committed Nov 16, 2017
1 parent 1683656 commit 1d9e73f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions tests/extensions/pdf/test_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_single_page_tiff(self, directory):
source_file_path = os.path.join(BASE, 'files', 'test.tif')
output_file_path = os.path.join(directory, 'test.{}'.format(settings.EXPORT_TYPE))
format = '{}.{}'.format(settings.EXPORT_MAXIMUM_SIZE, settings.EXPORT_TYPE)
exporter = PdfExporter(source_file_path=source_file_path,
exporter = PdfExporter(source_file_path=source_file_path, ext='.tif',
output_file_path=output_file_path, format=format)

assert not os.path.exists(output_file_path)
Expand All @@ -53,7 +53,7 @@ def test_multi_page_tiff(self, directory):
source_file_path = os.path.join(BASE, 'files', 'test_multipage.tif')
output_file_path = os.path.join(directory, 'test.{}'.format(settings.EXPORT_TYPE))
format = '{}.{}'.format(settings.EXPORT_MAXIMUM_SIZE, settings.EXPORT_TYPE)
exporter = PdfExporter(source_file_path=source_file_path,
exporter = PdfExporter(source_file_path=source_file_path, ext='.tif',
output_file_path=output_file_path, format=format)

assert not os.path.exists(output_file_path)
Expand All @@ -70,7 +70,7 @@ def test_ratio_tiff(self, directory):
source_file_path = os.path.join(BASE, 'files', 'test_ratio.tif')
output_file_path = os.path.join(directory, 'test.{}'.format(settings.EXPORT_TYPE))
format = '{}.{}'.format(settings.EXPORT_MAXIMUM_SIZE, settings.EXPORT_TYPE)
exporter = PdfExporter(source_file_path=source_file_path,
exporter = PdfExporter(source_file_path=source_file_path, ext='.tif',
output_file_path=output_file_path, format=format)

assert not os.path.exists(output_file_path)
Expand All @@ -88,7 +88,7 @@ def test_broken_tiff(self, directory):
source_file_path = os.path.join(BASE, 'files', 'test_broken.tif')
output_file_path = os.path.join(directory, 'test.{}'.format(settings.EXPORT_TYPE))
format = '{}.{}'.format(settings.EXPORT_MAXIMUM_SIZE, settings.EXPORT_TYPE)
exporter = PdfExporter(source_file_path=source_file_path,
exporter = PdfExporter(source_file_path=source_file_path, ext='.tif',
output_file_path=output_file_path, format=format)

assert not os.path.exists(output_file_path)
Expand All @@ -100,7 +100,7 @@ def test_bad_tiff(self, directory):
source_file_path = os.path.join(BASE, 'files', 'invalid.tif')
output_file_path = os.path.join(directory, 'test.{}'.format(settings.EXPORT_TYPE))
format = '{}.{}'.format(settings.EXPORT_MAXIMUM_SIZE, settings.EXPORT_TYPE)
exporter = PdfExporter(source_file_path=source_file_path,
exporter = PdfExporter(source_file_path=source_file_path, ext='.tif',
output_file_path=output_file_path, format=format)

assert not os.path.exists(output_file_path)
Expand Down
2 changes: 1 addition & 1 deletion tests/extensions/pdf/test_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ def test_render_tif(self, tif_renderer, assets_url):
settings.EXPORT_TYPE)

body = tif_renderer.render()
assert '<base href="{}/{}/web/">'.format(assets_url, 'pdf') in body
assert '<base href="{}/{}/web/" target="_blank">'.format(assets_url, 'pdf') in body
assert '<div id="viewer" class="pdfViewer"></div>' in body
assert 'DEFAULT_URL = \'{}\''.format(exported_url.url) in body

0 comments on commit 1d9e73f

Please sign in to comment.