chore(all): prepare release 1.0.0-beta.3.0.0

aurelia · Mar 3, 2017 · f2be4c2 · f2be4c2
1 parent 01036e7
commit f2be4c2
Show file tree

Hide file tree

Showing 23 changed files with 615 additions and 39 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-testing",
-  "version": "1.0.0-beta.2.0.1",
+  "version": "1.0.0-beta.3.0.0",
   "description": "A collection of helpers for testing Aurelia apps and components.",
   "keywords": [
     "aurelia",

diff --git a/config.js b/config.js
@@ -14,6 +14,33 @@ System.config({
     "aurelia-pal-browser": "npm:[email protected]",
     "aurelia-polyfills": "npm:[email protected]",
     "aurelia-templating": "npm:[email protected]",
+    "babel": "npm:[email protected]",
+    "babel-runtime": "npm:[email protected]",
+    "core-js": "npm:[email protected]",
+    "github:jspm/[email protected]": {
+      "assert": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "buffer": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "path-browserify": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "process": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "util": "npm:[email protected]"
+    },
+    "github:jspm/[email protected]": {
+      "vm-browserify": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "assert": "github:jspm/[email protected]",
+      "buffer": "github:jspm/[email protected]",
+      "process": "github:jspm/[email protected]",
+      "util": "npm:[email protected]"
+    },
     "npm:[email protected]": {
       "aurelia-logging": "npm:[email protected]",
       "aurelia-metadata": "npm:[email protected]",
@@ -127,6 +154,41 @@ System.config({
       "aurelia-pal": "npm:[email protected]",
       "aurelia-path": "npm:[email protected]",
       "aurelia-task-queue": "npm:[email protected]"
+    },
+    "npm:[email protected]": {
+      "process": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "base64-js": "npm:[email protected]",
+      "child_process": "github:jspm/[email protected]",
+      "fs": "github:jspm/[email protected]",
+      "ieee754": "npm:[email protected]",
+      "isarray": "npm:[email protected]",
+      "process": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "fs": "github:jspm/[email protected]",
+      "path": "github:jspm/[email protected]",
+      "process": "github:jspm/[email protected]",
+      "systemjs-json": "github:systemjs/[email protected]"
+    },
+    "npm:[email protected]": {
+      "util": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "process": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "assert": "github:jspm/[email protected]",
+      "fs": "github:jspm/[email protected]",
+      "vm": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "inherits": "npm:[email protected]",
+      "process": "github:jspm/[email protected]"
+    },
+    "npm:[email protected]": {
+      "indexof": "npm:[email protected]"
     }
   }
 });
diff --git a/dist/amd/aurelia-testing.js b/dist/amd/aurelia-testing.js
@@ -1,10 +1,10 @@
-define(['exports', './compile-spy', './view-spy', './component-tester'], function (exports, _compileSpy, _viewSpy, _componentTester) {
+define(['exports', './compile-spy', './view-spy', './component-tester', './wait'], function (exports, _compileSpy, _viewSpy, _componentTester, _wait) {
   'use strict';
 
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
-  exports.configure = exports.ComponentTester = exports.StageComponent = exports.ViewSpy = exports.CompileSpy = undefined;
+  exports.waitForDocumentElements = exports.waitForDocumentElement = exports.waitFor = exports.configure = exports.ComponentTester = exports.StageComponent = exports.ViewSpy = exports.CompileSpy = undefined;
 
 
   function configure(config) {
@@ -16,4 +16,7 @@ define(['exports', './compile-spy', './view-spy', './component-tester'], functio
   exports.StageComponent = _componentTester.StageComponent;
   exports.ComponentTester = _componentTester.ComponentTester;
   exports.configure = configure;
+  exports.waitFor = _wait.waitFor;
+  exports.waitForDocumentElement = _wait.waitForDocumentElement;
+  exports.waitForDocumentElements = _wait.waitForDocumentElements;
 });
diff --git a/dist/amd/component-tester.js b/dist/amd/component-tester.js
@@ -8,11 +8,17 @@ define(['exports', 'aurelia-templating', 'aurelia-framework'], function (exports
 
 
 
-  var StageComponent = exports.StageComponent = {
-    withResources: function withResources(resources) {
-      return new ComponentTester().withResources(resources);
+  var StageComponent = exports.StageComponent = function () {
+    function StageComponent() {
+
     }
-  };
+
+    StageComponent.withResources = function withResources(resources) {
+      return new ComponentTester().withResources(resources);
+    };
+
+    return StageComponent;
+  }();
 
   var ComponentTester = exports.ComponentTester = function () {
     function ComponentTester() {
@@ -143,6 +149,22 @@ define(['exports', 'aurelia-templating', 'aurelia-framework'], function (exports
       };
     };
 
+    ComponentTester.prototype.waitForElement = function waitForElement(selector, options) {
+      var _this3 = this;
+
+      return waitFor(function () {
+        return _this3.element.querySelector(selector);
+      }, options);
+    };
+
+    ComponentTester.prototype.waitForElements = function waitForElements(selector, options) {
+      var _this4 = this;
+
+      return waitFor(function () {
+        return _this4.element.querySelectorAll(selector);
+      }, options);
+    };
+
     return ComponentTester;
   }();
 });
diff --git a/dist/amd/wait.js b/dist/amd/wait.js
@@ -0,0 +1,52 @@
+define(['exports'], function (exports) {
+  'use strict';
+
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  exports.waitFor = waitFor;
+  exports.waitForDocumentElement = waitForDocumentElement;
+  exports.waitForDocumentElements = waitForDocumentElements;
+  function waitFor(getter, options) {
+    var timedOut = false;
+
+    options = Object.assign({
+      present: true,
+      interval: 50,
+      timeout: 5000
+    }, options);
+
+    function wait() {
+      var element = getter();
+
+      var found = element !== null && (!(element instanceof NodeList) && !element.jquery || element.length > 0);
+
+      if (!options.present ^ found || timedOut) {
+        return Promise.resolve(element);
+      }
+
+      return new Promise(function (rs) {
+        return setTimeout(rs, options.interval);
+      }).then(wait);
+    }
+
+    return Promise.race([new Promise(function (rs, rj) {
+      return setTimeout(function () {
+        timedOut = true;
+        rj(options.present ? 'Element not found' : 'Element not removed');
+      }, options.timeout);
+    }), wait()]);
+  }
+
+  function waitForDocumentElement(selector, options) {
+    return waitFor(function () {
+      return document.querySelector(selector);
+    }, options);
+  }
+
+  function waitForDocumentElements(selector, options) {
+    return waitFor(function () {
+      return document.querySelectorAll(selector);
+    }, options);
+  }
+});
diff --git a/dist/aurelia-testing.d.ts b/dist/aurelia-testing.d.ts
@@ -13,7 +13,21 @@ import {
 import {
   DOM
 } from 'aurelia-pal';
-export declare const StageComponent: any;
+
+/**
+ * Generic function to wait for something to happen. Uses polling
+ * @param getter: a getter function that returns anything else than `null` or an
+ *                empty array or an empty jQuery object when the
+ *                condition is met
+ * @param options: lookup options, defaults to
+ *                 `{present: true, interval: 50, timeout: 5000}`
+ */
+export declare function waitFor(getter: (() => any), options: any): Promise<any>;
+export declare function waitForDocumentElement(selector: string, options: any): Promise<Element>;
+export declare function waitForDocumentElements(selector: string, options: any): Promise<Element>;
+export declare class StageComponent {
+  static withResources(resources: string | string[]): ComponentTester;
+}
 export declare class ComponentTester {
   bind: ((bindingContext: any) => void);
   attached: (() => void);
@@ -26,8 +40,10 @@ export declare class ComponentTester {
   inView(html: string): ComponentTester;
   boundTo(bindingContext: any): ComponentTester;
   manuallyHandleLifecycle(): ComponentTester;
-  create(bootstrap: ((aurelia: Aurelia) => Promise<void>)): Promise<void>;
+  create(bootstrap: ((configure: ((aurelia: Aurelia) => Promise<void>)) => Promise<void>)): Promise<void>;
   dispose(): any;
+  waitForElement(selector: string, options: any): Promise<Element>;
+  waitForElements(selector: string, options: any): Promise<Element>;
 }
 
 /**

diff --git a/dist/aurelia-testing.js b/dist/aurelia-testing.js
@@ -4,11 +4,62 @@ import {Aurelia} from 'aurelia-framework';
 import {inject} from 'aurelia-dependency-injection';
 import {DOM} from 'aurelia-pal';
 
-export const StageComponent = {
-  withResources(resources): ComponentTester {
+/**
+ * Generic function to wait for something to happen. Uses polling
+ * @param getter: a getter function that returns anything else than `null` or an
+ *                empty array or an empty jQuery object when the
+ *                condition is met
+ * @param options: lookup options, defaults to
+ *                 `{present: true, interval: 50, timeout: 5000}`
+ */
+export function waitFor(getter: () => any, options: any): Promise<any> {
+  // prevents infinite recursion if the request times out
+  let timedOut = false;
+
+  options = Object.assign({
+    present: true,
+    interval: 50,
+    timeout: 5000
+  }, options);
+
+
+  function wait() {
+    let element = getter();
+    // boolean is needed here, hence the length > 0
+    let found = element !== null && (!(element instanceof NodeList) &&
+      !element.jquery || element.length > 0);
+
+    if (!options.present ^ found || timedOut) {
+      return Promise.resolve(element);
+    }
+
+    return new Promise(rs => setTimeout(rs, options.interval)).then(wait);
+  }
+
+  return Promise.race([
+    new Promise(
+      (rs, rj) => setTimeout(() => {
+        timedOut = true;
+        rj(options.present ? 'Element not found' : 'Element not removed');
+      }, options.timeout)
+    ),
+    wait()
+  ]);
+}
+
+export function waitForDocumentElement(selector: string, options: any): Promise<Element> {
+  return waitFor(() => document.querySelector(selector), options);
+}
+
+export function waitForDocumentElements(selector: string, options: any): Promise<Element> {
+  return waitFor(() => document.querySelectorAll(selector), options);
+}
+
+export class StageComponent {
+  static withResources(resources: string | string[]): ComponentTester {
     return new ComponentTester().withResources(resources);
   }
-};
+}
 
 export class ComponentTester {
   bind: (bindingContext: any) => void;
@@ -46,7 +97,7 @@ export class ComponentTester {
     return this;
   }
 
-  create(bootstrap: (aurelia: Aurelia) => Promise<void>): Promise<void> {
+  create(bootstrap: (configure: (aurelia: Aurelia) => Promise<void>) => Promise<void>): Promise<void> {
     return bootstrap(aurelia => {
       return Promise.resolve(this.configure(aurelia)).then(() => {
         if (this._resources) {
@@ -121,6 +172,14 @@ export class ComponentTester {
       setTimeout(() => resolve(), 0);
     });
   }
+
+  waitForElement(selector: string, options: any): Promise<Element> {
+    return waitFor(() => this.element.querySelector(selector), options);
+  }
+
+  waitForElements(selector: string, options: any): Promise<Element> {
+    return waitFor(() => this.element.querySelectorAll(selector), options);
+  }
 }
 
 /**

diff --git a/dist/commonjs/aurelia-testing.js b/dist/commonjs/aurelia-testing.js
@@ -3,14 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.configure = exports.ComponentTester = exports.StageComponent = exports.ViewSpy = exports.CompileSpy = undefined;
+exports.waitForDocumentElements = exports.waitForDocumentElement = exports.waitFor = exports.configure = exports.ComponentTester = exports.StageComponent = exports.ViewSpy = exports.CompileSpy = undefined;
 
 var _compileSpy = require('./compile-spy');
 
 var _viewSpy = require('./view-spy');
 
 var _componentTester = require('./component-tester');
 
+var _wait = require('./wait');
+
 function configure(config) {
   config.globalResources('./compile-spy', './view-spy');
 }
@@ -19,4 +21,7 @@ exports.CompileSpy = _compileSpy.CompileSpy;
 exports.ViewSpy = _viewSpy.ViewSpy;
 exports.StageComponent = _componentTester.StageComponent;
 exports.ComponentTester = _componentTester.ComponentTester;
-exports.configure = configure;
+exports.configure = configure;
+exports.waitFor = _wait.waitFor;
+exports.waitForDocumentElement = _wait.waitForDocumentElement;
+exports.waitForDocumentElements = _wait.waitForDocumentElements;