diff --git a/app/index.html b/app/index.html index 8d58260..445648c 100644 --- a/app/index.html +++ b/app/index.html @@ -7,19 +7,13 @@ - {{BASE_TAG}} + {{content-for 'head'}} - - diff --git a/bower.json b/bower.json index 29a9c3f..d902672 100644 --- a/bower.json +++ b/bower.json @@ -6,7 +6,7 @@ "ember": "1.7.0", "ember-data": "1.0.0-beta.10", "ember-resolver": "~0.1.7", - "loader": "stefanpenner/loader.js#1.0.1", + "loader.js": "stefanpenner/loader.js#1.0.1", "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3", "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4", "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2", diff --git a/package.json b/package.json index 0386b38..c1bfee1 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,10 @@ "license": "MIT", "devDependencies": { "body-parser": "^1.2.0", - "broccoli-asset-rev": "0.1.1", + "broccoli-asset-rev": "0.3.0", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.0.46", + "ember-cli": "0.0.47", + "ember-cli-content-security-policy": "0.1.3", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.0.2", "ember-cli-qunit": "0.1.0", diff --git a/tests/.jshintrc b/tests/.jshintrc index 95db7f3..6ebf71a 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -39,7 +39,6 @@ "findWithAssert", "wait", "DS", - "keyEvent", "isolatedContainer", "startApp", "andThen", diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 1b3decc..7cd4320 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,7 +1,7 @@ import Ember from 'ember'; import Application from '../../app'; import Router from '../../router'; -import config from '../../config/environments/test'; +import config from '../../config/environment'; export default function startApp(attrs) { var App; diff --git a/tests/index.html b/tests/index.html index 5ebb720..2ac5be4 100644 --- a/tests/index.html +++ b/tests/index.html @@ -7,7 +7,7 @@ - {{BASE_TAG}} + {{content-for 'head'}} @@ -33,16 +33,10 @@
- - diff --git a/tests/test-helper.js b/tests/test-helper.js index f77e5a2..b5f6449 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -8,8 +8,5 @@ setResolver(resolver); document.write('
'); QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'}); -if (QUnit.urlParams.nocontainer) { - document.getElementById('ember-testing-container').style.visibility = 'hidden'; -} else { - document.getElementById('ember-testing-container').style.visibility = 'visible'; -} +var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible'; +document.getElementById('ember-testing-container').style.visibility = containerVisibility;