From 63f3d3b80f354763f1580031647ad1d876124a4e Mon Sep 17 00:00:00 2001 From: Ahmed O Date: Fri, 5 Jun 2015 21:51:10 -0400 Subject: [PATCH 1/4] upgrade ember-cli to 0.2.4 and ember to 1.12 --- .npmignore | 1 + .travis.yml | 14 ++++++++- bower.json | 12 ++++---- config/ember-try.js | 35 +++++++++++++++++++++++ package.json | 13 +++++---- testem.json | 1 + tests/dummy/.jshintrc | 32 --------------------- tests/dummy/app/app.js | 5 ++-- tests/dummy/app/router.js | 4 ++- tests/dummy/public/crossdomain.xml | 18 ++++++------ tests/dummy/public/robots.txt | 1 + tests/unit/components/ember-chart-test.js | 4 +-- 12 files changed, 81 insertions(+), 59 deletions(-) create mode 100644 config/ember-try.js delete mode 100644 tests/dummy/.jshintrc 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 764de59..16c7d68 100644 --- a/bower.json +++ b/bower.json @@ -1,16 +1,16 @@ { "name": "ember-cli-chart", "dependencies": { - "jquery": "^1.11.1", - "ember": "1.11.1", - "ember-data": "1.0.0-beta.16.1", - "ember-resolver": "~0.1.15", - "loader.js": "ember-cli/loader.js#3.2.0", + "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.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", + "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1", "chartjs": "1.0.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 2a08b29..f331ccb 100644 --- a/package.json +++ b/package.json @@ -31,19 +31,20 @@ "homepage": "https://github.com/aomra015/ember-cli-chart", "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" + "ember-try": "0.0.7" }, "dependencies": { "ember-cli-babel": "^5.0.0" 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/.jshintrc b/tests/dummy/.jshintrc deleted file mode 100644 index 7547475..0000000 --- a/tests/dummy/.jshintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "predef": { - "document": true, - "window": true, - "-Promise": true - }, - "browser" : true, - "boss" : true, - "curly": true, - "debug": false, - "devel": true, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esnext": true, - "unused": true -} diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 757df38..037963b 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -3,11 +3,12 @@ import Resolver from 'ember/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: 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: diff --git a/tests/unit/components/ember-chart-test.js b/tests/unit/components/ember-chart-test.js index 79cdd66..155c8ce 100644 --- a/tests/unit/components/ember-chart-test.js +++ b/tests/unit/components/ember-chart-test.js @@ -1,10 +1,10 @@ -import Ember from 'ember'; import { moduleForComponent, test } from 'ember-qunit'; +import Ember from 'ember'; -moduleForComponent('ember-chart'); +moduleForComponent('ember-chart', 'EmberChartComponent', {}); // Test Data var ChartTestData = Ember.Object.extend({ From a60a1c68c604676510b700c823ca16b9ac040204 Mon Sep 17 00:00:00 2001 From: Ahmed O Date: Sat, 6 Jun 2015 11:29:45 -0400 Subject: [PATCH 2/4] upgrade ember-cli to 0.2.5 --- bower.json | 2 +- package.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 16c7d68..954b04a 100644 --- a/bower.json +++ b/bower.json @@ -6,7 +6,7 @@ "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-data": "1.0.0-beta.17", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", - "ember-qunit": "0.3.2", + "ember-qunit": "0.3.3", "ember-qunit-notifications": "0.0.7", "ember-resolver": "~0.1.15", "jquery": "^1.11.1", diff --git a/package.json b/package.json index f331ccb..eeca347 100644 --- a/package.json +++ b/package.json @@ -31,19 +31,19 @@ "homepage": "https://github.com/aomra015/ember-cli-chart", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.4", + "ember-cli": "0.2.5", "ember-cli-app-version": "0.3.3", "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "1.0.0", + "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.12", - "ember-cli-uglify": "1.0.1", + "ember-cli-qunit": "0.3.13", + "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.17", + "ember-disable-prototype-extensions": "^1.0.0", "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.7" }, "dependencies": { From 3ad5f8396e72f3111f64690fc82755bf10291b2f Mon Sep 17 00:00:00 2001 From: Ahmed O Date: Sat, 6 Jun 2015 11:50:20 -0400 Subject: [PATCH 3/4] upgrade ember-cli to 0.2.6 --- .watchmanconfig | 3 +++ Brocfile.js | 21 ++++++++------------- bower.json | 2 +- package.json | 8 ++++---- tests/dummy/app/app.js | 1 + tests/unit/components/ember-chart-test.js | 4 +++- 6 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 .watchmanconfig diff --git a/.watchmanconfig b/.watchmanconfig new file mode 100644 index 0000000..5e9462c --- /dev/null +++ b/.watchmanconfig @@ -0,0 +1,3 @@ +{ + "ignore_dirs": ["tmp"] +} diff --git a/Brocfile.js b/Brocfile.js index 042a64d..2a682c0 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -3,19 +3,14 @@ var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); -var app = new EmberAddon(); +/* + This Brocfile specifes the options for the dummy test app of this + addon, located in `/tests/dummy` + + This Brocfile does *not* influence how the addon or the app using it + behave. You most likely want to be modifying `./index.js` or app's Brocfile +*/ -// Use `app.import` to add additional libraries to the generated -// output files. -// -// If you need to use different assets in different -// environments, specify an object as the first parameter. That -// object's keys should be the environment name and the values -// should be the asset to use in that environment. -// -// If the library that you are including contains AMD or ES6 -// modules that you would like to import into your application -// please specify an object with the list of modules as keys -// along with the exports of each module as its value. +var app = new EmberAddon(); module.exports = app.toTree(); diff --git a/bower.json b/bower.json index 954b04a..5dc06b1 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "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.17", + "ember-data": "1.0.0-beta.18", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", "ember-qunit": "0.3.3", "ember-qunit-notifications": "0.0.7", diff --git a/package.json b/package.json index eeca347..e375caf 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/aomra015/ember-cli-chart", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.5", + "ember-cli": "0.2.6", "ember-cli-app-version": "0.3.3", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", @@ -40,10 +40,10 @@ "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.3.13", "ember-cli-uglify": "^1.0.1", - "ember-data": "1.0.0-beta.17", - "ember-disable-prototype-extensions": "^1.0.0", - "ember-disable-proxy-controllers": "^0.7.0", + "ember-data": "1.0.0-beta.18", + "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", + "ember-disable-prototype-extensions": "^1.0.0", "ember-try": "0.0.7" }, "dependencies": { diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 037963b..8d66b95 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -9,6 +9,7 @@ Ember.MODEL_FACTORY_INJECTIONS = true; App = Ember.Application.extend({ modulePrefix: config.modulePrefix, + podModulePrefix: config.podModulePrefix, Resolver: Resolver }); diff --git a/tests/unit/components/ember-chart-test.js b/tests/unit/components/ember-chart-test.js index 155c8ce..3d0402c 100644 --- a/tests/unit/components/ember-chart-test.js +++ b/tests/unit/components/ember-chart-test.js @@ -4,7 +4,9 @@ import { } from 'ember-qunit'; import Ember from 'ember'; -moduleForComponent('ember-chart', 'EmberChartComponent', {}); +moduleForComponent('ember-chart', 'EmberChartComponent', { + unit: true +}); // Test Data var ChartTestData = Ember.Object.extend({ From 67cfa3523e85cc98385cdf867faab7ece21ca6e1 Mon Sep 17 00:00:00 2001 From: Ahmed O Date: Sat, 6 Jun 2015 12:03:04 -0400 Subject: [PATCH 4/4] upgrade ember-cli to 0.2.7 --- README.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a16cb01..96acec0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/aomra015/ember-cli-chart.svg)](https://travis-ci.org/aomra015/ember-cli-chart) -This is an Ember CLI addon for adding a [ChartJS](http://www.chartjs.org/) component. This addon is tested on Ember-CLI v0.2.3 and uses the `ember-try` addon to test against multiple Ember versions. +This is an Ember CLI addon for adding a [ChartJS](http://www.chartjs.org/) component. This addon is tested on Ember-CLI v0.2.7 and uses the `ember-try` addon to test against Ember release, beta and canary. ### Installation diff --git a/package.json b/package.json index e375caf..e139901 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/aomra015/ember-cli-chart", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.6", + "ember-cli": "^0.2.7", "ember-cli-app-version": "0.3.3", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", @@ -41,9 +41,9 @@ "ember-cli-qunit": "0.3.13", "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.18", + "ember-disable-prototype-extensions": "^1.0.0", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.2", - "ember-disable-prototype-extensions": "^1.0.0", "ember-try": "0.0.7" }, "dependencies": {