Updated CHANGELOG and fixed test_none_root

ckan · Aug 1, 2017 · 638262b · 638262b
1 parent 908f51d
commit 638262b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,7 +8,7 @@ Changelog
 ---------
 
 v2.7.0 2017-08-02
-==========
+=================
 
 Note: Starting from this version, CKAN requires at least Postgres 9.3
 

diff --git a/ckan/tests/test_none_root.py b/ckan/tests/test_none_root.py
@@ -14,6 +14,7 @@ def test_resource_url(self):
         app = webtest.TestApp(wsgiapp)
         p.load(u'example_theme_v15_fanstatic')
         content = app.get(u'/en/base.html')
-        assert u'example_theme.css' in content
+        if u'example_theme.css' not in content:
+            assert u'example_theme.min.css' in content
         assert u'href="/data/fanstatic/example_theme' in content
         p.unload(u'example_theme_v15_fanstatic')