From 231a1d3a6af66fb117fbfa1ea2eb9b8f7adca10d Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 2 Jan 2017 13:01:02 +0100 Subject: [PATCH] Update dependencies (#29) * update libraries * Remove unused "ember-welcome-page" addon * package.json: Add "mocha" script ... to fix CI builds --- .gitignore | 2 +- .travis.yml | 22 +++++++++++++---- bower.json | 5 ++-- config/ember-try.js | 12 +++++++++- index.js | 4 +++- package.json | 39 +++++++++++++++++-------------- tests/dummy/config/environment.js | 4 ++++ tests/index.html | 2 +- 8 files changed, 61 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 86fceae7..373de6a2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,5 @@ /connect.lock /coverage/* /libpeerconnection.log -npm-debug.log +npm-debug.log* testem.log diff --git a/.travis.yml b/.travis.yml index 22816447..446db6be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "0.12" + - "4" sudo: false @@ -9,20 +9,34 @@ cache: directories: - node_modules +env: + - EMBER_TRY_SCENARIO=ember-1.13 + - EMBER_TRY_SCENARIO=ember-lts-2.4 + - 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: - npm config set spin false - npm install -g bower - bower --version - npm install phantomjs-prebuilt - - phantomjs --version + - node_modules/phantomjs-prebuilt/bin/phantomjs --version install: - npm install - bower install script: - - npm run-script test - - npm run-script jshint + # 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 + - npm run mocha notifications: email: false diff --git a/bower.json b/bower.json index eb62383d..cef9cd12 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,7 @@ { "name": "ember-test-selectors", "dependencies": { - "ember": "~2.7.0", - "ember-cli-shims": "0.1.1", - "ember-qunit-notifications": "0.1.0" + "ember": "~2.9.0", + "ember-cli-shims": "0.1.3" } } diff --git a/config/ember-try.js b/config/ember-try.js index f5a25f4c..0355b5ff 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,6 +1,5 @@ /*jshint node:true*/ module.exports = { - useVersionCompatibility: true, scenarios: [ { name: 'ember-1.13', @@ -13,6 +12,17 @@ module.exports = { } } }, + { + name: 'ember-lts-2.4', + bower: { + dependencies: { + 'ember': 'components/ember#lts-2-4' + }, + resolutions: { + 'ember': 'lts-2-4' + } + } + }, { name: 'ember-release', bower: { diff --git a/index.js b/index.js index aa2b75bf..3e079bbe 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,6 @@ -/*jshint node:true*/ +/* jshint node:true */ +'use strict'; + var _includes = require('lodash/includes'); module.exports = { diff --git a/package.json b/package.json index 0d37bfb7..953747f8 100644 --- a/package.json +++ b/package.json @@ -1,41 +1,44 @@ { "name": "ember-test-selectors", "version": "0.0.5", - "description": "Enabling better Test selectors in Ember.js applications", + "description": "Enabling better Test selectors in Ember.js applications.", "directories": { "doc": "doc", "test": "tests" }, "scripts": { - "test": "ember try:each", - "jshint": "mocha" + "build": "ember build", + "mocha": "mocha", + "start": "ember server", + "test": "ember try:each" }, "repository": "https://github.com/simplabs/ember-test-selectors", "engines": { - "node": ">= 0.10.0" + "node": ">= 0.12.0" }, "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.4.2", - "ember-ajax": "^2.0.1", - "ember-cli": "2.7.0", - "ember-cli-app-version": "^1.0.0", - "ember-cli-dependency-checker": "^1.2.0", - "ember-cli-htmlbars": "^1.0.3", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.4.0", - "ember-cli-jshint": "^1.0.0", - "ember-cli-qunit": "^2.0.0", + "broccoli-asset-rev": "^2.4.5", + "ember-ajax": "^2.4.1", + "ember-cli": "2.9.1", + "ember-cli-app-version": "^2.0.0", + "ember-cli-dependency-checker": "^1.3.0", + "ember-cli-htmlbars": "^1.0.10", + "ember-cli-htmlbars-inline-precompile": "^0.3.3", + "ember-cli-inject-live-reload": "^1.4.1", + "ember-cli-jshint": "^1.0.4", + "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.7.0", + "ember-data": "^2.9.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", + "ember-load-initializers": "^0.5.1", "ember-resolver": "^2.0.3", - "loader.js": "^4.0.1", + "loader.js": "^4.0.10", "mocha": "^1.21.4", "mocha-jshint": "^2.3.1" }, @@ -43,8 +46,8 @@ "ember-addon" ], "dependencies": { - "ember-cli-babel": "^5.1.5", - "lodash": "^4.0.0" + "ember-cli-babel": "^5.1.7", + "lodash": "^4.0.0" }, "ember-addon": { "configPath": "tests/dummy/config", diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 2529939c..703c4727 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -10,6 +10,10 @@ module.exports = function(environment) { FEATURES: { // Here you can enable experimental features on an ember canary build // e.g. 'with-controller': true + }, + EXTEND_PROTOTYPES: { + // Prevent Ember Data from overriding Date.parse. + Date: false } }, diff --git a/tests/index.html b/tests/index.html index f7ff6521..5209b852 100644 --- a/tests/index.html +++ b/tests/index.html @@ -21,7 +21,7 @@ {{content-for "body"}} {{content-for "test-body"}} - +