Skip to content

Commit cfc3757

Browse files
wycatswycats
committed
Merge pull request #2 from stefanpenner/update-ember-cli
update to ember-cli 0.0.46
2 parents a11561e + e4f795e commit cfc3757

19 files changed

+138
-56
lines changed

‎.bowerrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"directory": "vendor"
2+
"directory": "bower_components",
3+
"analytics": false
34
}

‎.editorconfig

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
7+
8+
[*]
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
indent_style = space
14+
indent_size = 2
15+
16+
[*.js]
17+
indent_style = space
18+
indent_size = 2
19+
20+
[*.hbs]
21+
indent_style = space
22+
indent_size = 2
23+
24+
[*.css]
25+
indent_style = space
26+
indent_size = 2
27+
28+
[*.html]
29+
indent_style = space
30+
indent_size = 2
31+
32+
[*.md]
33+
trim_trailing_whitespace = false

‎.ember-cli

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
/**
3+
Ember CLI sends analytics information by default. The data is completely
4+
anonymous, but there are times when you might want to disable this behavior.
5+
6+
Setting `disableAnalytics` to true will prevent any data from being sent.
7+
*/
8+
"disableAnalytics": false
9+
}

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# dependencies
99
/node_modules
10-
/vendor/*
10+
/bower_components/*
1111

1212
# misc
1313
/.sass-cache

‎.jshintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"predef": {
33
"document": true,
44
"window": true,
5-
"CargoENV": true
5+
"-Promise": true
66
},
77
"browser" : true,
88
"boss" : true,

‎app/app.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import Ember from 'ember';
22
import Resolver from 'ember/resolver';
33
import loadInitializers from 'ember/load-initializers';
4+
import config from './config/environment';
45

56
Ember.MODEL_FACTORY_INJECTIONS = true;
67

78
var App = Ember.Application.extend({
8-
modulePrefix: 'cargo', // TODO: loaded via config
9+
modulePrefix: config.modulePrefix,
10+
podModulePrefix: config.podModulePrefix,
911
Resolver: Resolver
1012
});
1113

12-
loadInitializers(App, 'cargo');
14+
loadInitializers(App, config.modulePrefix);
1315

1416
export default App;

‎app/index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
</head>
1515
<body>
1616
<script>
17-
window.CargoENV = {{ENV}};
18-
window.EmberENV = window.CargoENV.EmberENV;
17+
window.EmberENV = {{EMBER_ENV}};
1918
</script>
2019
<script src="assets/vendor.js"></script>
2120
<script src="assets/cargo.js"></script>
2221
<script>
23-
window.Cargo = require('cargo/app')['default'].create(CargoENV.APP);
22+
window.Cargo = require('cargo/app')['default'].create({{APP_CONFIG}});
2423
</script>
2524
</body>
2625
</html>

‎app/router.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import Ember from 'ember';
2+
import config from './config/environment';
23

34
var Router = Ember.Router.extend({
4-
location: CargoENV.locationType
5+
location: config.locationType
56
});
67

78
Router.map(function() {

‎bower.json

+9-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
"dependencies": {
44
"handlebars": "~1.3.0",
55
"jquery": "^1.11.1",
6-
"qunit": "~1.12.0",
7-
"ember-qunit": "~0.1.5",
8-
"ember": "components/ember#canary",
9-
"ember-resolver": "~0.1.1",
10-
"loader": "stefanpenner/loader.js#1.0.0",
11-
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.2",
6+
"ember": "1.7.0",
7+
"ember-data": "1.0.0-beta.10",
8+
"ember-resolver": "~0.1.7",
9+
"loader": "stefanpenner/loader.js#1.0.1",
10+
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
11+
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
1212
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
13-
"ember-qunit-notifications": "^0.0.3",
14-
"ember-cli-test-loader": "rjackson/ember-cli-test-loader#0.0.2"
15-
},
16-
"resolutions": {
17-
"ember": "canary"
13+
"ember-qunit": "0.1.8",
14+
"ember-qunit-notifications": "0.0.4",
15+
"qunit": "~1.15.0"
1816
}
1917
}

‎config/environment.js

+15-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
module.exports = function(environment) {
44
var ENV = {
5+
modulePrefix: 'cargo',
56
environment: environment,
67
baseURL: '/',
78
locationType: 'auto',
@@ -19,17 +20,25 @@ module.exports = function(environment) {
1920
};
2021

2122
if (environment === 'development') {
22-
// LOG_MODULE_RESOLVER is needed for pre-1.6.0
23-
// ENV.LOG_MODULE_RESOLVER = true;
24-
2523
// ENV.APP.LOG_RESOLVER = true;
26-
// ENV.APP.LOG_ACTIVE_GENERATION = true;
27-
// ENV.APP.LOG_MODULE_RESOLVER = true;
28-
ENV.APP.LOG_TRANSITIONS = true;
24+
ENV.APP.LOG_ACTIVE_GENERATION = true;
25+
// ENV.APP.LOG_TRANSITIONS = true;
2926
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
3027
ENV.APP.LOG_VIEW_LOOKUPS = true;
3128
}
3229

30+
if (environment === 'test') {
31+
// Testem prefers this...
32+
ENV.baseURL = '/';
33+
ENV.locationType = 'auto';
34+
35+
// keep test console output quieter
36+
ENV.APP.LOG_ACTIVE_GENERATION = false;
37+
ENV.APP.LOG_VIEW_LOOKUPS = false;
38+
39+
ENV.APP.rootElement = '#ember-testing';
40+
}
41+
3342
if (environment === 'production') {
3443

3544
}

‎package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"directories": {
66
"doc": "doc",
7-
"test": "test"
7+
"test": "tests"
88
},
99
"scripts": {
1010
"start": "ember server",
@@ -18,15 +18,16 @@
1818
"author": "",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"ember-cli": "0.0.39",
22-
"originate": "0.1.5",
23-
"broccoli-ember-hbs-template-compiler": "^1.5.0",
24-
"express": "^4.1.1",
2521
"body-parser": "^1.2.0",
26-
"glob": "^3.2.9",
27-
"ember-cli-ember-data": "0.1.0",
28-
"broccoli-asset-rev": "0.0.11",
29-
"broccoli-sass": "~0.2.1",
30-
"ember-cli-ic-ajax": "~0.1.1"
22+
"broccoli-asset-rev": "0.1.1",
23+
"broccoli-ember-hbs-template-compiler": "^1.6.1",
24+
"broccoli-sass": "^0.2.2",
25+
"ember-cli": "0.0.46",
26+
"ember-cli-ic-ajax": "0.1.1",
27+
"ember-cli-inject-live-reload": "^1.0.2",
28+
"ember-cli-qunit": "0.1.0",
29+
"ember-data": "1.0.0-beta.10",
30+
"express": "^4.8.5",
31+
"glob": "^4.0.5"
3132
}
3233
}

‎public/crossdomain.xml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
3+
<cross-domain-policy>
4+
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
5+
6+
<!-- Most restrictive policy: -->
7+
<site-control permitted-cross-domain-policies="none"/>
8+
9+
<!-- Least restrictive policy: -->
10+
<!--
11+
<site-control permitted-cross-domain-policies="all"/>
12+
<allow-access-from domain="*" to-ports="*" secure="false"/>
13+
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
14+
-->
15+
</cross-domain-policy>

‎public/robots.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# robotstxt.org/
2+
3+
User-agent: *

‎testem.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"framework": "qunit",
33
"test_page": "tests/index.html",
4-
"launch_in_ci": ["PhantomJS"],
5-
"launch_in_dev": ["PhantomJS", "Chrome"]
4+
"launch_in_ci": [
5+
"PhantomJS"
6+
],
7+
"launch_in_dev": [
8+
"PhantomJS",
9+
"Chrome"
10+
]
611
}

‎tests/.jshintrc

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"location",
66
"setTimeout",
77
"$",
8+
"-Promise",
89
"QUnit",
910
"define",
1011
"console",
@@ -33,6 +34,7 @@
3334
"fillIn",
3435
"click",
3536
"keyEvent",
37+
"triggerEvent",
3638
"find",
3739
"findWithAssert",
3840
"wait",

‎tests/helpers/resolver.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import Resolver from 'ember/resolver';
2+
import config from '../../config/environment';
23

34
var resolver = Resolver.create();
45

56
resolver.namespace = {
6-
modulePrefix: 'cargo'
7+
modulePrefix: config.modulePrefix,
8+
podModulePrefix: config.podModulePrefix
79
};
810

911
export default resolver;

‎tests/helpers/start-app.js

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1-
/* global require */
2-
3-
var Application = require('cargo/app')['default'];
4-
var Router = require('cargo/router')['default'];
51
import Ember from 'ember';
2+
import Application from '../../app';
3+
import Router from '../../router';
4+
import config from '../../config/environments/test';
65

