From 8b3f713782c8b0a2a485910d805fe071d45940db Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Wed, 18 Feb 2015 14:29:30 -0600
Subject: [PATCH] Fix up ember test files

---
 core/client/tests/.jshintrc                                  | 5 ++++-
 .../client/tests/unit/components/gh-trim-focus-input_test.js | 2 +-
 core/client/tests/unit/components/gh-url-preview_test.js     | 1 -
 .../client/tests/unit/controllers/post-settings-menu_test.js | 2 +-
 core/client/tests/unit/controllers/settings-general_test.js  | 2 +-
 core/client/tests/unit/models/post_test.js                   | 2 +-
 core/client/tests/unit/models/role_test.js                   | 1 +
 core/client/tests/unit/models/user_test.js                   | 2 +-
 core/client/tests/unit/utils/ghost-paths_test.js             | 2 --
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/client/tests/.jshintrc b/core/client/tests/.jshintrc
index ea8b88f624..b97fc9cbcb 100644
--- a/core/client/tests/.jshintrc
+++ b/core/client/tests/.jshintrc
@@ -21,8 +21,10 @@
     "andThen",
     "currentURL",
     "currentPath",
-    "currentRouteName"
+    "currentRouteName",
+    "expect"
   ],
+  "mocha": true,
   "node": false,
   "browser": false,
   "boss": true,
@@ -31,6 +33,7 @@
   "devel": false,
   "eqeqeq": true,
   "evil": true,
+  "expr": true,
   "forin": false,
   "immed": false,
   "laxbreak": false,
diff --git a/core/client/tests/unit/components/gh-trim-focus-input_test.js b/core/client/tests/unit/components/gh-trim-focus-input_test.js
index a30e049eec..cb167d9df5 100644
--- a/core/client/tests/unit/components/gh-trim-focus-input_test.js
+++ b/core/client/tests/unit/components/gh-trim-focus-input_test.js
@@ -1,4 +1,4 @@
-/* jshint expr:true */
+import Ember from 'ember';
 import {
     describeComponent,
     it
diff --git a/core/client/tests/unit/components/gh-url-preview_test.js b/core/client/tests/unit/components/gh-url-preview_test.js
index 09b4af7eb5..a31fa6fde0 100644
--- a/core/client/tests/unit/components/gh-url-preview_test.js
+++ b/core/client/tests/unit/components/gh-url-preview_test.js
@@ -1,4 +1,3 @@
-/* jshint expr:true */
 import {
     describeComponent,
     it
diff --git a/core/client/tests/unit/controllers/post-settings-menu_test.js b/core/client/tests/unit/controllers/post-settings-menu_test.js
index 015c942e3c..2ec3604ffc 100644
--- a/core/client/tests/unit/controllers/post-settings-menu_test.js
+++ b/core/client/tests/unit/controllers/post-settings-menu_test.js
@@ -1,4 +1,4 @@
-/* jshint expr:true */
+import Ember from 'ember';
 import {
     describeModule,
     it
diff --git a/core/client/tests/unit/controllers/settings-general_test.js b/core/client/tests/unit/controllers/settings-general_test.js
index de692f6402..320fcc2aa2 100644
--- a/core/client/tests/unit/controllers/settings-general_test.js
+++ b/core/client/tests/unit/controllers/settings-general_test.js
@@ -1,4 +1,4 @@
-/* jshint expr:true */
+import Ember from 'ember';
 import {
     describeModule,
     it
diff --git a/core/client/tests/unit/models/post_test.js b/core/client/tests/unit/models/post_test.js
index 1df30aa30f..c53cac920d 100644
--- a/core/client/tests/unit/models/post_test.js
+++ b/core/client/tests/unit/models/post_test.js
@@ -1,4 +1,4 @@
-/* jshint expr:true */
+import Ember from 'ember';
 import {
     describeModel,
     it
diff --git a/core/client/tests/unit/models/role_test.js b/core/client/tests/unit/models/role_test.js
index 4769e04f08..2c3f83c0ce 100644
--- a/core/client/tests/unit/models/role_test.js
+++ b/core/client/tests/unit/models/role_test.js
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import {
     describeModel,
     it
diff --git a/core/client/tests/unit/models/user_test.js b/core/client/tests/unit/models/user_test.js
index 71336c9edd..a5d124200d 100644
--- a/core/client/tests/unit/models/user_test.js
+++ b/core/client/tests/unit/models/user_test.js
@@ -1,4 +1,4 @@
-/*jshint expr:true */
+import Ember from 'ember';
 import {
     describeModel,
     it
diff --git a/core/client/tests/unit/utils/ghost-paths_test.js b/core/client/tests/unit/utils/ghost-paths_test.js
index bf9f00c210..dbeaac1a71 100644
--- a/core/client/tests/unit/utils/ghost-paths_test.js
+++ b/core/client/tests/unit/utils/ghost-paths_test.js
@@ -1,5 +1,3 @@
-/* jshint expr:true */
-
 import ghostPaths from 'ghost/utils/ghost-paths';
 
 describe('ghost-paths', function () {