update ember-app

stefanpenner · stefanpenner · commit 7882a4e1f3aa · 2015-05-06T21:14:24.000-07:00
diff --git a/.editorconfig b/.editorconfig
@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 
@@ -29,5 +30,5 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false
diff --git a/.jshintrc b/.jshintrc
@@ -1,13 +1,11 @@
 {
-  "predef": {
-    "document": true,
-    "window": true,
-    "-Promise": true,
-    "moment": true,
-    "google": true
-  },
-  "browser" : true,
-  "boss" : true,
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
   "curly": true,
   "debug": false,
   "devel": true,
diff --git a/app/controllers/crate/index.js b/app/controllers/crate/index.js
@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 import ajax from 'ic-ajax';
+import moment from 'moment';
 
 var NUM_VERSIONS = 5;
 
@@ -194,17 +195,17 @@ export default Ember.ObjectController.extend({
                 } else {
                     Ember.$('.graph').show();
                 }
-                var myData = google.visualization.arrayToDataTable(data);
+                var myData = window.google.visualization.arrayToDataTable(data);
 
-                var fmt = new google.visualization.DateFormat({
+                var fmt = new window.google.visualization.DateFormat({
                     pattern: 'LLL d, yyyy',
                 });
                 fmt.format(myData, 0);
                 var el = document.getElementById('graph-data');
                 if (!el) {
                     return;
                 }
-                var chart = new google.visualization.AreaChart(el);
+                var chart = new window.google.visualization.AreaChart(el);
                 chart.draw(myData, {
                     chartArea: {'width': '80%', 'height': '80%'},
                     hAxis: {
diff --git a/app/helpers/date-long.js b/app/helpers/date-long.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 function dateLong(value) {
     return moment(value).format('LL');
diff --git a/app/helpers/date-small.js b/app/helpers/date-small.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 function dateSmall(value) {
     return moment(value).format('ll');
diff --git a/app/helpers/from-now.js b/app/helpers/from-now.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 function fromNow(value) {
     return moment(value).fromNow();
diff --git a/app/index.html b/app/index.html
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{BASE_TAG}}
+    {{content-for 'head'}}
 
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -21,25 +21,22 @@
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/cargo.css">
+    {{content-for 'head-footer'}}
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Cargo">
   </head>
   <body>
+    {{content-for 'body'}}
     <noscript>
         <div id="main">
             <div class='noscript'>
                 This site requires that JavaScript to be enabled.
             </div>
         </div>
     </noscript>
-    <script>
-      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({{APP_CONFIG}});
-    </script>
+    {{content-for 'body-footer'}}
   </body>
 </html>
diff --git a/app/initializers/google.js b/app/initializers/google.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export var initialize = function() {
     Ember.$.getScript('https://www.google.com/jsapi', function() {
-        google.load('visualization', '1.0', {
+        window.google.load('visualization', '1.0', {
             'packages': ['corechart'],
             'callback': function() {
                 window.googleChartsLoaded = true;
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -5,10 +5,10 @@
 <div id="header">
     {{#link-to "index"}}
         <img src="/assets/Cargo-Logo-Small.png" id="logo"
-             height=100 width=100/>
+             height=100 width=100 />
     {{/link-to}}
     {{#link-to "index"}}
-        <h1>CARGO</h2>
+        <h1>CARGO</h1>
     {{/link-to}}
 
     <form class='search' action='/search' {{ action "" on="submit" }} >
diff --git a/app/templates/me/index.hbs b/app/templates/me/index.hbs
@@ -11,7 +11,7 @@
 
         <dl>
             <dt>Name</dt>
-            <dd>{{ name }}</dt>
+            <dd>{{ name }}</dd>
             <dt>GitHub Account</dt>
             <dd>{{ login }}</dd>
             <dt>Email</dt>
diff --git a/bower.json b/bower.json
@@ -1,19 +1,19 @@
 {
   "name": "cargo",
   "dependencies": {
-    "handlebars": "~1.3.0",
+    "ember": "1.11.1",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.1",
+    "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.15",
     "jquery": "^1.11.1",
-    "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": "0.1.8",
-    "ember-qunit-notifications": "0.0.4",
-    "qunit": "~1.15.0",
-    "moment": "~2.8.3",
-    "normalize-css": "~3.0.1"
+    "loader.js": "ember-cli/loader.js#3.2.0",
+    "qunit": "~1.17.1",
+    "ember-cli-moment-shim": "~0.1.0",
+    "moment": "~2.10.2",
+    "normalize-css": "~3.0.3"
   }
 }
diff --git a/package.json b/package.json
@@ -7,7 +7,6 @@
     "test": "tests"
   },
   "scripts": {
-    "postinstall": "bower install",
     "start": "ember server",
     "startui": "ember server --proxy https://staging-crates-io.herokuapp.com",
     "build": "ember build",
@@ -20,18 +19,22 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "body-parser": "^1.2.0",
-    "bower": "^1.3.12",
-    "broccoli-asset-rev": "0.1.1",
-    "broccoli-ember-hbs-template-compiler": "^1.6.1",
+    "broccoli-asset-rev": "^2.0.2",
     "broccoli-sass": "^0.2.2",
-    "ember-cli": "0.0.46",
+    "ember-cli": "^0.2.3",
+    "ember-cli-app-version": "0.3.3",
+    "ember-cli-babel": "^5.0.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.0.2",
-    "ember-cli-qunit": "0.1.0",
-    "ember-data": "1.0.0-beta.10",
+    "ember-cli-qunit": "0.3.10",
+    "ember-cli-uglify": "1.0.1",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-document-title": "~0.1.2",
+    "ember-export-application-global": "^1.0.2",
+    "ember-moment": "1.1.1",
     "express": "^4.8.5",
-    "glob": "^4.0.5",
-    "ember-document-title": "~0.1.2"
+    "glob": "^4.0.5"
   }
 }
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,3 +1,2 @@
-# robotstxt.org/
-
+# http://www.robotstxt.org
 User-agent: *
diff --git a/testem.json b/testem.json
@@ -1,6 +1,6 @@
 {
   "framework": "qunit",
-  "test_page": "tests/index.html",
+  "test_page": "tests/index.html?hidepassed",
   "launch_in_ci": [
     "PhantomJS"
   ],
diff --git 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,9 +18,6 @@
     "findWithAssert",
     "wait",
     "DS",
-    "keyEvent",
-    "isolatedContainer",
-    "startApp",
     "andThen",
     "currentURL",
     "currentPath",
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,25 +1,19 @@
 import Ember from 'ember';
 import Application from '../../app';
 import Router from '../../router';
-import config from '../../config/environments/test';
+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;
 }
diff --git a/tests/index.html b/tests/index.html
@@ -7,42 +7,27 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{BASE_TAG}}
+    {{content-for 'head'}}
+    {{content-for 'test-head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/cargo.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>
 
-    <script>
-      window.EmberENV = {{EMBER_ENV}};
-    </script>
+    {{content-for 'body'}}
+    {{content-for 'test-body'}}
     <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>
-      require('cargo/tests/test-helper');
-    </script>
     <script src="assets/test-loader.js"></script>
+
+    {{content-for 'body-footer'}}
+    {{content-for 'test-body-footer'}}
   </body>
 </html>
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -4,12 +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'});
-if (QUnit.urlParams.nocontainer) {
-  document.getElementById('ember-testing-container').style.visibility = 'hidden';
-} else {
-  document.getElementById('ember-testing-container').style.visibility = 'visible';
-}
diff --git a/tests/unit/helpers/date-long-test.js b/tests/unit/helpers/date-long-test.js
@@ -2,10 +2,12 @@ import {
   dateLong
 } from 'cargo/helpers/date-long';
 
+import { module } from 'qunit';
+import { test } from 'ember-qunit';
+
 module('DateLongHelper');
 
 // Replace this with your real tests.
-test('it works', function() {
-  var result = dateLong(42);
-  ok(result);
+test('it works', function(assert) {
+  assert.ok(dateLong(42));
 });
diff --git a/tests/unit/helpers/date-small-test.js b/tests/unit/helpers/date-small-test.js
diff --git a/tests/unit/helpers/format-email-test.js b/tests/unit/helpers/format-email-test.js
diff --git a/tests/unit/helpers/format-num-test.js b/tests/unit/helpers/format-num-test.js
diff --git a/tests/unit/mixins/pagination-test.js b/tests/unit/mixins/pagination-test.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import Ember from 'ember';`
	`2`	`+import moment from 'moment';`
`2`	`3`
`3`	`4`	`function dateLong(value) {`
`4`	`5`	`return moment(value).format('LL');`