fix routes test. ember-mocha@0.4.2

Gruntfile.js

@@ -589,12 +589,7 @@ var _              = require('lodash'),
         // details of each of the test suites.
         //
         grunt.registerTask('test-all', 'Run tests and lint code',
-<<<<<<< HEAD
-            ['lint', 'test-routes', 'test-module', 'test-unit', 'test-integration', 'test-functional', 'shell:testem']
-        );
-=======
-            ['jshint', 'jscs', 'test-routes', 'test-module', 'test-unit', 'test-integration', 'shell:ember:test', 'test-functional']);
->>>>>>> Set up tests for ember-cli
+            ['lint', 'test-routes', 'test-module', 'test-unit', 'test-integration', 'shell:ember:test', 'test-functional']);
 
         // ### Lint
         //

core/client/app/components/gh-upload-modal.js

@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import ModalDialog from 'ghost/components/gh-modal-dialog';
 import upload from 'ghost/assets/lib/uploader';
 import cajaSanitizers from 'ghost/utils/caja-sanitizers';

core/client/bower.json

@@ -30,6 +30,6 @@
   "devDependencies": {
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
-    "ember-mocha": "~0.3.0"
+    "ember-mocha": "~0.4.2"
   }
 }

core/test/functional/routes/frontend_test.js

@@ -217,7 +217,7 @@ describe('Frontend Routing', function () {
             });
 
             it('should retrieve built assets', function (done) {
-                request.get('/ghost/scripts/vendor-dev.js')
+                request.get('/ghost/vendor.js')
                     .expect('Cache-Control', testUtils.cacheRules.year)
                     .expect(200)
                     .end(doEnd(done));