Merge pull request #1 from ember-admin/new-cli

update cli

Author: OpakAlex

blueprints/ember-cli-admin-auth/files/app/templates/admin/navigation.hbs

@@ -12,5 +12,4 @@
       {{/if}}
       </div>
     </div>
-  </div>
-</nav>
+</nav>

bower.json

@@ -1,27 +1,23 @@
 {
   "name": "ember-cli-admin-auth",
   "dependencies": {
-    "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.9.1",
-    "ember-data": "1.0.0-beta.14",
-    "ember-resolver": "~0.1.7",
-    "loader.js": "stefanpenner/loader.js#1.0.1",
+    "ember": "1.11.0",
+    "ember-data": "1.0.0-beta.16",
+    "ember-resolver": "~0.1.12",
+    "loader.js": "stefanpenner/loader.js#3.2.0",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
+    "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.1.3",
     "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-qunit": "0.2.8",
+    "ember-qunit-notifications": "0.0.7",
+    "qunit": "~1.17.1",
     "pretender": "0.1.0",
     "bootstrap-sass-official": "3.2.0",
     "typeahead.js": "twitter/typeahead.js#0.10.5",
     "jquery-ui-sortable": "*",
     "bootstrap-datepicker": "~1.3.1",
     "ember-simple-auth": "0.7.2",
     "jquery-ui-touch-punch": "git://github.com/cbier/bower-jquery-ui-touch-punch.git"
-  },
-  "resolutions": {
-    "handlebars": ">= 2.0.0 < 3.0.0"
   }
 }

package.json

@@ -39,21 +39,24 @@
     "broccoli-merge-trees": "0.1.4",
     "broccoli-static-compiler": "0.1.4",
     "connect-restreamer": "^1.0.0",
-    "ember-cli": "0.1.7",
-    "ember-cli-6to5": "^0.2.1",
+    "ember-cli": "0.2.1",
     "ember-cli-admin": "git://github.com/ember-admin/ember-cli-admin.git",
+    "ember-cli-app-version": "0.3.2",
+    "ember-cli-babel": "^4.0.0",
     "ember-cli-bootstrap-datepicker": "0.3.0",
-    "ember-cli-ember-data": "0.1.0",
-    "ember-cli-htmlbars": "^0.6.0",
+    "ember-cli-htmlbars": "0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-map": "git://github.com/ember-admin/ember-cli-map.git",
     "ember-cli-pretender": "^0.3.1",
-    "ember-cli-qunit": "0.0.5",
+    "ember-cli-qunit": "0.3.9",
     "ember-cli-simple-auth": "^0.7.2",
     "ember-cli-simple-auth-devise": "^0.7.2",
     "ember-cli-simple-auth-testing": "^0.7.2",
-    "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",
+    "ember-watson": "^0.2.0",
     "express": "^4.8.5",
     "glob": "^4.0.5"
   }

tests/acceptance/auth-test.js

@@ -1,41 +1,42 @@
 import Ember from 'ember';
+import {module, test} from 'qunit';
 import startApp from '../helpers/start-app';
 
 var application;
 
 module('Acceptance: Auth', {
-  setup: function() {
+  beforeEach: function() {
     application = startApp();
   },
-  teardown: function() {
+  afterEach: function() {
     Ember.run(application, 'destroy');
   }
 });
 
-test('redirects to /login when I try to see content as not authenticated user', function() {
-  expect(2);
+test('redirects to /login when I try to see content as not authenticated user', function(assert) {
+  assert.expect(2);
 
   invalidateSession();
   visit('/');
 
   andThen(function() {
-    equal(currentPath(), 'login');
+    assert.equal(currentPath(), 'login');
 
     visit('/users');
 
     andThen(()=>{
-      equal(currentPath(), 'login');
+      assert.equal(currentPath(), 'login');
     });
   });
 });
 
-test('shows content when I`m authenticated', function() {
-  expect(1);
+test('shows content when I`m authenticated', function(assert) {
+  assert.expect(1);
 
   authenticateSession();
   visit('/');
 
   andThen(function() {
-    equal(currentURL(), '/');
+    assert.equal(currentURL(), '/');
   });
 });

tests/dummy/app/controllers/users.js

@@ -3,7 +3,7 @@ import SearchLogic from 'ember-cli-admin/dsl/search';
 import Ember from 'ember';
 var usersController;
 
-usersController = Ember.ObjectController.extend(TableViewController, {
+usersController = Ember.Controller.extend(TableViewController, {
   sortFields: ['id', 'name'],
   formAttributes: ['email', 'name'],
   searchForm: (function() {

tests/dummy/app/templates/admin/navigation.hbs

@@ -12,5 +12,4 @@
       {{/if}}
       </div>
     </div>
-  </div>
-</nav>
+</nav>

tests/helpers/start-app.js

@@ -21,7 +21,5 @@ export default function startApp(attrs) {
     App.injectTestHelpers();
   });
 
-  App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"
-
   return App;
 }