@@ -36,26 +36,8 @@ Icon?
Thumbs.db
/node_modules/*
-test/IntergrationTests/js/*
data/*/*
-app.js
-app/js/*
-lib/js/*
-test/UnitTests/js/*
-cookies.txt
-uploads/*
-public/js/editor.js
-public/js/home.js
-public/js/forms.js
-public/js/gui.js
-public/js/admin.js
-public/stylesheets/mainStyle.css
-public/minjs/
-test/unit/js/
-test/acceptance/js
-
**.swp
/log.json
@@ -2,36 +2,14 @@ spawn = require("child_process").spawn
module.exports = (grunt) ->
grunt.initConfig
- coffee:
- # app_src:
- # expand: true,
- # cwd: "app/coffee"
- # src: ['**/*.coffee'],
- # dest: 'app/js/',
- # ext: '.js'
- # app:
- # src: "app.coffee"
- # dest: "app.js"
unit_tests:
expand: true
- cwd: "test/unit/coffee"
+ cwd: "test/unit/js"
src: ["**/*.coffee"]
dest: "test/unit/js/"
ext: ".js"
- # acceptance_tests:
- # expand: true
- # cwd: "test/acceptance/coffee"
- # src: ["**/*.coffee"]
- # dest: "test/acceptance/js/"
- # ext: ".js"
- clean:
- app: ["lib/js/"]
- unit_tests: ["test/unit/js"]
mochaTest:
unit:
options:
@@ -9,6 +9,8 @@
*/
const crypto = require('crypto');
+const Buffer = require('buffer').Buffer;
+
const ALGORITHM = 'aes-256-ctr';
const keyFn = (password, salt, callback)=> crypto.pbkdf2(password, salt, 10000, 64, 'sha1', callback);