76
export default function startApp(attrs) {
87
var App;
98

10-
var attributes = Ember.merge({
11-
// useful Test defaults
12-
rootElement: '#ember-testing',
13-
LOG_ACTIVE_GENERATION:false,
14-
LOG_VIEW_LOOKUPS: false
15-
}, attrs); // but you can override;
9+
var attributes = Ember.merge({}, config.APP);
10+
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
1611

1712
Router.reopen({
1813
location: 'none'
1914
});
2015

21-
Ember.run(function(){
16+
Ember.run(function() {
2217
App = Application.create(attributes);
2318
App.setupForTesting();
2419
App.injectTestHelpers();

‎tests/index.html

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<link rel="stylesheet" href="assets/vendor.css">
1313
<link rel="stylesheet" href="assets/cargo.css">
14-
<link rel="stylesheet" href="assets/qunit.css">
14+
<link rel="stylesheet" href="assets/test-support.css">
1515
<style>
1616
#ember-testing-container {
1717
position: absolute;
@@ -34,12 +34,10 @@
3434
<div id="qunit-fixture"></div>
3535

3636
<script>
37-
window.CargoENV = {{ENV}};
38-
window.EmberENV = window.CargoENV.EmberENV;
37+
window.EmberENV = {{EMBER_ENV}};
3938
</script>
40-
<script src="assets/qunit.js"></script>
41-
<script src="assets/qunit-notifications.js"></script>
4239
<script src="assets/vendor.js"></script>
40+
<script src="assets/test-support.js"></script>
4341
<script src="assets/cargo.js"></script>
4442
<script src="testem.js"></script>
4543
<script>

‎tests/test-helper.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import resolver from './helpers/resolver';
2-
import { setResolver } from 'ember-qunit';
2+
import {
3+
setResolver
4+
} from 'ember-qunit';
35

46
setResolver(resolver);
57

68
document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
9+
10+
QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'});
11+
if (QUnit.urlParams.nocontainer) {
12+
document.getElementById('ember-testing-container').style.visibility = 'hidden';
13+
} else {
14+
document.getElementById('ember-testing-container').style.visibility = 'visible';
15+
}

0 commit comments

Comments
 (0)