Test cases improved.

rmariuzzo · Jul 9, 2016 · e5f8cc1 · e5f8cc1
1 parent 45282ea
commit e5f8cc1
Show file tree

Hide file tree

Showing 16 changed files with 424 additions and 340 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -2,72 +2,77 @@
 
 module.exports = function (grunt) {
 
-  // Load all Grunt tasks.
-  require('load-grunt-tasks')(grunt);
+    // Load all Grunt tasks.
+    require('load-grunt-tasks')(grunt);
 
-  // Grunt configuration.
-  grunt.initConfig({
+    // Grunt configuration.
+    grunt.initConfig({
 
-    pkg: grunt.file.readJSON('package.json'),
+        pkg: grunt.file.readJSON('package.json'),
 
-    clean: ['dist'],
+        clean: ['dist'],
 
-    watch: {
-      scripts: {
-        files: [
-          'Gruntfile.js',
-          'src/**/*.js',
-          'tests/specs/**/*.js',
-          '!.grunt'
-        ],
-        tasks: ['jshint', 'jasmine']
-      }
-    },
+        watch: {
+            scripts: {
+                files: [
+                    'Gruntfile.js',
+                    'src/**/*.js',
+                    'tests/specs/**/*.js',
+                    'tests/helpers.js',
+                    '!.grunt'
+                ],
+                tasks: ['jshint', 'jasmine']
+            }
+        },
 
-    uglify: {
-      all: {
-        files: {
-          'dist/jquery.checkboxes-<%= pkg.version %>.min.js': ['src/jquery.checkboxes.js']
+        uglify: {
+            all: {
+                files: {
+                    'dist/jquery.checkboxes-<%= pkg.version %>.min.js': ['src/jquery.checkboxes.js']
+                },
+                options: {
+                    banner: '/*! checkboxes.js v<%= pkg.version %> | ' +
+                        '(c) 2013, <%= grunt.template.today("yyyy") %> Rubens Mariuzzo | ' +
+                        'http://github.com/rmariuzzo/checkboxes.js/LICENSE */',
+                }
+            }
         },
-        options: {
-          banner: '/*! checkboxes.js v<%= pkg.version %> | ' +
-            '(c) 2013, <%= grunt.template.today("yyyy") %> Rubens Mariuzzo | ' +
-            'http://github.com/rmariuzzo/checkboxes.js/LICENSE */',
-        }
-      }
-    },
 
-    jshint: {
-      all: {
-        src: [
-          'Gruntfile.js',
-          'src/**/*.js',
-          'tests/spec/**/*.js'
-        ],
-        options: {
-          jshintrc: true
-        }
-      }
-    },
+        jshint: {
+            all: {
+                src: [
+                    'Gruntfile.js',
+                    'src/**/*.js',
+                    'tests/spec/**/*.js'
+                ],
+                options: {
+                    jshintrc: '<%= baseDir %>.jshintrc',
+                    reporterOutput: ''
+                }
+            }
+        },
 
-    jasmine: {
-      all: {
-        src: 'src/**/*.js',
-        options: {
-          specs: 'tests/specs/*_spec.js',
-          vendor: [
-            'bower_components/jquery/dist/jquery.min.js',
-            'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
-          ]
+        jasmine: {
+            all: {
+                src: 'src/**/*.js',
+                options: {
+                    specs: 'tests/specs/*_spec.js',
+                    vendor: [
+                        'bower_components/jquery/dist/jquery.min.js',
+                        'bower_components/jasmine-jquery/lib/jasmine-jquery.js'
+                    ],
+                    helpers: [
+                        'tests/helpers.js'
+                    ]
+                }
+            }
         }
-      }
-    }
 
-  });
+    });
 
-  grunt.registerTask('default', ['jshint', 'watch']);
-  grunt.registerTask('build', ['clean', 'jshint', 'jasmine', 'uglify']);
-  grunt.registerTask('test', ['jasmine']);
-  grunt.registerTask('travis', ['jshint', 'jasmine']);
+    grunt.registerTask('default', ['jshint', 'watch']);
+    grunt.registerTask('build', ['clean', 'jshint', 'jasmine', 'uglify']);
+    grunt.registerTask('test', ['jasmine']);
+    grunt.registerTask('travis', ['jshint', 'jasmine']);
 
 };
diff --git a/bower.json b/bower.json
@@ -1,32 +1,32 @@
 {
-  "name": "checkboxes.js",
-  "version": "1.0.5",
-  "homepage": "http://rmariuzzo.github.io/checkboxes.js/",
-  "authors": [
-    "Rubens Mariuzzo <[email protected]>"
-  ],
-  "description": "A jQuery plugin that give you nice powers over your checkboxes.",
-  "main": "src/jquery.checkboxes.js",
-  "keywords": [
-    "checkbox",
-    "checkboxes",
-    "jquery",
-    "plugin",
-    "check",
-    "uncheck",
-    "range",
-    "selection"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "devDependencies": {
-    "jquery": "~2.1.1",
-    "jasmine-jquery": "~2.0.3"
-  }
+    "name": "checkboxes.js",
+    "version": "1.0.5",
+    "homepage": "http://rmariuzzo.github.io/checkboxes.js/",
+    "authors": [
+        "Rubens Mariuzzo <[email protected]>"
+    ],
+    "description": "A jQuery plugin that give you nice powers over your checkboxes.",
+    "main": "src/jquery.checkboxes.js",
+    "keywords": [
+        "checkbox",
+        "checkboxes",
+        "jquery",
+        "plugin",
+        "check",
+        "uncheck",
+        "range",
+        "selection"
+    ],
+    "license": "MIT",
+    "ignore": [
+        "**/.*",
+        "node_modules",
+        "bower_components",
+        "test",
+        "tests"
+    ],
+    "devDependencies": {
+        "jquery": "~2.1.1",
+        "jasmine-jquery": "~2.0.3"
+    }
 }
diff --git a/package.json b/package.json
@@ -1,38 +1,38 @@
 {
-  "name": "checkboxes.js",
-  "version": "1.0.6",
-  "description": "A jQuery plugin that gives you nice powers over your checkboxes.",
-  "keywords": [
-    "checkbox",
-    "checkboxes",
-    "range",
-    "jquery",
-    "plugin"
-  ],
-  "homepage": "https://github.com/rmariuzzo/checkboxes.js",
-  "bugs": "https://github.com/rmariuzzo/checkboxes.js/issues",
-  "license": "MIT",
-  "author": {
-    "name": "Rubens Mariuzzo",
-    "email": "[email protected]",
-    "url": "https://github.com/rmariuzzo"
-  },
-  "contributors": [],
-  "main": "dist/jquery.checkboxes-1.0.6.min.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rmariuzzo/checkboxes.js.git"
-  },
-  "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-jasmine": "~0.6.5",
-    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-watch": "~0.6.1",
-    "load-grunt-tasks": "~0.4.0"
-  },
-  "scripts": {
-    "test": "grunt travis --verbose"
-  }
+    "name": "checkboxes.js",
+    "version": "1.0.6",
+    "description": "A jQuery plugin that gives you nice powers over your checkboxes.",
+    "keywords": [
+        "checkbox",
+        "checkboxes",
+        "range",
+        "jquery",
+        "plugin"
+    ],
+    "homepage": "https://github.com/rmariuzzo/checkboxes.js",
+    "bugs": "https://github.com/rmariuzzo/checkboxes.js/issues",
+    "license": "MIT",
+    "author": {
+        "name": "Rubens Mariuzzo",
+        "email": "[email protected]",
+        "url": "https://github.com/rmariuzzo"
+    },
+    "contributors": [],
+    "main": "dist/jquery.checkboxes-1.0.6.min.js",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/rmariuzzo/checkboxes.js.git"
+    },
+    "devDependencies": {
+        "grunt": "~0.4.1",
+        "grunt-contrib-clean": "^0.6.0",
+        "grunt-contrib-jasmine": "~0.6.5",
+        "grunt-contrib-jshint": "~0.10.0",
+        "grunt-contrib-uglify": "~0.2.2",
+        "grunt-contrib-watch": "~0.6.1",
+        "load-grunt-tasks": "~0.4.0"
+    },
+    "scripts": {
+        "test": "grunt travis --verbose"
+    }
 }
