Fixes #2532701 - Added better filtering to Y.guid with tests

apipkin · Sep 18, 2012 · 1ab575f · 1ab575f
1 parent bb6652d
commit 1ab575f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/yui/js/yui.js b/src/yui/js/yui.js
@@ -425,7 +425,7 @@ proto = {
             if (G_ENV && Y !== YUI) {
                 Env._yidx = ++G_ENV._yidx;
                 Env._guidp = ('yui_' + VERSION + '_' +
-                             Env._yidx + '_' + time).replace(/\./g, '_').replace(/-/g, '_');
+                             Env._yidx + '_' + time).replace(/[^a-z0-9_]+/g, '_');
             } else if (YUI._YUI) {
 
                 G_ENV = YUI._YUI.Env;

diff --git a/src/yui/tests/unit/assets/core-tests.js b/src/yui/tests/unit/assets/core-tests.js
@@ -750,6 +750,18 @@ YUI.add('core-tests', function(Y) {
             });
 
             test.wait();
+        },
+        'test y.guid': function() {
+            //I can't add tests for this because the API is screwed so I'm adding logical tests with my code update
+            var time = new Date().getTime(),
+                myY = YUI(),
+                idx = myY.Env.yidx,
+                version = '3.5.0-2pre+';
+            //This is what Y.Env._guidp should be if Y.version is '3.5.0-2pre+'
+            myY.Env._guidp = ('yui_' + version + '_' + idx + '_' + time).replace(/[^a-z0-9_]+/g, '_');
+            Y.Assert.areEqual('yui_3_5_0_2pre__' + idx + '_' + time, myY.Env._guidp);
+            Y.Assert.areEqual('yui_3_5_0_2pre__' + idx + '_' + time + '_2', myY.guid());
+            Y.Assert.areEqual('yui_3_5_0_2pre__' + idx + '_' + time + '_3', myY.guid());
         }
     });