diff --git a/.jshintrc b/.jshintrc
index c753d6085..54b7a8601 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -31,6 +31,6 @@
"strict": false,
"white": false,
"eqnull": true,
- "esnext": true,
+ "esversion": 6,
"unused": true
}
diff --git a/app/index.html b/app/index.html
index fddadc867..3ebf8cb62 100644
--- a/app/index.html
+++ b/app/index.html
@@ -7,7 +7,7 @@
Ghost Admin
- {{content-for 'head'}}
+ {{content-for "head"}}
@@ -42,12 +42,12 @@
- {{content-for 'head-footer'}}
+ {{content-for "head-footer"}}
-{{content-for 'body'}}
+{{content-for "body"}}
-{{content-for 'body-footer'}}
+{{content-for "body-footer"}}
{{! Dem scripts }}
diff --git a/app/mirage/config.js b/app/mirage/config.js
index 735836b12..6eeb0482e 100644
--- a/app/mirage/config.js
+++ b/app/mirage/config.js
@@ -136,7 +136,7 @@ function mockSubscribers(server) {
export default function () {
// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
- this.namespace = 'ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
+ this.namespace = '/ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
this.timing = 400; // delay for each request, automatically set to 0 during testing
// Mock endpoints here to override real API requests during development
@@ -153,7 +153,7 @@ export default function () {
// Mock all endpoints here as there is no real API during testing
export function testConfig() {
// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
- this.namespace = 'ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
+ this.namespace = '/ghost/api/v0.1'; // make this `api`, for example, if your API is namespaced
// this.timing = 400; // delay for each request, automatically set to 0 during testing
// this.logging = true;
diff --git a/bower.json b/bower.json
index d445f5185..26a3ce904 100644
--- a/bower.json
+++ b/bower.json
@@ -4,7 +4,6 @@
"devicejs": "0.2.7",
"ember": "2.6.1",
"ember-cli-shims": "0.1.3",
- "ember-cli-test-loader": "0.2.2",
"ember-mocha": "0.8.11",
"Faker": "3.1.0",
"fastclick": "1.0.6",
diff --git a/config/environment.js b/config/environment.js
index 0c5b4d867..b486d0d31 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -5,12 +5,19 @@ module.exports = function (environment) {
var ENV = {
modulePrefix: 'ghost-admin',
environment: environment,
- baseURL: '/',
+ rootURL: '/',
locationType: 'trailing-history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
+ },
+ // @TODO verify that String/Function need to be enabled
+ EXTEND_PROTOTYPES: {
+ Date: false,
+ Array: true,
+ String: true,
+ Function: true
}
},
@@ -45,7 +52,6 @@ module.exports = function (environment) {
if (environment === 'test') {
// Testem prefers this...
- ENV.baseURL = '/';
ENV.locationType = 'none';
// keep test console output quieter
diff --git a/package.json b/package.json
index 70bbc896e..0213913ee 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"codemirror": "5.17.0",
"csscomb": "3.1.8",
"ember-ajax": "2.4.1",
- "ember-cli": "2.6.3",
+ "ember-cli": "2.7.0",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "5.1.7",
"ember-cli-content-security-policy": "0.5.0",
@@ -53,6 +53,7 @@
"ember-cli-release": "0.2.8",
"ember-cli-selectize": "0.5.5",
"ember-cli-sri": "2.1.0",
+ "ember-cli-test-loader": "1.1.0",
"ember-cli-uglify": "1.2.0",
"ember-data": "2.7.0",
"ember-data-filter": "1.13.0",
diff --git a/tests/.jshintrc b/tests/.jshintrc
index 7dd55dd0f..ef5ddd50e 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -55,5 +55,5 @@
"strict": false,
"white": false,
"eqnull": true,
- "esnext": true
+ "esversion": 6
}
diff --git a/tests/index.html b/tests/index.html
index dc9021f1c..2ba036de9 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -7,8 +7,8 @@
- {{content-for 'head'}}
- {{content-for 'test-head'}}
+ {{content-for "head"}}
+ {{content-for "test-head"}}
@@ -18,12 +18,12 @@
-
-
-
+
+
+
- {{content-for 'head-footer'}}
- {{content-for 'test-head-footer'}}
+ {{content-for "head-footer"}}
+ {{content-for "test-head-footer"}}
+ {{content-for "body"}}
+ {{content-for "test-body"}}
- {{content-for 'body'}}
- {{content-for 'test-body'}}
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{content-for 'body-footer'}}
- {{content-for 'test-body-footer'}}
+ {{content-for "body-footer"}}
+ {{content-for "test-body-footer"}}