diff --git a/src/jquery.checkboxes.js b/src/jquery.checkboxes.js
@@ -21,14 +21,15 @@
     Checkboxes.prototype.check = function () {
         this.$context.find(':checkbox')
             .filter(':not(:disabled)')
+            .filter(':visible')
             .prop('checked', true);
     };
 
     /**
      * Uncheck all checkboxes in context.
      */
     Checkboxes.prototype.uncheck = function () {
-        this.$context.find(':checkbox')
+        this.$context.find(':checkbox:visible')
             .filter(':not(:disabled)')
             .prop('checked', false);
     };
@@ -37,7 +38,7 @@
      * Toggle the state of all checkboxes in context.
      */
     Checkboxes.prototype.toggle = function () {
-        this.$context.find(':checkbox')
+        this.$context.find(':checkbox:visible')
             .filter(':not(:disabled)')
             .each(function () {
                 var $checkbox = $(this);
@@ -63,7 +64,7 @@
             });
         } else {
             // Disable max.
-            this.$context.off('click.checkboxes');
+            this.$context.off('click.checkboxes.max');
         }
     };
 
@@ -80,7 +81,7 @@
                 var $checkbox = $(event.target);
 
                 if (event.shiftKey && instance.$last) {
-                    var $checkboxes = instance.$context.find(':checkbox');
+                    var $checkboxes = instance.$context.find(':checkbox:visible');
                     var from = $checkboxes.index(instance.$last);
                     var to = $checkboxes.index($checkbox);
                     var start = Math.min(from, to);

diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -22,6 +22,7 @@
         "spyOn": true,
         "jasmine": true,
         "$": true,
-        "loadFixtures": true
+        "loadFixtures": true,
+        "setupContext": true,
     }
 }
