added nunjucks for template rendering

timomayer · Feb 14, 2016 · 5b3d84f · 5b3d84f
1 parent 953e3cc
commit 5b3d84f
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .idea
-node_modules
+node_modules
+test/pages
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,9 +1,12 @@
-var spawn = require('child_process').spawn,
-    gulp = require('gulp'),
-    gutil = require('gulp-util');
+var spawn = require('child_process').spawn;
+var gulp = require('gulp');
+var gutil = require('gulp-util');
+var nunjucksRender = require('gulp-nunjucks-render');
 
-gulp.task('test', function () {
-    var tests = ['test/'];
+
+gulp.task('test', ['nunjucks'], function () {
+
+    var tests = ['test/casper/tests/'];
     var casperChild = spawn('casperjs', ['test'].concat(tests));
 
     casperChild.stdout.on('data', function (data) {
@@ -18,4 +21,16 @@ gulp.task('test', function () {
             process.exit(1);
         }
     });
+
+});
+
+gulp.task('nunjucks', function() {
+
+    // Gets .html and .nunjucks files in pages
+    return gulp.src('test/nunjucks/*.nunjucks')
+        .pipe(nunjucksRender({
+            path: ['test/nunjucks/partials/', 'test/nunjucks/layouts/']
+        }))
+        .pipe(gulp.dest('test/pages/'))
+
 });
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
   "devDependencies": {
     "casperjs": "^1.1.0-beta5",
     "gulp": "^3.9.1",
+    "gulp-nunjucks-render": "^2.0.0",
     "gulp-util": "^3.0.7"
   }
 }
diff --git a/test/casper/include/test.js b/test/casper/include/test.js
@@ -0,0 +1,9 @@
+module.exports = {
+    sayHi: function() {
+        console.log('Hello from module.exports');
+    }
+};
+
+casper.sayHiAgain = function() {
+    this.echo('Hello from casper function');
+};
diff --git a/test/test1.js → test/casper/tests/test1.js b/test/test1.js → test/casper/tests/test1.js
@@ -1,13 +1,18 @@
+var includeTest = require('../include/test');
+
 casper.test.begin('testing.html contains stuff', 3, function (test) {
 
-    casper.start('./test/test1.html', function () {
+    casper.start('./test/pages/test1.html', function () {
         test.assertTitle('Test Page');
         test.assertSelectorHasText('h1', 'Test!');
     });
 
     casper.then(function () {
         this.click('button');
         test.assertSelectorHasText('h1', 'New title');
+
+        includeTest.sayHi();
+        casper.sayHiAgain();
     });
 
     casper.run(function() {

diff --git a/test/nunjucks/layouts/master.html b/test/nunjucks/layouts/master.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Test Page</title>
+    <meta charset="utf-8">
+    {% block styles %}{% endblock %}
+</head>
+<body>
+
+{% block content %}{% endblock %}
+
+{% block includes %}{% endblock %}
+<script>
+    {% block scripts %}{% endblock %}
+</script>
+
+</body>
+</html>
diff --git a/test/nunjucks/partials/accordion.default.nunjucks b/test/nunjucks/partials/accordion.default.nunjucks
@@ -0,0 +1 @@
+<button>Change title</button>
diff --git a/test/nunjucks/test1.nunjucks b/test/nunjucks/test1.nunjucks
@@ -0,0 +1,17 @@
+{% extends "master.html" %}
+
+{% block content %}
+
+    <h1>Test!</h1>
+    {% include "accordion.default.nunjucks" %}
+
+{% endblock %}
+
+
+{% block scripts %}
+
+    document.querySelector('button').addEventListener('click', function () {
+        document.querySelector('h1').innerHTML = 'New title';
+    });
+
+{% endblock %}
diff --git a/test/test1.html b/test/test1.html