From 4175b66d0911c9ea454daaefb219d11b334f1bab Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Thu, 14 May 2015 11:50:24 -0400 Subject: [PATCH] 0.2.4 --- .npmignore | 1 + .travis.yml | 14 +++++++++++- bower.json | 6 ++--- config/ember-try.js | 35 ++++++++++++++++++++++++++++++ package.json | 11 +++++----- testem.json | 1 + tests/dummy/app/app.js | 1 - tests/dummy/app/router.js | 4 +++- tests/dummy/public/crossdomain.xml | 18 +++++++-------- tests/dummy/public/robots.txt | 1 + 10 files changed, 72 insertions(+), 20 deletions(-) create mode 100644 config/ember-try.js diff --git a/.npmignore b/.npmignore index a28e4ab..49996f5 100644 --- a/.npmignore +++ b/.npmignore @@ -1,6 +1,7 @@ bower_components/ tests/ tmp/ +dist/ .bowerrc .editorconfig diff --git a/.travis.yml b/.travis.yml index 70a305e..8197d31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,19 @@ cache: directories: - node_modules +env: + - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-release + - EMBER_TRY_SCENARIO=ember-beta + - EMBER_TRY_SCENARIO=ember-canary + +matrix: + fast_finish: true + allow_failures: + - env: EMBER_TRY_SCENARIO=ember-canary + before_install: + - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - "npm config set spin false" - "npm install -g npm@^2" @@ -19,4 +31,4 @@ install: - bower install script: - - npm test + - ember try $EMBER_TRY_SCENARIO test diff --git a/bower.json b/bower.json index 36e6806..6478df2 100644 --- a/bower.json +++ b/bower.json @@ -1,12 +1,12 @@ { "name": "my-addon", "dependencies": { - "ember": "1.11.1", + "ember": "1.12.0", "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-data": "1.0.0-beta.17", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.1", + "ember-qunit": "0.3.2", "ember-qunit-notifications": "0.0.7", "ember-resolver": "~0.1.15", "jquery": "^1.11.1", diff --git a/config/ember-try.js b/config/ember-try.js new file mode 100644 index 0000000..83dab0f --- /dev/null +++ b/config/ember-try.js @@ -0,0 +1,35 @@ +module.exports = { + scenarios: [ + { + name: 'default', + dependencies: { } + }, + { + name: 'ember-release', + dependencies: { + 'ember': 'components/ember#release' + }, + resolutions: { + 'ember': 'release' + } + }, + { + name: 'ember-beta', + dependencies: { + 'ember': 'components/ember#beta' + }, + resolutions: { + 'ember': 'beta' + } + }, + { + name: 'ember-canary', + dependencies: { + 'ember': 'components/ember#canary' + }, + resolutions: { + 'ember': 'canary' + } + } + ] +}; diff --git a/package.json b/package.json index 785b2df..993cf45 100644 --- a/package.json +++ b/package.json @@ -19,16 +19,17 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.3", + "ember-cli": "0.2.4", "ember-cli-app-version": "0.3.3", "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "0.0.8", - "ember-cli-htmlbars": "0.7.4", + "ember-cli-dependency-checker": "1.0.0", + "ember-cli-htmlbars": "0.7.6", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-qunit": "0.3.10", + "ember-cli-qunit": "0.3.12", "ember-cli-uglify": "1.0.1", - "ember-data": "1.0.0-beta.16.1", + "ember-data": "1.0.0-beta.17", + "ember-disable-proxy-controllers": "^0.7.0", "ember-export-application-global": "^1.0.2", "ember-disable-prototype-extensions": "^1.0.0", "ember-try": "0.0.4" diff --git a/testem.json b/testem.json index 42a4ddb..0f35392 100644 --- a/testem.json +++ b/testem.json @@ -1,6 +1,7 @@ { "framework": "qunit", "test_page": "tests/index.html?hidepassed", + "disable_watching": true, "launch_in_ci": [ "PhantomJS" ], diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 8d66b95..037963b 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -9,7 +9,6 @@ Ember.MODEL_FACTORY_INJECTIONS = true; App = Ember.Application.extend({ modulePrefix: config.modulePrefix, - podModulePrefix: config.podModulePrefix, Resolver: Resolver }); diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index dce5994..cef554b 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -5,5 +5,7 @@ var Router = Ember.Router.extend({ location: config.locationType }); -export default Router.map(function() { +Router.map(function() { }); + +export default Router; diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml index 29a035d..0c16a7a 100644 --- a/tests/dummy/public/crossdomain.xml +++ b/tests/dummy/public/crossdomain.xml @@ -1,15 +1,15 @@ - + - - + + - - + + diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt index 5debfa4..f591645 100644 --- a/tests/dummy/public/robots.txt +++ b/tests/dummy/public/robots.txt @@ -1,2 +1,3 @@ # http://www.robotstxt.org User-agent: * +Disallow: