From 8cdd23a57b4e5ae1cbd29421c9e8b103329127b6 Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Sun, 16 Aug 2020 16:17:28 -0400 Subject: [PATCH] #24 switched to absolute paths relative paths won't necessarily work in css files --- cellxgene_gateway/cache_entry.py | 2 +- tests/test_cache_entry.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cellxgene_gateway/cache_entry.py b/cellxgene_gateway/cache_entry.py index cab230d..60563a1 100644 --- a/cellxgene_gateway/cache_entry.py +++ b/cellxgene_gateway/cache_entry.py @@ -99,7 +99,7 @@ class CacheEntry: def rewrite_text_content(self, cellxgene_content): # for v0.16.0 compatibility, see issue #24 - gateway_content = re.sub('(="|\()/static/', r'\1static/', cellxgene_content).replace( + gateway_content = re.sub('(="|\()/static/', f'\\1{self.gateway_basepath()}static/', cellxgene_content).replace( "http://fonts.gstatic.com", "https://fonts.gstatic.com" ).replace(self.cellxgene_basepath(), self.gateway_basepath()) return gateway_content diff --git a/tests/test_cache_entry.py b/tests/test_cache_entry.py index 8afab85..c5ec12e 100644 --- a/tests/test_cache_entry.py +++ b/tests/test_cache_entry.py @@ -2,15 +2,15 @@ import unittest from cellxgene_gateway.cache_entry import CacheEntry from cellxgene_gateway.cache_key import CacheKey -key = CacheKey('path/part', 'dataset', 'tmp.csv') +key = CacheKey('czi/pbmc3k.h5ad', 'pbmc3k.h5ad', 'tmp.csv') class TestRenderEntry(unittest.TestCase): - def test_GIVEN_absolute_static_url_THEN_return_relative(self): + def test_GIVEN_absolute_static_url_THEN_include_path(self): actual = CacheEntry.for_key(key, 8000).rewrite_text_content("src:url(/static/assets/") - expected = "src:url(static/assets/" + expected = "src:url(http://localhost:5005/view/czi/pbmc3k.h5ad/static/assets/" self.assertEqual(actual, expected) - def test_GIVEN_absolute_src_THEN_return_relative(self): + def test_GIVEN_absolute_src_THEN_include_path(self): actual = CacheEntry.for_key(key, 8000).rewrite_text_content('') - expected = '' + expected = '' self.assertEqual(actual, expected)