From 6a728b83787bb9717d0a40e8d63d304cdbfc1372 Mon Sep 17 00:00:00 2001
From: Dan Sudol <dansudol@yahoo.com>
Date: Fri, 4 Sep 2015 18:07:11 -0400
Subject: [PATCH] fixed import mockjax

---
 index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 1c02eb7c..82dea9e4 100644
--- a/index.js
+++ b/index.js
@@ -9,8 +9,9 @@ module.exports = {
 
   included: function(app) {
     this._super.included(app);
-
-    if (app.env === 'test') {
+    // need to load mockjax in development and test environment since ember tests
+    // can be run from browser in development mode
+    if (app.tests) {
       app.import(app.bowerDirectory + '/jquery-mockjax/dist/jquery.mockjax.js');
     }
   }