Merge branch 'fix-build'

.gitignore

@@ -1,4 +1,5 @@
 *~
+.c9revisions
+.DS_Store
 node_modules
-sauce_connect.log
-.c9revisions
+sauce_connect.log

documentation/contributing.md

@@ -63,12 +63,14 @@ If you have tested bug fixes or new features, you can open a
 
 ## Releasing a new version
 
-1. Run `npm test`
+1. In `package.json` temporarily change `"./lib/index"` to `"."`
+2. Run `npm test`
     * Locally open http://localhost:8080/test/
     * Or use the SauceLabs configuration above
-2. Update `JSZip.version` in `index.js` and in `package.json`
-3. Run `grunt` to generate the new dist files
+3. Update `JSZip.version` in `index.js` and in `package.json`
+4. Run `grunt` to generate the new dist files
     * undo the package.json change, it was just needed to replace the `__VERSION__` in the header
-4. Update CHANGES.md
-5. Run `npm version ...` where `...` is `major`, `minor`, or `patch`
-6. Run npm publish
+5. Undo step 1.
+6. Update CHANGES.md
+7. Run `npm version ...` where `...` is `major`, `minor`, or `patch`
+8. Run npm publish

test/asserts/load.js

@@ -22,8 +22,7 @@ QUnit.module("load", function () {
         assert.ok(typeof file === "string");
         JSZip.loadAsync(file)
         .then(function (zip) {
-            // Passes in Node, fails in browsers:
-            // assert.equal(Object.getPrototypeOf(zip.files), zip.files.__proto__); // jshint ignore:line
+            assert.notEqual(Object.getPrototypeOf(zip.files), zip.files.__proto__); // jshint ignore:line
             return zip.file("__proto__").async("string");        })
         .then(function(result) {
             assert.equal(result, "hello\n", "the zip was correctly read.");