diff --git a/tests/fixtures/checked.html b/tests/fixtures/checked.html
@@ -1,38 +1,43 @@
 <!doctype html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <title></title>
 </head>
+
 <body>
-    <input type="checkbox" id="1" checked>
-    <label for="1">Row #1</label>
-    <br>
-    <input type="checkbox" id="2" checked>
-    <label for="2">Row #2</label>
-    <br>
-    <input type="checkbox" id="3" checked>
-    <label for="3">Row #3</label>
-    <br>
-    <input type="checkbox" id="4" checked>
-    <label for="4">Row #4</label>
-    <br>
-    <input type="checkbox" id="5" checked>
-    <label for="5">Row #5</label>
-    <br>
-    <input type="checkbox" id="6" checked>
-    <label for="6">Row #6</label>
-    <br>
-    <input type="checkbox" id="7" checked disabled="disabled">
-    <label for="7">Row #7</label>
-    <br>
-    <input type="checkbox" id="8" checked>
-    <label for="8">Row #8</label>
-    <br>
-    <input type="checkbox" id="9" checked>
-    <label for="9">Row #9</label>
-    <br>
-    <input type="checkbox" id="10" checked>
-    <label for="10">Row #10</label>
+    <div id="context">
+        <input type="checkbox" id="1" checked>
+        <label for="1">Row #1</label>
+        <br>
+        <input type="checkbox" id="2" checked>
+        <label for="2">Row #2</label>
+        <br>
+        <input type="checkbox" id="3" checked>
+        <label for="3">Row #3</label>
+        <br>
+        <input type="checkbox" id="4" checked>
+        <label for="4">Row #4</label>
+        <br>
+        <input type="checkbox" id="5" checked style="display:none">
+        <label for="5">Row #5</label>
+        <br>
+        <input type="checkbox" id="6" checked>
+        <label for="6">Row #6</label>
+        <br>
+        <input type="checkbox" id="7" checked disabled="disabled">
+        <label for="7">Row #7</label>
+        <br>
+        <input type="checkbox" id="8" checked>
+        <label for="8">Row #8</label>
+        <br>
+        <input type="checkbox" id="9" checked>
+        <label for="9">Row #9</label>
+        <br>
+        <input type="checkbox" id="10" checked>
+        <label for="10">Row #10</label>
+    </div>
 </body>
-</html>
+
+</html>