diff --git a/.travis.yml b/.travis.yml index 55409e9..596be87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ env: - EMBER_CLI_VERSION=0.0.46 - EMBER_CLI_VERSION=0.0.44 - EMBER_CLI_VERSION=0.0.42 - - STANDIN_VAR=nothing \ No newline at end of file + - STANDIN_VAR=nothing diff --git a/LICENSE.md b/LICENSE.md index b6c71bd..00e9fbb 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 +Copyright (c) 2015 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/bower.json b/bower.json index 73786f9..8b743d0 100644 --- a/bower.json +++ b/bower.json @@ -4,12 +4,12 @@ "handlebars": "~1.3.0", "jquery": "^1.11.1", "ember": "1.8.1", - "ember-data": "1.0.0-beta.11", - "ember-resolver": "~0.1.10", - "loader.js": "stefanpenner/loader.js#1.0.1", - "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3", + "ember-data": "1.0.0-beta.12", + "ember-resolver": "~0.1.11", + "loader.js": "ember-cli/loader.js#1.0.1", + "ember-cli-shims": "ember-cli/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-load-initializers": "ember-cli/ember-load-initializers#0.0.2", "ember-qunit": "0.1.8", "ember-qunit-notifications": "0.0.4", "qunit": "~1.15.0", diff --git a/package.json b/package.json index 55125fc..08bea11 100644 --- a/package.json +++ b/package.json @@ -18,18 +18,18 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^1.0.0", + "broccoli-asset-rev": "^2.0.0", "broccoli-ember-hbs-template-compiler": "^1.6.1", "connect-restreamer": "^1.0.1", - "ember-cli": "0.1.3", + "ember-cli": "0.1.7", "ember-cli-bootstrap": "0.0.3", "ember-cli-content-security-policy": "0.3.0", - "ember-cli-dependency-checker": "0.0.6", - "ember-cli-esnext": "0.1.1", + "ember-cli-dependency-checker": "0.0.7", + "ember-cli-6to5": "0.2.1", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.1.2", - "ember-data": "1.0.0-beta.11", + "ember-data": "1.0.0-beta.12", "ember-export-application-global": "^1.0.0", "express": "^4.8.5", "glob": "^4.0.5", diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index b7d8600..1c49d36 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -11,11 +11,15 @@ + + {{content-for 'head-footer'}} {{content-for 'body'}} + + {{content-for 'body-footer'}} diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index d3f169f..c59bcd5 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -21,10 +21,10 @@ module.exports = function(environment) { if (environment === 'development') { // ENV.APP.LOG_RESOLVER = true; - ENV.APP.LOG_ACTIVE_GENERATION = true; + // ENV.APP.LOG_ACTIVE_GENERATION = true; // ENV.APP.LOG_TRANSITIONS = true; // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; - ENV.APP.LOG_VIEW_LOOKUPS = true; + // ENV.APP.LOG_VIEW_LOOKUPS = true; } if (environment === 'test') { diff --git a/tests/helpers/assertions.js b/tests/helpers/assertions.js index 547b655..faf39b1 100644 --- a/tests/helpers/assertions.js +++ b/tests/helpers/assertions.js @@ -10,7 +10,7 @@ var f = function() { i += 1; }); }); - + Ember.Test.registerAsyncHelper('hasButtons', function(app, ops, context) { for (var name in ops) { var present = ops[name]; @@ -42,4 +42,4 @@ var f = function() { f(); -export default f; \ No newline at end of file +export default f; diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index 54fa9c0..7d8dbaf 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -5,16 +5,16 @@ import config from '../../config/environment'; import PaginationAssertions from './assertions'; 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; Ember.run(function() { - App = Application.create(attributes); - App.setupForTesting(); - App.injectTestHelpers(); + application = Application.create(attributes); + application.setupForTesting(); + application.injectTestHelpers(); }); - return App; + return application; } diff --git a/tests/index.html b/tests/index.html index 12ade4a..4112b61 100644 --- a/tests/index.html +++ b/tests/index.html @@ -29,6 +29,9 @@ zoom: 50%; } + + {{content-for 'head-footer'}} + {{content-for 'test-head-footer'}} @@ -39,5 +42,8 @@ + + {{content-for 'body-footer'}} + {{content-for 'test-body-footer'}}