Merge pull request #5 from xsellier/bugfix/password-of-length-4-is-mi…

…ssing-uppercase Fix issue with password requirement generation (length 4)
xsellier · Sep 15, 2016 · 9e441f6 · 9e441f6
2 parents 265274d + a8133ee
commit 9e441f6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,10 @@ Tests are written with mocha/chai.
 ```
 
 ## Changelog
+1.1.3
+- Fix issue with password requirement generation
+- Add unit tests
+
 1.1.2
 - Remove lodash from dependencies
 - Upgrade devDependencies

diff --git a/lib/index.js b/lib/index.js
@@ -60,7 +60,7 @@ function generatePassword(pOptions, pLength) {
   }
 
   var fillRequirement = function(asciiType) {
-    var numberOfType = generateNumber(1, (length - reservedChars));
+    var numberOfType = generateNumber(1, (length - reservedChars + 1));
 
     for (index = 0; index < numberOfType; ++index) {
       var max         = available.length - 1;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "password-maker",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Generate a password randomly",
   "main": "lib/index.js",
   "scripts": {

diff --git a/test/password-maker-test.js b/test/password-maker-test.js
@@ -83,4 +83,14 @@ describe("The password-maker", function() {
 
     done();
   });
+
+  it("should generate a password with lower, upper, number and symbol with size 4", function(done) {
+    for(var index = 0; index < 100; ++index) {
+      var result = passwordMaker.generatePassword(4);
+      expect(result).to.match(/[A-Z]/);
+      expect(result).to.match(/[-!$%^&*()_+|~=`{}\[\]:";'<>?,.\/#]/);
+      expect(result).to.match(/[0-9]/);
+    }
+    done();
+  });
 });