rust-lang · wycats · Sep 21, 2014 · Sep 21, 2014
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,4 @@
 {
-  "directory": "vendor"
+  "directory": "bower_components",
+  "analytics": false
 }
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,33 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.ember-cli b/.ember-cli
@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@
 
 # dependencies
 /node_modules
-/vendor/*
+/bower_components/*
 
 # misc
 /.sass-cache

diff --git a/.jshintrc b/.jshintrc
@@ -2,7 +2,7 @@
   "predef": {
     "document": true,
     "window": true,
-    "CargoENV": true
+    "-Promise": true
   },
   "browser" : true,
   "boss" : true,

diff --git a/app/app.js b/app/app.js
@@ -1,14 +1,16 @@
 import Ember from 'ember';
 import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
+import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 var App = Ember.Application.extend({
-  modulePrefix: 'cargo', // TODO: loaded via config
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 
-loadInitializers(App, 'cargo');
+loadInitializers(App, config.modulePrefix);
 
 export default App;
diff --git a/app/index.html b/app/index.html
@@ -14,13 +14,12 @@
   </head>
   <body>
     <script>
-      window.CargoENV = {{ENV}};
-      window.EmberENV = window.CargoENV.EmberENV;
+      window.EmberENV = {{EMBER_ENV}};
     </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/cargo.js"></script>
     <script>
-      window.Cargo = require('cargo/app')['default'].create(CargoENV.APP);
+      window.Cargo = require('cargo/app')['default'].create({{APP_CONFIG}});
     </script>
   </body>
 </html>
diff --git a/app/router.js b/app/router.js
@@ -1,7 +1,8 @@
 import Ember from 'ember';
+import config from './config/environment';
 
 var Router = Ember.Router.extend({
-  location: CargoENV.locationType
+  location: config.locationType
 });
 
 Router.map(function() {

diff --git a/bower.json b/bower.json
@@ -3,17 +3,15 @@
   "dependencies": {
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "qunit": "~1.12.0",
-    "ember-qunit": "~0.1.5",
-    "ember": "components/ember#canary",
-    "ember-resolver": "~0.1.1",
-    "loader": "stefanpenner/loader.js#1.0.0",
-    "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.2",
+    "ember": "1.7.0",
+    "ember-data": "1.0.0-beta.10",
+    "ember-resolver": "~0.1.7",
+    "loader": "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-notifications": "^0.0.3",
-    "ember-cli-test-loader": "rjackson/ember-cli-test-loader#0.0.2"
-  },
-  "resolutions": {
-    "ember": "canary"
+    "ember-qunit": "0.1.8",
+    "ember-qunit-notifications": "0.0.4",
+    "qunit": "~1.15.0"
   }
 }
diff --git a/config/environment.js b/config/environment.js
@@ -2,6 +2,7 @@
 
 module.exports = function(environment) {
   var ENV = {
+    modulePrefix: 'cargo',
     environment: environment,
     baseURL: '/',
     locationType: 'auto',
@@ -19,17 +20,25 @@ module.exports = function(environment) {
   };
 
   if (environment === 'development') {
-    // LOG_MODULE_RESOLVER is needed for pre-1.6.0
-    // ENV.LOG_MODULE_RESOLVER = true;
-
     // ENV.APP.LOG_RESOLVER = true;
-    // ENV.APP.LOG_ACTIVE_GENERATION = true;
-    // ENV.APP.LOG_MODULE_RESOLVER = true;
-    ENV.APP.LOG_TRANSITIONS = true;
+    ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     ENV.APP.LOG_VIEW_LOOKUPS = true;
   }
 
+  if (environment === 'test') {
+    // Testem prefers this...
+    ENV.baseURL = '/';
+    ENV.locationType = 'auto';
+
+    // keep test console output quieter
+    ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
+
+    ENV.APP.rootElement = '#ember-testing';
+  }
+
   if (environment === 'production') {
 
   }

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "directories": {
     "doc": "doc",
-    "test": "test"
+    "test": "tests"
   },
   "scripts": {
     "start": "ember server",
@@ -18,15 +18,16 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "ember-cli": "0.0.39",
-    "originate": "0.1.5",
-    "broccoli-ember-hbs-template-compiler": "^1.5.0",
-    "express": "^4.1.1",
     "body-parser": "^1.2.0",
-    "glob": "^3.2.9",
-    "ember-cli-ember-data": "0.1.0",
-    "broccoli-asset-rev": "0.0.11",
-    "broccoli-sass": "~0.2.1",
-    "ember-cli-ic-ajax": "~0.1.1"
+    "broccoli-asset-rev": "0.1.1",
+    "broccoli-ember-hbs-template-compiler": "^1.6.1",
+    "broccoli-sass": "^0.2.2",
+    "ember-cli": "0.0.46",
+    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-inject-live-reload": "^1.0.2",
+    "ember-cli-qunit": "0.1.0",
+    "ember-data": "1.0.0-beta.10",
+    "express": "^4.8.5",
+    "glob": "^4.0.5"
   }
 }
diff --git a/public/crossdomain.xml b/public/crossdomain.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+
+    <!-- Most restrictive policy: -->
+    <site-control permitted-cross-domain-policies="none"/>
+
+    <!-- Least restrictive policy: -->
+    <!--
+    <site-control permitted-cross-domain-policies="all"/>
+    <allow-access-from domain="*" to-ports="*" secure="false"/>
+    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+    -->
+</cross-domain-policy>
diff --git a/public/robots.txt b/public/robots.txt
@@ -0,0 +1,3 @@
+# robotstxt.org/
+
+User-agent: *
diff --git a/testem.json b/testem.json
@@ -1,6 +1,11 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html",
-  "launch_in_ci": ["PhantomJS"],
-  "launch_in_dev": ["PhantomJS", "Chrome"]
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
 }
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -5,6 +5,7 @@
     "location",
     "setTimeout",
     "$",
+    "-Promise",
     "QUnit",
     "define",
     "console",
@@ -33,6 +34,7 @@
     "fillIn",
     "click",
     "keyEvent",
+    "triggerEvent",
     "find",
     "findWithAssert",
     "wait",

diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
@@ -1,9 +1,11 @@
 import Resolver from 'ember/resolver';
+import config from '../../config/environment';
 
 var resolver = Resolver.create();
 
 resolver.namespace = {
-  modulePrefix: 'cargo'
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix
 };
 
 export default resolver;
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,24 +1,19 @@
-/* global require */
-
-var Application = require('cargo/app')['default'];
-var Router = require('cargo/router')['default'];
 import Ember from 'ember';
