Upgrade ember-cli to v0.2.0-beta.1. Closes #4.

This commit is contained in:
Matthew Dillon 2015-02-27 14:17:54 -09:00
parent ab2866df5b
commit d606ba2228
5 changed files with 13 additions and 57 deletions

View file

@ -1,17 +1,16 @@
{
"name": "hymenobacterdotinfo",
"dependencies": {
"handlebars": "~1.3.0",
"jquery": "~2.1.1",
"ember": "1.8.1",
"ember-data": "1.0.0-beta.12",
"ember": "1.10.0",
"ember-data": "1.0.0-beta.15",
"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": "rwjblue/ember-cli-test-loader#0.0.4",
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
"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",
"flakes": "~1.0.0",
"ember-simple-auth": "~0.7.2",

View file

@ -20,18 +20,20 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"ember-cli": "^0.1.9",
"ember-cli-6to5": "0.2.1",
"ember-cli": "0.2.0-beta.1",
"ember-cli-babel": "^4.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-divshot": "^0.1.7",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-qunit": "0.1.2",
"ember-cli-qunit": "0.3.8",
"ember-cli-simple-auth": "^0.7.2",
"ember-data": "1.0.0-beta.12",
"ember-export-application-global": "^1.0.0",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.15",
"ember-export-application-global": "^1.0.2",
"express": "^4.8.5",
"glob": "^4.0.5"
}

View file

@ -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",

View file

@ -13,22 +13,6 @@
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/hymenobacterdotinfo.css">
<link rel="stylesheet" href="assets/test-support.css">
<style>
#ember-testing-container {
position: absolute;
background: white;
bottom: 0;
right: 0;
width: 640px;
height: 384px;
overflow: auto;
z-index: 9999;
border: 1px solid #ccc;
}
#ember-testing {
zoom: 50%;
}
</style>
{{content-for 'head-footer'}}
{{content-for 'test-head-footer'}}

View file

@ -4,9 +4,3 @@ import {
} from 'ember-qunit';
setResolver(resolver);
document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
document.getElementById('ember-testing-container').style.visibility = containerVisibility;