Merge pull request #25 from getmimo/move-helper-to-sphinx-instead

move helper function into sphinx library instead

Author: littleStudent

dist/falcon/index.js

@@ -1,8 +1,5 @@
 'use strict';
 const deepEqual = require('deep-equal');
-const jsdom = require('jsdom');
-const { JSDOM } = jsdom;
-let path = require('path');
 
 // The stack of beforeEach callbacks
 const beforeEachStack = [[]];
@@ -84,26 +81,3 @@ const isEqual = (actual, expected) => {
   }
   return actual;
 };
-
-// HELPER
-async function domLoaded(file) {
-  return JSDOM.fromFile(path.resolve(file), {
-    resources: 'usable',
-    runScripts: 'dangerously',
-  }).then(async (dom) => {
-    return await new Promise((resolve, reject) => {
-      dom.window.document.addEventListener('DOMContentLoaded', () => {
-        resolve(dom);
-      });
-    });
-  });
-}
-
-module.exports = {
-  test,
-  end,
-  beforeEach,
-  summary,
-  isEqual,
-  domLoaded,
-};

dist/index.d.ts

@@ -1,4 +1,7 @@
 declare const $: any;
+declare const jsdom: any;
+declare const JSDOM: any;
+declare let path: any;
 declare class Sphinx {
     private code;
     private root;
@@ -75,3 +78,4 @@ declare function isTextSimilar(root: any, elementName: any, text: any): any;
 declare function isAttributeSet(root: any, elementName: any, attributeName: any, attributeValue: any): boolean;
 declare function buildSphinx(root: any, htmlCode: string, test: any, expect: any): Sphinx;
 declare function buildSphinxWithJSDOM(test: any, expect: any): Sphinx;
+declare function domLoaded(file: any): Promise<any>;

dist/index.js

@@ -1,8 +1,5 @@
 'use strict';
 const deepEqual = require('deep-equal');
-const jsdom = require('jsdom');
-const { JSDOM } = jsdom;
-let path = require('path');
 
 // The stack of beforeEach callbacks
 const beforeEachStack = [[]];
@@ -84,26 +81,3 @@ const isEqual = (actual, expected) => {
   }
   return actual;
 };
-
-// HELPER
-async function domLoaded(file) {
-  return JSDOM.fromFile(path.resolve(file), {
-    resources: 'usable',
-    runScripts: 'dangerously',
-  }).then(async (dom) => {
-    return await new Promise((resolve, reject) => {
-      dom.window.document.addEventListener('DOMContentLoaded', () => {
-        resolve(dom);
-      });
-    });
-  });
-}
-
-module.exports = {
-  test,
-  end,
-  beforeEach,
-  summary,
-  isEqual,
-  domLoaded,
-};

dist/index.js.map

@@ -1,4 +1,7 @@
 const $ = require('jquery');
+const jsdom = require('jsdom');
+const { JSDOM } = jsdom;
+let path = require('path');
 
 class Sphinx {
   private code: string;
@@ -400,11 +403,26 @@ function buildSphinxWithJSDOM(test: any, expect: any) {
   return new Sphinx(undefined, undefined, test, expect);
 }
 
+// HELPER
+async function domLoaded(file) {
+  return JSDOM.fromFile(path.resolve(file), {
+    resources: 'usable',
+    runScripts: 'dangerously',
+  }).then(async (dom) => {
+    return await new Promise((resolve, reject) => {
+      dom.window.document.addEventListener('DOMContentLoaded', () => {
+        resolve(dom);
+      });
+    });
+  });
+}
+
 module.exports = {
   buildSphinx: buildSphinx,
   buildSphinxWithJSDOM: buildSphinxWithJSDOM,
   isTextSet: isTextSet,
   isTextEqual: isTextEqual,
   isTextSimilar: isTextSimilar,
   isAttributeSet: isAttributeSet,
+  domLoaded,
 };