diff --git a/bower.json b/bower.json index c6100bd..d50b485 100644 --- a/bower.json +++ b/bower.json @@ -4,14 +4,14 @@ "handlebars": "~1.3.0", "jquery": "^1.11.1", "ember": "1.8.1", - "ember-data": "1.0.0-beta.12", + "ember-data": "1.0.0-beta.14.1", "ember-resolver": "~0.1.11", "loader.js": "ember-cli/loader.js#1.0.1", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", - "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0", + "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1", "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2", - "ember-qunit": "0.1.8", - "ember-qunit-notifications": "0.0.5", + "ember-qunit": "0.2.8", + "ember-qunit-notifications": "0.0.7", "qunit": "~1.17.1" } } \ No newline at end of file diff --git a/package.json b/package.json index 1d3074d..d425f42 100644 --- a/package.json +++ b/package.json @@ -20,17 +20,17 @@ "devDependencies": { "broccoli-asset-rev": "^2.0.0", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.1.12", + "ember-cli": "0.1.13", "ember-cli-6to5": "^3.0.0", + "ember-cli-app-version": "0.3.1", "ember-cli-content-security-policy": "0.3.0", "ember-cli-dependency-checker": "0.0.7", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.1", - "ember-cli-app-version": "0.3.1", + "ember-cli-qunit": "0.3.7", "ember-cli-uglify": "1.0.1", - "ember-data": "1.0.0-beta.12", - "ember-export-application-global": "^1.0.0", + "ember-data": "1.0.0-beta.14.1", + "ember-export-application-global": "^1.0.2", "express": "^4.8.5", "glob": "^4.0.5" }, diff --git a/tests/.jshintrc b/tests/.jshintrc index 6ebf71a..ea8b88f 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -6,29 +6,8 @@ "setTimeout", "$", "-Promise", - "QUnit", "define", "console", - "equal", - "notEqual", - "notStrictEqual", - "test", - "asyncTest", - "testBoth", - "testWithDefault", - "raises", - "throws", - "deepEqual", - "start", - "stop", - "ok", - "strictEqual", - "module", - "moduleFor", - "moduleForComponent", - "moduleForModel", - "process", - "expect", "visit", "exists", "fillIn", @@ -39,8 +18,6 @@ "findWithAssert", "wait", "DS", - "isolatedContainer", - "startApp", "andThen", "currentURL", "currentPath", diff --git a/tests/dummy/app/styles/.gitkeep b/tests/dummy/app/styles/app.css similarity index 100% rename from tests/dummy/app/styles/.gitkeep rename to tests/dummy/app/styles/app.css