diff --git a/.ember-cli b/.ember-cli new file mode 100644 index 0000000..ee64cfe --- /dev/null +++ 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/bower.json b/bower.json index a092aa7..ce46364 100644 --- a/bower.json +++ b/bower.json @@ -4,6 +4,7 @@ "handlebars": "~1.3.0", "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", diff --git a/config/environment.js b/config/environment.js new file mode 100644 index 0000000..0dfaed4 --- /dev/null +++ b/config/environment.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = function(/* environment, appConfig */) { + return { }; +}; diff --git a/package.json b/package.json index 79153b3..71510c2 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,10 @@ { - "name": "my-addon", + "name": "dummy", "version": "0.0.0", + "private": true, "directories": { "doc": "doc", - "test": "test" + "test": "tests" }, "scripts": { "start": "ember server", @@ -14,23 +15,24 @@ "engines": { "node": ">= 0.10.0" }, - "keywords": [ - "ember-addon" - ], - "ember-addon": { - "configPath": "tests/dummy/config" - }, "author": "", "license": "MIT", "devDependencies": { "body-parser": "^1.2.0", - "broccoli-asset-rev": "0.0.17", + "broccoli-asset-rev": "0.1.1", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.0.44", - "ember-cli-ember-data": "0.1.0", + "ember-cli": "0.0.45", "ember-cli-ic-ajax": "0.1.1", - "ember-cli-qunit": "0.0.5", + "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" + }, + "keywords": [ + "ember-addon" + ], + "ember-addon": { + "configPath": "tests/dummy/config" } -} +} \ No newline at end of file diff --git a/tests/dummy/.jshintrc b/tests/dummy/.jshintrc index 427d89f..7547475 100644 --- a/tests/dummy/.jshintrc +++ b/tests/dummy/.jshintrc @@ -2,8 +2,7 @@ "predef": { "document": true, "window": true, - "-Promise": true, - "DummyENV": true + "-Promise": true }, "browser" : true, "boss" : true, diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 5727e51..757df38 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/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: 'dummy', // TODO: loaded via config + modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix, Resolver: Resolver }); -loadInitializers(App, 'dummy'); +loadInitializers(App, config.modulePrefix); export default App; diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 028dd91..19904ff 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -14,13 +14,12 @@ diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index d650ea7..cef554b 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -1,7 +1,8 @@ import Ember from 'ember'; +import config from './config/environment'; var Router = Ember.Router.extend({ - location: DummyENV.locationType + location: config.locationType }); Router.map(function() { diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 47490a8..bc0d538 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -2,6 +2,7 @@ module.exports = function(environment) { var ENV = { + modulePrefix: 'dummy', environment: environment, baseURL: '/', locationType: 'auto', @@ -27,7 +28,15 @@ module.exports = function(environment) { } if (environment === 'test') { - ENV.baseURL = '/'; // Testem prefers this... + // 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/tests/helpers/resolver.js b/tests/helpers/resolver.js index 62fc58f..28f4ece 100644 --- 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: 'dummy' + modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix }; export default resolver; diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index a5d62ca..1b3decc 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,16 +1,13 @@ import Ember from 'ember'; -import Application from 'dummy/app'; -import Router from 'dummy/router'; +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' diff --git a/tests/index.html b/tests/index.html index e88d21d..d899b3b 100644 --- a/tests/index.html +++ b/tests/index.html @@ -34,8 +34,7 @@