Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update to ember-cli 0.2.0
  • Loading branch information
cibernox committed Mar 21, 2015
1 parent 2e6cb1c commit e749d3b
Show file tree
Hide file tree
Showing 17 changed files with 102 additions and 88 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -29,5 +29,5 @@ indent_size = 2
indent_style = space
indent_size = 2

[*.md]
[*.{diff,md}]
trim_trailing_whitespace = false
32 changes: 32 additions & 0 deletions .jshintrc
@@ -0,0 +1,32 @@
{
"predef": [
"document",
"window",
"-Promise"
],
"browser": true,
"boss": true,
"curly": true,
"debug": false,
"devel": true,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"newcap": true,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"sub": true,
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"unused": true
}
12 changes: 12 additions & 0 deletions .npmignore
@@ -0,0 +1,12 @@
bower_components/
tests/

.bowerrc
.editorconfig
.ember-cli
.travis.yml
.npmignore
**/.gitkeep
bower.json
Brocfile.js
testem.json
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -7,6 +7,10 @@ cache:
directories:
- node_modules

before_install:
- "npm config set spin false"
- "npm install -g npm@^2"

install:
- npm install -g bower
- npm install
Expand Down
1 change: 1 addition & 0 deletions Brocfile.js
@@ -1,3 +1,4 @@
/* jshint node: true */
/* global require, module */

var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
Expand Down
9 changes: 9 additions & 0 deletions LICENSE.md
@@ -0,0 +1,9 @@
The MIT License (MIT)

Copyright (c) 2015

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21 changes: 10 additions & 11 deletions bower.json
@@ -1,17 +1,16 @@
{
"name": "ember-cli-yuidoc",
"dependencies": {
"handlebars": "~1.3.0",
"jquery": "^1.11.1",
"ember": "1.7.0",
"ember-data": "1.0.0-beta.10",
"ember-resolver": "~0.1.7",
"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",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.4",
"qunit": "~1.15.0"
"ember": "1.10.0",
"ember-data": "1.0.0-beta.15",
"ember-resolver": "~0.1.12",
"loader.js": "ember-cli/loader.js#3.2.0",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"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.2.8",
"ember-qunit-notifications": "0.0.7",
"qunit": "~1.17.1"
}
}
23 changes: 12 additions & 11 deletions package.json
Expand Up @@ -17,25 +17,26 @@
"author": "Miguel Camba",
"license": "MIT",
"dependencies": {
"broccoli-caching-writer": "~0.5.2",
"broccoli-caching-writer": "~0.5.5",
"broccoli-merge-trees": "0.2.1",
"git-repo-version": "0.0.1",
"git-repo-version": "0.2.0",
"rsvp": "3.0.14",
"yuidocjs": "^0.6.0"
},
"devDependencies": {
"body-parser": "^1.2.0",
"broccoli-asset-rev": "0.3.1",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
"ember-cli": "0.1.2",
"broccoli-asset-rev": "^2.0.0",
"ember-cli": "0.2.0",
"ember-cli-app-version": "0.3.2",
"ember-cli-babel": "^4.0.0",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.8",
"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.0",
"ember-data": "1.0.0-beta.10",
"ember-export-application-global": "^1.0.0",
"express": "^4.8.5",
"glob": "^4.0.5"
"ember-cli-qunit": "0.3.9",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.15",
"ember-export-application-global": "^1.0.2"
},
"keywords": [
"ember-addon",
Expand Down
2 changes: 1 addition & 1 deletion testem.json
@@ -1,6 +1,6 @@
{
"framework": "qunit",
"test_page": "tests/index.html",
"test_page": "tests/index.html?hidepassed",
"launch_in_ci": [
"PhantomJS"
],
Expand Down
23 changes: 0 additions & 23 deletions tests/.jshintrc
Expand Up @@ -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",
Expand All @@ -39,8 +18,6 @@
"findWithAssert",
"wait",
"DS",
"isolatedContainer",
"startApp",
"andThen",
"currentURL",
"currentPath",
Expand Down
4 changes: 4 additions & 0 deletions tests/dummy/app/index.html
Expand Up @@ -11,11 +11,15 @@

<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/dummy.css">

{{content-for 'head-footer'}}
</head>
<body>
{{content-for 'body'}}

<script src="assets/vendor.js"></script>
<script src="assets/dummy.js"></script>

{{content-for 'body-footer'}}
</body>
</html>
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/application.hbs
@@ -1,3 +1,3 @@
<h2 id='title'>Welcome to Ember.js</h2>
<h2 id="title">Welcome to Ember.js</h2>

{{outlet}}
6 changes: 3 additions & 3 deletions tests/dummy/config/environment.js
Expand Up @@ -21,16 +21,16 @@ module.exports = function(environment) {

if (environment === 'development') {
// ENV.APP.LOG_RESOLVER = true;
ENV.APP.LOG_ACTIVE_GENERATION = true;
// ENV.APP.LOG_ACTIVE_GENERATION = true;
// ENV.APP.LOG_TRANSITIONS = true;
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
ENV.APP.LOG_VIEW_LOOKUPS = true;
// ENV.APP.LOG_VIEW_LOOKUPS = true;
}

if (environment === 'test') {
// Testem prefers this...
ENV.baseURL = '/';
ENV.locationType = 'auto';
ENV.locationType = 'none';

// keep test console output quieter
ENV.APP.LOG_ACTIVE_GENERATION = false;
Expand Down
3 changes: 1 addition & 2 deletions tests/dummy/public/robots.txt
@@ -1,3 +1,2 @@
# robotstxt.org/

# http://www.robotstxt.org
User-agent: *
16 changes: 5 additions & 11 deletions tests/helpers/start-app.js
Expand Up @@ -4,22 +4,16 @@ import Router from '../../router';
import config from '../../config/environment';

export default function startApp(attrs) {
var App;
var application;

var attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;

Router.reopen({
location: 'none'
});

Ember.run(function() {
App = Application.create(attributes);
App.setupForTesting();
App.injectTestHelpers();
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
});

App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"

return App;
return application;
}
24 changes: 6 additions & 18 deletions tests/index.html
Expand Up @@ -13,26 +13,11 @@
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/dummy.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'}}
</head>
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>

{{content-for 'body'}}
{{content-for 'test-body'}}
Expand All @@ -41,5 +26,8 @@
<script src="assets/dummy.js"></script>
<script src="testem.js"></script>
<script src="assets/test-loader.js"></script>

{{content-for 'body-footer'}}
{{content-for 'test-body-footer'}}
</body>
</html>
6 changes: 0 additions & 6 deletions tests/test-helper.js
Expand Up @@ -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;

0 comments on commit e749d3b

Please sign in to comment.