+import Application from '../../app';
+import Router from '../../router';
+import config from '../../config/environments/test';
 
 export default function startApp(attrs) {
   var App;
 
-  var attributes = Ember.merge({
-    // useful Test defaults
-    rootElement: '#ember-testing',
-    LOG_ACTIVE_GENERATION:false,
-    LOG_VIEW_LOOKUPS: false
-  }, attrs); // but you can override;
+  var attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Router.reopen({
     location: 'none'
   });
 
-  Ember.run(function(){
+  Ember.run(function() {
     App = Application.create(attributes);
     App.setupForTesting();
     App.injectTestHelpers();

diff --git a/tests/index.html b/tests/index.html
@@ -11,7 +11,7 @@
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/cargo.css">
-    <link rel="stylesheet" href="assets/qunit.css">
+    <link rel="stylesheet" href="assets/test-support.css">
     <style>
       #ember-testing-container {
         position: absolute;
@@ -34,12 +34,10 @@
     <div id="qunit-fixture"></div>
 
     <script>
-      window.CargoENV = {{ENV}};
-      window.EmberENV = window.CargoENV.EmberENV;
+      window.EmberENV = {{EMBER_ENV}};
     </script>
-    <script src="assets/qunit.js"></script>
-    <script src="assets/qunit-notifications.js"></script>
     <script src="assets/vendor.js"></script>
+    <script src="assets/test-support.js"></script>
     <script src="assets/cargo.js"></script>
     <script src="testem.js"></script>
     <script>

diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -1,6 +1,15 @@
 import resolver from './helpers/resolver';
-import { setResolver } from 'ember-qunit';
+import {
+  setResolver
+} 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'});
+if (QUnit.urlParams.nocontainer) {
+  document.getElementById('ember-testing-container').style.visibility = 'hidden';
+} else {
+  document.getElementById('ember-testing-container').style.visibility = 'visible';
+}