Merge pull request #49 from firstandthird/grouped-data

add support for groupedData
firstandthird · Mar 2, 2019 · d1a0c60 · d1a0c60
2 parents 5fba46e + aab5c0b
commit d1a0c60
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/.node-version b/.node-version
diff --git a/lib/handler.js b/lib/handler.js
@@ -12,7 +12,7 @@ module.exports = function(viewConfig) {
       }
     }
     // aug with globals:
-    const obj = aug({}, viewConfig.data, viewConfig.options.globals);
+    const obj = aug({}, viewConfig.data, viewConfig.groupedData, viewConfig.options.globals);
     let result;
 
     try {

diff --git a/test/test.views.js b/test/test.views.js
@@ -137,6 +137,53 @@ lab.test('globals', async() => {
   await server.stop();
 });
 
+lab.test('grouped', async() => {
+  const server = new Hapi.Server({
+    debug: { request: '*', log: 'hapi-views' }
+  });
+  server.method('yaml', (request, yamlFile) => {
+    return new Promise((resolve) => {
+      return resolve({ test1: true });
+    });
+  });
+  // start server
+  await server.register([
+    require('vision'),
+    {
+      plugin: require('../'),
+      options: {
+        dataPath: `${process.cwd()}/test/yaml`,
+        routes: {
+          '/yaml': {
+            view: 'yaml',
+            groupedData: {
+              grouped: true
+            },
+            data: {
+              yaml1: 'yaml()',
+            }
+          }
+        },
+        globals: {
+          yaml2: { property: 1235 }
+        }
+      }
+    }
+  ]);
+  server.views({
+    engines: { html: require('handlebars') },
+    path: `${__dirname}/views`
+  });
+  const response = await server.inject({ url: '/yaml' });
+  const context = response.request.response.source.context;
+  expect(context).to.equal({
+    yaml1: { test1: true },
+    yaml2: { property: 1235 },
+    grouped: true
+  });
+  await server.stop();
+});
+
 lab.test('onError', async() => {
   const server = new Hapi.Server({
     debug: { log: 'hapi-views', request: '*' },