Fix test for when "paster front-end-build" has been run, eg during re…

…lease.
ckan · Dec 17, 2015 · 63fff86 · 63fff86
1 parent e41cac2
commit 63fff86
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/ckan/tests/controllers/test_admin.py b/ckan/tests/controllers/test_admin.py
@@ -95,7 +95,8 @@ def test_main_css(self):
 
         # current style
         index_response = app.get('/')
-        assert_true('main.css' in index_response)
+        assert_true('main.css' in index_response or
+                    'main.min.css' in index_response)
 
         # set new style css
         env, config_response = _get_admin_config_page(app)
@@ -105,13 +106,16 @@ def test_main_css(self):
 
         # new style
         new_index_response = app.get('/')
-        assert_true('red.css' in new_index_response)
+        assert_true('red.css' in new_index_response or
+                    'red.min.css' in new_index_response)
         assert_true('main.css' not in new_index_response)
+        assert_true('main.min.css' not in new_index_response)
 
         # reset config value
         _reset_config(app)
         reset_index_response = app.get('/')
-        assert_true('main.css' in reset_index_response)
+        assert_true('main.css' in reset_index_response or
+                    'main.min.css' in reset_index_response)
 
     def test_tag_line(self):
         '''Add a tag line (only when no logo)'''