Merge pull request #57 from mobify/release-1.6.2

Release 1.6.2

Author: ellenmobify

CHANGELOG

@@ -1,3 +1,5 @@
+1.6.2
+    - Update `preview` command to accept `site.js` files under `/system/site.js`
 1.6.1
     - Update seleniumVersion to 2.52.0
     - Update chromeDriver version to 2.21

README.md

@@ -176,7 +176,7 @@ this.demoTest = function (browser) {
 
 #### preview(url, callback)
 
-The `preview` command uses http://preview.mobify.com to open a website to preview a given bundle. The bundle and the base URL need to be set in the `tests/system/site.json` or `tests/system/site.js` file. Note that if the "production" flag is set in the `activeProfile` in `site.json` or `site.js`, the bundle URL will be ignored. Pass in an optional URL as an argument to this command. Upon completion, `waitUntilMobified` is called to ensure that the mobile site adaptation is complete.
+The `preview` command uses http://preview.mobify.com to open a website to preview a given bundle. The bundle and the base URL need to be set in the `tests/system/site.json`, `tests/system/site.js` or `system/site.js` file. Note that if the "production" flag is set in the `activeProfile` in `site.json` or `site.js`, the bundle URL will be ignored. Pass in an optional URL as an argument to this command. Upon completion, `waitUntilMobified` is called to ensure that the mobile site adaptation is complete.
 
 Example site.json
 ```

commands/preview.js

@@ -40,7 +40,15 @@ try {
     var siteConfig = require(path.join(path.resolve('./'), '/tests/system/site.js'));
 } catch (e) {
     if (e instanceof Error && e.code === 'MODULE_NOT_FOUND') {
-        console.log('Not using optional site.js.');
+        console.log('Not using optional /tests/system/site.js.');
+    }
+}
+
+try {
+    var siteConfig = require(path.join(path.resolve('./'), '/system/site.js'));
+} catch (e) {
+    if (e instanceof Error && e.code === 'MODULE_NOT_FOUND') {
+        console.log('Not using optional /system/site.js.');
     }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nightwatch-commands",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "A set of Mobify specific custom commands for Nightwatch.js",
   "repository": {
     "type": "git",