Merge pull request #77 from mobify/remove-sitejs-warnings

Remove sitejs warnings

Author: ellenmobify

CHANGELOG

@@ -1,6 +1,7 @@
 2.1.0
     - Adds a `triggerClick` command that uses JavaScript's click.
-    - Renames `navigate` to `clickAndWaitUntilMobified` to avoid colliding with a core Nightwatch command with the same name.
+    - Renames `navigate` to `clickAndWaitUntilMobified` to avoid colliding with a core Nightwatch command with the same name. Resolves https://github.com/mobify/nightwatch-commands/issues/74
+    - Warnings related to a missing `site.json` should no longer be output if not using the `.preview()` command. Resolves https://github.com/mobify/nightwatch-commands/issues/73
 2.0.1
     -Update [selenium-download](https://github.com/groupon/selenium-download) to 2.0.10
         - selenium chromedriver 2.29

commands/preview.js

@@ -27,35 +27,34 @@
  */
 
 var path = require('path');
+var qs = require('querystring');
 
-try {
-    var siteConfig = require(path.join(path.resolve('./'), '/tests/system/site.json'));
-} catch (e) {
-    if (e instanceof Error && e.code === 'MODULE_NOT_FOUND') {
-        console.log('Not using optional site.json. Looking for site.js...');
-    }
-}
+exports.command = function(url, callback) {
+    var browser = this;
 
-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 /tests/system/site.js.');
+    try {
+        var siteConfig = require(path.join(path.resolve('./'), '/tests/system/site.json'));
+    } catch (e) {
+        if (e instanceof Error && e.code === 'MODULE_NOT_FOUND') {
+            console.log('Not using optional site.json. Looking for 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.');
+    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 /tests/system/site.js.');
+        }
     }
-}
 
-var qs = require('querystring');
-
-exports.command = function(url, callback) {
-    var browser = this;
+    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.');
+        }
+    }
 
     if (siteConfig) {
         var site = siteConfig.profiles[siteConfig.activeProfile];