diff --git a/gruntFile.js b/gruntFile.js index e5dd07e..1c08152 100644 --- a/gruntFile.js +++ b/gruntFile.js @@ -85,27 +85,8 @@ module.exports = function(grunt) { options: { jshintrc: '.jshintrc' } }, test: { - files:{ src : [ 'test/*.spec.js', 'gruntFile.js'] }, - options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), { - node: true, - globals: { - angular: false, - inject: false, - '$': false, - - jasmine: false, - afterEach: false, - beforeEach: false, - ddescribe: false, - describe: false, - expect: false, - iit: false, - it: false, - spyOn: false, - xdescribe: false, - xit: false - } - }) + files:{ src : [ 'test/*.js', 'gruntFile.js'] }, + options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), grunt.file.readJSON('test/.jshintrc')) } }, diff --git a/test/.jshintrc b/test/.jshintrc new file mode 100644 index 0000000..8b87655 --- /dev/null +++ b/test/.jshintrc @@ -0,0 +1,20 @@ +{ + "node": true, + "globals": { + "angular": false, + "inject": false, + "$": false, + + "jasmine": false, + "afterEach": false, + "beforeEach": false, + "ddescribe": false, + "describe": false, + "expect": false, + "iit": false, + "it": false, + "spyOn": false, + "xdescribe": false, + "xit": false + } +} diff --git a/test/karma.conf.js b/test/karma.conf.js index 89e0c70..f6700c2 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -1,6 +1,8 @@ // Karma configuration // Generated on Sat Dec 28 2013 20:27:08 GMT+0100 (CET) +'use strict'; + module.exports = function(config) { config.set({ diff --git a/test/sortable.test-directives.js b/test/sortable.test-directives.js index de5c6e0..f555ada 100644 --- a/test/sortable.test-directives.js +++ b/test/sortable.test-directives.js @@ -8,10 +8,10 @@ angular.module('ui.sortable.testDirectives', []) scope: true, require: '?ngModel', template: '