From cfa68c76de8e6d2204ad0034b90b26d425385056 Mon Sep 17 00:00:00 2001 From: Glen Cheney Date: Fri, 8 Apr 2016 18:20:03 -0700 Subject: [PATCH] Switch to mocha/chai for tests with gulp-mocha-phantomjs JSDom's getComputedStyle wasn't working. --- _includes/scripts.html | 7 +- _posts/2014-03-08-bootstrap3-grid.html | 9 +- _posts/2014-04-09-requirejs.html | 6 +- dist/shuffle.js | 12 +- dist/shuffle.min.js | 2 +- gulp/tasks/set-watching.js | 2 + gulp/tasks/test.js | 24 +++ gulpfile.js | 3 +- js/page.js | 16 +- js/require-main.js | 21 +- package.json | 24 +-- src/shuffle.es6.js | 11 +- test/preprocessor.js | 16 -- test/runner.html | 31 +++ test/test.js | 288 +++++++++++++++++++++++++ 15 files changed, 383 insertions(+), 89 deletions(-) create mode 100644 gulp/tasks/test.js delete mode 100644 test/preprocessor.js create mode 100644 test/runner.html create mode 100644 test/test.js diff --git a/_includes/scripts.html b/_includes/scripts.html index d3b5263..6362fd6 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,10 +1,5 @@ {% if page.jquery != false %} - - - {% endif %} {% if page.shuffle != false %} @@ -19,8 +14,8 @@ {% if page.pagejs != false %} - + {% endif %} {% if page.extraJS && page.extraJS.length %} diff --git a/_posts/2014-03-08-bootstrap3-grid.html b/_posts/2014-03-08-bootstrap3-grid.html index 5cbba20..12fcd03 100644 --- a/_posts/2014-03-08-bootstrap3-grid.html +++ b/_posts/2014-03-08-bootstrap3-grid.html @@ -3,7 +3,7 @@ layout: default title: Bootstrap 3 Grid Demo description: Demonstrating how Shuffle can be used with a grid system which uses padding for gutters instead of margins. image: /demos/bootstrap3grid.jpg -externalCSS: [ "http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" ] +externalCSS: [ "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" ] extraJS: [ "demos/padding-grid.js" ] ---