Merge branch 'enhancement/random-supports-window.crypto' into dev

brockallen · brockallen · commit 6903f405f6d6 · 2019-03-09T15:52:43.000-05:00
diff --git a/src/random.js b/src/random.js
@@ -5,5 +5,5 @@ var uuid4 = require('uuid/v4')
  */
 
 export default function random() {
-  return uuid4() 
+  return uuid4().replace(/-/g, '');
 }
diff --git a/test/unit/random.spec.js b/test/unit/random.spec.js
@@ -1,11 +1,13 @@
 import random from '../../src/random'
 
-const pattern = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
+const pattern = /^[0-9a-f]{8}[0-9a-f]{4}4[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}$/
+//const pattern = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/
 
 
 describe('random', function() {
-  it('should return a valid RFC4122 v4 guid', function(){
+  it('should return a valid RFC4122 v4 guid (sans dashes)', function(){
     const rnd = random()
+    console.log(rnd);
     rnd.should.match(pattern)
   }) 
 })

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ var uuid4 = require('uuid/v4')`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`export default function random() {`
`8`		`- return uuid4()`
	`8`	`+ return uuid4().replace(/-/g, '');`
`9`	`9`	`}`