diff tests/mockutil.py @ 36:485682a6de50

New site layout support.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 20 Aug 2014 23:16:51 -0700
parents e4c345dcf33c
children 3471ffa059b2
line wrap: on
line diff
--- a/tests/mockutil.py	Wed Aug 20 21:46:27 2014 -0700
+++ b/tests/mockutil.py	Wed Aug 20 23:16:51 2014 -0700
@@ -37,7 +37,7 @@
         self._fs = {self._root: {}}
         if default_spec:
             self.withDir('counter')
-            self.withFile('kitchen/_content/config.yml',
+            self.withFile('kitchen/config.yml',
                     "site:\n  title: Mock Website\n")
 
     def path(self, p):
@@ -72,12 +72,12 @@
 
     def withConfig(self, config):
         return self.withFile(
-                'kitchen/_content/config.yml',
+                'kitchen/config.yml',
                 yaml.dump(config))
 
     def withThemeConfig(self, config):
         return self.withFile(
-                'kitchen/_content/theme/_content/theme_config.yml',
+                'kitchen/theme/theme_config.yml',
                 yaml.dump(config))
 
     def withPage(self, url, config=None, contents=None):
@@ -92,13 +92,13 @@
         if not ext:
             url += '.md'
         url = url.lstrip('/')
-        return self.withAsset('_content/' + url, text)
+        return self.withAsset(url, text)
 
     def withPageAsset(self, page_url, name, contents=None):
         contents = contents or "A test asset."
         url_base, ext = os.path.splitext(page_url)
         dirname = url_base + '-assets'
-        return self.withAsset('_content/%s/%s' % (dirname, name),
+        return self.withAsset('%s/%s' % (dirname, name),
                 contents)
 
     def getStructure(self, path=None):