From 9ca5c1804d2e8747196ae8fd7cb3455a8c60d520 Mon Sep 17 00:00:00 2001 From: Luke Melia Date: Tue, 12 Jul 2016 22:27:03 -0400 Subject: [PATCH] Update ember-cli and use ember try's versionCompatibility --- .npmignore | 19 ++-- .travis.yml | 27 ++---- .watchmanconfig | 2 +- LICENSE.md | 2 +- bower.json | 16 +--- config/ember-try.js | 125 +++++++++++++------------ config/environment.js | 1 + package.json | 37 ++++---- testem.js | 13 +++ tests/dummy/app/app.js | 4 +- tests/dummy/app/index.html | 8 +- tests/dummy/app/resolver.js | 3 + tests/helpers/destroy-app.js | 5 + tests/helpers/module-for-acceptance.js | 23 +++++ tests/helpers/resolver.js | 2 +- tests/index.html | 21 +++-- 16 files changed, 173 insertions(+), 135 deletions(-) create mode 100644 testem.js create mode 100644 tests/dummy/app/resolver.js create mode 100644 tests/helpers/destroy-app.js create mode 100644 tests/helpers/module-for-acceptance.js diff --git a/.npmignore b/.npmignore index d522ca2..fa8b147 100644 --- a/.npmignore +++ b/.npmignore @@ -1,15 +1,16 @@ -bower_components/ -tests/ -tmp/ -dist/ - +/bower_components +/config/ember-try.js +/dist +/tests +/tmp +**/.gitkeep .bowerrc .editorconfig .ember-cli +.gitignore +.jshintrc +.watchmanconfig .travis.yml -.npmignore -**/.gitkeep bower.json ember-cli-build.js -Brocfile.js -testem.json +testem.js diff --git a/.travis.yml b/.travis.yml index a70b1f0..dad073e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "0.12" + - "4" sudo: false @@ -9,29 +9,16 @@ cache: directories: - node_modules -env: - - EMBER_TRY_SCENARIO=1.10.1 - - EMBER_TRY_SCENARIO=1.11.3 - - EMBER_TRY_SCENARIO=1.12.1 - - EMBER_TRY_SCENARIO=1.13.10 - - EMBER_TRY_SCENARIO=ember-release - - EMBER_TRY_SCENARIO=ember-beta - - EMBER_TRY_SCENARIO=ember-canary - -matrix: - allow_failures: - - env: EMBER_TRY_SCENARIO=ember-beta - - 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" + - npm config set spin false + - npm install -g bower + - npm install phantomjs-prebuilt install: - - npm install -g bower - npm install - bower install script: - - ember try $EMBER_TRY_SCENARIO test --skip-cleanup + # Usually, it's ok to finish the test scenario without reverting + # to the addon's original dependency state, skipping "cleanup". + - ember try:each --skip-cleanup diff --git a/.watchmanconfig b/.watchmanconfig index 5e9462c..e7834e3 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp"] + "ignore_dirs": ["tmp", "dist"] } diff --git a/LICENSE.md b/LICENSE.md index 00e9fbb..02000b5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 +Copyright (c) 2016 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 31da7b5..4896339 100644 --- a/bower.json +++ b/bower.json @@ -1,16 +1,10 @@ { "name": "ember-modal-dialog", "dependencies": { - "ember": "1.13.10", - "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", - "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", - "ember-qunit": "0.4.15", - "ember-qunit-notifications": "0.0.7", - "ember-resolver": "~0.1.18", - "jquery": "1.11.3", - "loader.js": "ember-cli/loader.js#3.2.1", - "qunit": "~1.19.0", - "bind-polyfill": "^1.0.0" + "bind-polyfill": "^1.0.0", + "ember": "~2.6.0", + "ember-cli-shims": "0.1.1", + "ember-cli-test-loader": "0.2.2", + "ember-qunit-notifications": "0.1.0" } } diff --git a/config/ember-try.js b/config/ember-try.js index 3150e15..b33b04c 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,61 +1,68 @@ module.exports = { - scenarios: [ - { - name: 'default', - dependencies: { } - }, - { - name: '1.10.1', - dependencies: { - 'ember': '1.10.1', - 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' - } - }, - { - name: '1.11.3', - dependencies: { - 'ember': '1.11.3', - 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' - } - }, - { - name: '1.12.1', - dependencies: { - 'ember': '1.12.1' - } - }, - { - name: '1.13.10', - dependencies: { - 'ember': '1.13.10' - } - }, - { - 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' - } - } - ] + useVersionCompatibility: true + // scenarios: [ + // { + // name: 'default', + // dependencies: { } + // }, + // { + // name: '1.10.1', + // dependencies: { + // 'ember': '1.10.1', + // 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' + // } + // }, + // { + // name: '1.11.3', + // dependencies: { + // 'ember': '1.11.3', + // 'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2' + // } + // }, + // { + // name: '1.12.1', + // dependencies: { + // 'ember': '1.12.1' + // } + // }, + // { + // name: '1.13.10', + // dependencies: { + // 'ember': '1.13.10' + // } + // }, + // { + // name: '2.4.5', + // dependencies: { + // 'ember': '2.4.5' + // } + // }, + // { + // 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/config/environment.js b/config/environment.js index 0dfaed4..28a787b 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,3 +1,4 @@ +/*jshint node:true*/ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/package.json b/package.json index ad6f8d1..71d45e0 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "start": "ember server", "build": "ember build", - "test": "ember test", + "test": "ember try:each", "deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -" }, "repository": "https://github.com/yapplabs/ember-modal-dialog", @@ -19,30 +19,30 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.0.2", - "ember-cli": "^1.13.8", - "ember-cli-app-version": "0.5.0", - "ember-cli-content-security-policy": "0.4.0", - "ember-cli-dependency-checker": "^1.0.1", + "broccoli-asset-rev": "^2.4.2", + "ember-ajax": "^2.0.1", + "ember-cli": "2.6.2", + "ember-cli-app-version": "^1.0.0", + "ember-cli-dependency-checker": "^1.2.0", "ember-cli-github-pages": "0.0.6", - "ember-cli-htmlbars-inline-precompile": "^0.2.0", - "ember-cli-ic-ajax": "0.2.1", - "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-htmlbars-inline-precompile": "^0.3.1", + "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-lorem-ipsum": "0.0.2", - "ember-cli-qunit": "^1.0.0", - "ember-cli-release": "0.2.5", + "ember-cli-qunit": "^1.4.0", + "ember-cli-release": "^0.2.9", "ember-cli-sass": "3.1.1", "ember-cli-uglify": "^1.2.0", "ember-code-snippet": "1.3.0", - "ember-disable-prototype-extensions": "^1.0.0", + "ember-disable-prototype-extensions": "^1.1.0", "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.3", + "ember-export-application-global": "^1.0.5", "ember-legacy-views": "0.2.0", + "ember-load-initializers": "^0.5.1", + "ember-resolver": "^2.0.3", "ember-suave": "1.2.3", "ember-tether": "^0.3.1", "ember-truth-helpers": "1.2.0", - "ember-try": "0.0.6", - "glob": "4.4.0" + "loader.js": "^4.0.1" }, "dependencies": { "ember-cli-babel": "^5.1.6", @@ -55,6 +55,9 @@ ], "ember-addon": { "configPath": "tests/dummy/config", - "demoURL": "http://yapplabs.github.io/ember-modal-dialog/" + "demoURL": "http://yapplabs.github.io/ember-modal-dialog/", + "versionCompatibility": { + "ember": ">1.11.0" + } } -} \ No newline at end of file +} diff --git a/testem.js b/testem.js new file mode 100644 index 0000000..26044b2 --- /dev/null +++ b/testem.js @@ -0,0 +1,13 @@ +/*jshint node:true*/ +module.exports = { + "framework": "qunit", + "test_page": "tests/index.html?hidepassed", + "disable_watching": true, + "launch_in_ci": [ + "PhantomJS" + ], + "launch_in_dev": [ + "PhantomJS", + "Chrome" + ] +}; diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 8b234d6..831ad61 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -1,6 +1,6 @@ import Ember from 'ember'; -import Resolver from 'ember/resolver'; -import loadInitializers from 'ember/load-initializers'; +import Resolver from './resolver'; +import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; let App; diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 1c49d36..c9b4327 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -7,19 +7,19 @@ - {{content-for 'head'}} + {{content-for "head"}} - {{content-for 'head-footer'}} + {{content-for "head-footer"}} - {{content-for 'body'}} + {{content-for "body"}} - {{content-for 'body-footer'}} + {{content-for "body-footer"}} diff --git a/tests/dummy/app/resolver.js b/tests/dummy/app/resolver.js new file mode 100644 index 0000000..2fb563d --- /dev/null +++ b/tests/dummy/app/resolver.js @@ -0,0 +1,3 @@ +import Resolver from 'ember-resolver'; + +export default Resolver; diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js new file mode 100644 index 0000000..c3d4d1a --- /dev/null +++ b/tests/helpers/destroy-app.js @@ -0,0 +1,5 @@ +import Ember from 'ember'; + +export default function destroyApp(application) { + Ember.run(application, 'destroy'); +} diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js new file mode 100644 index 0000000..76996fd --- /dev/null +++ b/tests/helpers/module-for-acceptance.js @@ -0,0 +1,23 @@ +import { module } from 'qunit'; +import Ember from 'ember'; +import startApp from '../helpers/start-app'; +import destroyApp from '../helpers/destroy-app'; + +const { RSVP: { Promise } } = Ember; + +export default function(name, options = {}) { + module(name, { + beforeEach() { + this.application = startApp(); + + if (options.beforeEach) { + return options.beforeEach.apply(this, arguments); + } + }, + + afterEach() { + let afterEach = options.afterEach && options.afterEach.apply(this, arguments); + return Promise.resolve(afterEach).then(() => destroyApp(this.application)); + } + }); +} diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js index ebfb4e4..b208d38 100644 --- a/tests/helpers/resolver.js +++ b/tests/helpers/resolver.js @@ -1,4 +1,4 @@ -import Resolver from 'ember/resolver'; +import Resolver from '../../resolver'; import config from '../../config/environment'; const resolver = Resolver.create(); diff --git a/tests/index.html b/tests/index.html index de94d2b..33a3911 100644 --- a/tests/index.html +++ b/tests/index.html @@ -7,8 +7,8 @@ - {{content-for 'head'}} - {{content-for 'test-head'}} + {{content-for "head"}} + {{content-for "test-head"}} @@ -26,21 +26,22 @@ } - {{content-for 'head-footer'}} - {{content-for 'test-head-footer'}} + {{content-for "head-footer"}} + {{content-for "test-head-footer"}} - {{content-for 'body'}} - {{content-for 'test-body'}} + {{content-for "body"}} + {{content-for "test-body"}} + + - - + - {{content-for 'body-footer'}} - {{content-for 'test-body-footer'}} + {{content-for "body-footer"}} + {{content-for "test-body-footer"}}