update dummy

Author: DSivachinskiy

bower.json

@@ -19,7 +19,8 @@
     "typeahead.js": "0.10.5",
     "jquery-ui-sortable": "*",
     "bootstrap-datepicker": "~1.4.0",
-    "jquery-ui-touch-punch": "furf/jquery-ui-touch-punch"
+    "jquery-ui-touch-punch": "furf/jquery-ui-touch-punch",
+    "jquery-ui-touch-punch-improved": "0.3.1"
   },
   "resolutions": {
     "ember": "2.2.0"

config/environment.js

@@ -1,5 +1,60 @@
-'use strict';
+/* jshint node: true */
 
-module.exports = function(/* environment, appConfig */) {
-	return {};
+module.exports = function(environment) {
+  var ENV = {
+    modulePrefix: 'ember-cli-admin-auth',
+    environment: environment,
+    baseURL: '/',
+    locationType: 'auto',
+    EmberENV: {
+      appName: 'dummy',
+      titleLinksTo: 'http://ember-admin.com',
+      FEATURES: {
+        // Here you can enable experimental features on an ember canary build
+        // e.g. 'with-controller': true
+      }
+    },
+
+    APP: {
+      // Here you can pass flags/options to your application instance
+      // when it is created
+    },
+    contentSecurityPolicy: {
+      'script-src': "'self' 'unsafe-inline' 'unsafe-eval' use.typekit.net connect.facebook.net *.googleapis.com " +
+        "*.gstatic.com *.yandex.ru",
+      'style-src': "'self' 'unsafe-inline' use.typekit.net *.googleapis.com",
+      'img-src': "*",
+      'font-src': '*',
+      'connect-src': '*'
+    }
+  };
+  ENV['ember-simple-auth'] = {
+    store: 'session-store:local-storage'
+  };
+  ENV['ember-simple-auth'].crossOriginWhitelist = ['*'];
+
+  if (environment === 'development') {
+    // ENV.APP.LOG_RESOLVER = 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 = 'none';
+
+    // 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') {
+  }
+
+  return ENV;
 };

tests/dummy/app/adapters/application.js

@@ -1,8 +1,12 @@
-import DS from 'ember-data';
-var adapter;
+import ENV from '../config/environment';
+import ActiveModelAdapter from 'active-model-adapter';
+import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 
-adapter = DS.ActiveModelAdapter.extend({
-  namespace: 'api'
-});
-
-export default adapter;
+export default ActiveModelAdapter.extend(DataAdapterMixin, {
+  namespace: 'api',
+  authorizer: 'authorizer:devise',
+  host: ENV.adapterUrl,
+  shouldBackgroundReloadAll() {
+    return false;
+  }
+});

tests/dummy/app/app.js

@@ -3,14 +3,16 @@ import AdminResolver from 'ember-cli-admin/admin-resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
+var App;
+
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver: AdminResolver
 });
 
 loadInitializers(App, config.modulePrefix);
 
-export default App;
+export default App;

tests/dummy/app/initializers/init-shared.js

@@ -0,0 +1,4 @@
+export default function() {
+  this.navigate("Dashboard", { route: "dashboard" });
+  this.navigate("Users", { route: "users" });
+}

tests/dummy/app/initializers/navigation.js

@@ -8,11 +8,11 @@ var Router = Ember.Router.extend({
 
 Router.map(function() {
   this.route('login');
-  this.route("dashboard", {path: "/"});
 });
 
 MetaRoute.map(Router, function() {
+  this.route("dashboard", {path: "/"});
   this.resources("users");
 });
 
-export default Router;
+export default Router;

tests/dummy/app/initializers/user-in-route.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import authMixin from 'simple-auth/mixins/application-route-mixin';
+import authMixin from 'ember-simple-auth/mixins/application-route-mixin';
 
 export default Ember.Route.extend(authMixin, {
   redirect: function(){