Merge pull request #33 from PolymerLabs/fixTests

Fix hydrolysis tests.
Polymer · Mar 25, 2015 · 9315875 · 9315875
2 parents 8ef9113 + cdcf1e4
commit 9315875
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/hydrolysis.js b/hydrolysis.js
diff --git a/index.js b/index.js
@@ -18,5 +18,7 @@ module.exports = {
   Monomers:     require('./lib/monomers'),
   NoopResolver: require('./lib/loader/noop-resolver'),
   URLResolver:  require('./lib/loader/url-resolver'),
-  XHRResolver:  require('./lib/loader/xhr-resolver')
+  XHRResolver:  require('./lib/loader/xhr-resolver'),
+  _jsParse:     require('./lib/ast-utils/js-parse'),
+  _importParse:     require('./lib/ast-utils/import-parse')
 };
diff --git a/test/html-parser.html b/test/html-parser.html
@@ -18,7 +18,7 @@
 
       setup(function(){
         parseTarget = document.getElementById("parsetarget").import.documentElement.innerHTML;
-        registry = hyd.importParse(parseTarget);
+        registry = hyd._importParse(parseTarget);
       });
 
       test('find all templates', function() {

diff --git a/test/js-parser.html b/test/js-parser.html
@@ -37,7 +37,7 @@
 
       test('js syntax error', function() {
         try {
-          hyd.jsParse(parseError);
+          hyd._jsParse(parseError);
         } catch (err) {
           assert.equal(err.lineNumber, 18);
           assert.equal(err.column, 34);
@@ -49,12 +49,12 @@
       var parsed;
       setup(function(done) {
         if (mod.loaded) {
-          parsed = hyd.jsParse(mod.content);
+          parsed = hyd._jsParse(mod.content);
           console.log("modmetadata")
           done();
         } else {
           mod.addEventListener('content-loaded', function() {
-            parsed = hyd.jsParse(mod.content);
+            parsed = hyd._jsParse(mod.content);
             console.log("loaded");
             done();
           });
@@ -110,11 +110,11 @@
       setup(function(done) {
         if (!ele.loaded) {
           ele.addEventListener('content-loaded', function() {
-            parsed = hyd.jsParse(ele.content);
+            parsed = hyd._jsParse(ele.content);
             done();
           });
         } else {
-          parsed = hyd.jsParse(ele.content);
+          parsed = hyd._jsParse(ele.content);
           done();
         }
       });

diff --git a/test/loader.html b/test/loader.html
@@ -9,13 +9,13 @@
 <body>
   <script>
     var hyd = require('hydrolysis');
-    var loader = hyd.loader;
-    var xhrResolver = hyd.xhrResolver;
+    var Loader = hyd.Loader;
+    var XHRResolver = hyd.XHRResolver;
 
     suite('XHR Resolver', function() {
       test('Resolve', function(done) {
-        var l = new loader();
-        var x = new xhrResolver({});
+        var l = new Loader();
+        var x = new XHRResolver({});
         l.addResolver(x);
         var url = new URL('static/xhr-text.txt', document.baseURI).href;
         l.request(url).then(function(content) {
@@ -27,8 +27,8 @@
       });
 
       test('Reject', function(done) {
-        var l = new loader();
-        var x = new xhrResolver({});
+        var l = new Loader();
+        var x = new XHRResolver({});
         l.addResolver(x);
         var url = new URL('static/not-found', document.baseURI).href;
         l.request(url).then(function() {
@@ -39,8 +39,8 @@
       });
 
       test('Document', function(done) {
-        var l = new loader();
-        var x = new xhrResolver({
+        var l = new Loader();
+        var x = new XHRResolver({
           responseType: 'document'
         });
         l.addResolver(x);
@@ -55,8 +55,8 @@
       });
 
       test('JSON', function(done) {
-        var l = new loader();
-        var x = new xhrResolver({
+        var l = new Loader();
+        var x = new XHRResolver({
           responseType: 'json'
         });
         l.addResolver(x);