url: fast path ascii domains, do not run ToASCII

To match browser behavior fast path ascii only domains and do not run ToASCII on them. Fixes: nodejs#12965 Refs: nodejs#12966 Refs: whatwg/url#309
zimbabao · May 15, 2017 · a13c377 · a13c377
1 parent 35e901d
commit a13c377
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/test/fixtures/url-domains-with-hyphens.js b/test/fixtures/url-domains-with-hyphens.js
diff --git a/test/parallel/test-whatwg-url-domainto.js b/test/parallel/test-whatwg-url-domainto.js
@@ -11,7 +11,6 @@ const { domainToASCII, domainToUnicode } = require('url');
 
 // Tests below are not from WPT.
 const tests = require('../fixtures/url-idna.js');
-const testsHyphenDomains = require('../fixtures/url-domains-with-hyphens.js');
 
 {
   const expectedError = common.expectsError(
@@ -36,10 +35,16 @@ const testsHyphenDomains = require('../fixtures/url-domains-with-hyphens.js');
 }
 
 {
-  for (const [i, { ascii, unicode }] of testsHyphenDomains.valid.entries()) {
-    assert.strictEqual(ascii, domainToASCII(unicode),
-                       `domainToASCII(${i + 1})`);
-  }
+  [
+    'r4---sn-a5mlrn7s.gevideo.com',
+    '-sn-a5mlrn7s.gevideo.com',
+    'sn-a5mlrn7s-.gevideo.com',
+    '-sn-a5mlrn7s-.gevideo.com',
+    '-sn--a5mlrn7s-.gevideo.com'
+  ].forEach((domain) => {
+    assert.strictEqual(domain, domainToASCII(domain),
+                       `domainToASCII(${domain})`);
+  })
 }
 
 {