diff --git a/.travis.yml b/.travis.yml index 57c2d74..fef52d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,13 @@ cache: env: # we recommend testing LTS's and latest stable release (bonus points to beta/canary) - - EMBER_TRY_SCENARIO=ember-1-13 + - EMBER_TRY_SCENARIO=ember-1.13 - EMBER_TRY_SCENARIO=ember-lts-2.4 - EMBER_TRY_SCENARIO=ember-lts-2.8 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary + - EMBER_TRY_SCENARIO=ember-default matrix: fast_finish: true @@ -26,10 +27,9 @@ matrix: before_install: - npm config set spin false - - npm install -g bower + - npm install -g bower phantomjs-prebuilt - bower --version - - npm install phantomjs-prebuilt - - node_modules/phantomjs-prebuilt/bin/phantomjs --version + - phantomjs --version install: - npm install @@ -38,4 +38,4 @@ install: script: # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup + - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup diff --git a/LICENSE.md b/LICENSE.md index 02000b5..0d5e3ef 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 +Copyright (c) 2017 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 173dec9..3ad7d9e 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,4 @@ { "name": "ember-component-css", - "dependencies": { - "ember": "~2.10.0", - "ember-cli-shims": "0.1.3" - }, - "version": "0.2.9" + "dependencies": {} } diff --git a/config/ember-try.js b/config/ember-try.js index 0993dab..034f515 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -4,13 +4,18 @@ module.exports = { scenarios: [ { - name: 'ember-1-13', + name: 'ember-1.13', bower: { dependencies: { - 'ember': '~1.13.0' + 'ember': 'components/ember#release-1-13' }, resolutions: { - 'ember': '~1.13.0' + 'ember': 'release-1-13' + } + }, + npm: { + devDependencies: { + 'ember-source': null } } }, @@ -23,6 +28,11 @@ module.exports = { resolutions: { 'ember': 'lts-2-4' } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { @@ -34,6 +44,11 @@ module.exports = { resolutions: { 'ember': 'lts-2-8' } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { @@ -45,6 +60,11 @@ module.exports = { resolutions: { 'ember': 'release' } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { @@ -56,6 +76,11 @@ module.exports = { resolutions: { 'ember': 'beta' } + }, + npm: { + devDependencies: { + 'ember-source': null + } } }, { @@ -67,6 +92,17 @@ module.exports = { resolutions: { 'ember': 'canary' } + }, + npm: { + devDependencies: { + 'ember-source': null + } + } + }, + { + name: 'ember-default', + npm: { + devDependencies: {} } } ] diff --git a/package.json b/package.json index 70af5a6..4fe6656 100644 --- a/package.json +++ b/package.json @@ -41,23 +41,25 @@ "devDependencies": { "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^2.4.1", - "ember-cli": "2.10.0", + "ember-cli": "2.11.0", "ember-cli-app-version": "^2.0.0", "ember-cli-css-extensions": "git://github.com/webark/ember-cli-css-extensions.git", "ember-cli-dependency-checker": "^1.3.0", "ember-cli-eslint": "^3.0.2", - "ember-cli-htmlbars": "^1.0.10", + "ember-cli-htmlbars": "^1.1.1", "ember-cli-htmlbars-inline-precompile": "^0.3.3", "ember-cli-inject-live-reload": "^1.4.1", "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", + "ember-cli-shims": "^1.0.2", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", - "ember-load-initializers": "^0.5.1", + "ember-load-initializers": "^0.6.0", "ember-resolver": "^2.0.3", + "ember-source": "^2.11.0", "eslint": "^3.13.1", "eslint-plugin-ember-suave": "^1.0.0", "loader.js": "^4.0.10", diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index e98f3f1..f76619e 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -10,10 +10,8 @@ const { export default function startApp(attrs) { let application; - // use defaults, but you can override - // let attributes = Ember.assign({}, config.APP, attrs); let attributes = merge({}, config.APP); - attributes = merge(attributes, attrs); + attributes = merge(attributes, attrs); // use defaults, but you can override run(() => { application = Application.create(attributes);