Merge branch 'release/1.0.4' into production

Author: Miroslav Bajtoš

CHANGES.md

@@ -0,0 +1,121 @@
+2014-12-05, Version 1.0.4
+=========================
+
+ * README: add basic mocha setup instructions (pulkitsinghal)
+
+
+2014-10-02, Version 1.0.3
+=========================
+
+ * Update version to 1.0.3 (Simon Ho)
+
+
+2014-10-02, Version 1.0.2
+=========================
+
+
+
+2014-10-02, Version 1.0.1
+=========================
+
+ * package: move chai from devDependencies to dependencies (Simon Ho)
+
+ * Add contribution guidelines (Ryan Graham)
+
+
+2014-09-26, Version 1.0.0
+=========================
+
+ * Upgrade dependencies (Miroslav Bajtoš)
+
+ * add support for testing with users with roles (Jaka Hudoklin)
+
+ * fix imports (Jaka Hudoklin)
+
+
+2014-09-25, Version 0.2.1
+=========================
+
+ * Fix handling of dynamic URLs in the test builder (Clark Wang)
+
+ * Extending tests to cover other methods (ariskemper)
+
+ * package: add repository URL (Miroslav Bajtoš)
+
+
+2014-06-12, Version 0.2.0
+=========================
+
+ * helpers: add parameter for request body (Miroslav Bajtoš)
+
+ * helpers: Improve ACL asserts (Miroslav Bajtoš)
+
+ * helpers: fix usage of mocha contexts (Miroslav Bajtoš)
+
+ * Drop peer dependency on loopback (Miroslav Bajtoš)
+
+ * un-used variable (Karl Mikkelsen)
+
+ * tighter status constraints (Karl Mikkelsen)
+
+ * extend range of status allowed/denied (Karl Mikkelsen)
+
+
+2014-06-06, Version 0.1.5
+=========================
+
+ * Support loopback 2.x (Miroslav Bajtoš)
+
+ * Bump loopback dependency (Ritchie Martori)
+
+
+2014-05-25, Version 0.1.3
+=========================
+
+ * Remove juggler from peerDependencies. (Miroslav Bajtoš)
+
+ * Update to dual MIT/StrongLoop license (Raymond Feng)
+
+
+2014-02-11, Version 0.1.2
+=========================
+
+ * Bump version and update deps (Raymond Feng)
+
+
+2014-01-13, Version 0.1.1
+=========================
+
+ * Speed up login action (Miroslav Bajtoš)
+
+ * Fix function typo (Ritchie Martori)
+
+
+2013-12-20, Version 0.1.0
+=========================
+
+ * Relax loopback dependency (Ritchie Martori)
+
+ * Factor out LoopBack dep to removing coupling on the exact loopback instance. (Ritchie Martori)
+
+ * Remove describe.model (Ritchie Martori)
+
+ * Remove beforeEach.withDefaultDataSource (Ritchie Martori)
+
+ * Move helpers to lib (Ritchie Martori)
+
+
+2013-12-13, Version 0.0.4
+=========================
+
+ * Bump version (Ritchie Martori)
+
+ * Move loopback to peerDependencies to avoid using the wrong loopback object (Ritchie Martori)
+
+ * Describe TestDataBuilder in README. (Miroslav Bajtos)
+
+
+2013-12-11, Version 0.0.3
+=========================
+
+ * First release!

README.md

@@ -9,9 +9,31 @@ The following helpers are designed to generate [mocha] tests against
 
 ## install
 
-```sh
-npm install loopback-testing --save-dev
-```
+1. `npm install loopback-testing --save-dev`
+2. Assuming you started with a clean template/project generated by `slc loopback`
+  1. If you have mocha installed as a global npm module that's great! Simply update `<your_project>/package.json` with:
+
+    ```
+    {
+      ...
+      "scripts": {
+        ...
+        "test": "mocha"
+      }
+    }
+    ```
+  2. Otherwise, you can utilize the mocha library within the `loopback-testing` testing module:
+
+    ```
+    {
+      ...
+      "scripts": {
+        ...
+        "test": "./node_modules/loopback-testing/node_modules/.bin/mocha"
+      }
+    }
+    ```
+3. Run `npm test` to execute any tests under the `test` directory.
 
 ## basic usage
 
@@ -29,6 +51,7 @@ Use the `loopback-testing` module to generate `mocha` tests.
 ```js
 var lt = require('loopback-testing');
 var assert = require('assert');
+var app = require('../server/server.js'); //path to app.js or server.js
 
 describe('/products', function() {
   lt.beforeEach.withApp(app);
@@ -38,7 +61,7 @@ describe('/products', function() {
       assert.equal(this.res.statusCode, 200);
     });
 
-    lt.givenModel('product');
+    lt.beforeEach.givenModel('product');
     it('should respond with an array of products', function() {
       assert(Array.isArray(this.res.body));
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loopback-testing",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "Utilities for testing LoopBack applications",
   "main": "index.js",
   "scripts": {