From e065b9c7e6cdda04bb9c2ceef4cd9a1a6043c080 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Tue, 3 Jan 2017 14:21:58 +0100 Subject: [PATCH] Update "ember-cli" to v2.10.0 (#33) * Update "ember-suave" to v4.0.1 * Update "ember-cli" to v2.6.3 * Update "ember-cli-mocha" to v0.13.1 * Update "ember-cli" to v2.9.1 * Update "ember-cli" to v2.10.0 --- .editorconfig | 14 -------- .gitignore | 4 +-- .jscsrc | 3 +- .jshintrc | 2 +- .travis.yml | 16 +++++---- bower.json | 8 ++--- config/ember-try.js | 26 +++++++++++--- package.json | 54 ++++++++++++++--------------- tests/.jshintrc | 2 +- tests/dummy/app/index.html | 8 ++--- tests/dummy/app/router.js | 3 +- tests/dummy/config/environment.js | 7 ++-- tests/index.html | 18 +++++----- tests/unit/services/cookies-test.js | 8 +++-- 14 files changed, 91 insertions(+), 82 deletions(-) diff --git a/.editorconfig b/.editorconfig index 47c54384..219985c2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,22 +13,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - [*.hbs] insert_final_newline = false -indent_style = space -indent_size = 2 - -[*.css] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index e7f92ad4..22a007a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/ignore-files/ for more about ignoring files. # compiled output /dist @@ -14,6 +14,6 @@ /connect.lock /coverage/* /libpeerconnection.log -npm-debug.log +npm-debug.log* testem.log .DS_Store diff --git a/.jscsrc b/.jscsrc index e24512d0..4927810d 100644 --- a/.jscsrc +++ b/.jscsrc @@ -1,3 +1,4 @@ { - "preset": "ember-suave" + "preset": "ember-suave", + "disallowDirectPropertyAccess": false } diff --git a/.jshintrc b/.jshintrc index 08096eff..d421faa3 100644 --- a/.jshintrc +++ b/.jshintrc @@ -27,6 +27,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/.travis.yml b/.travis.yml index 9a91258d..eacaffea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,14 @@ addons: cache: directories: - - node_modules + - $HOME/.npm + - $HOME/.cache # includes bowers cache env: - - EMBER_TRY_SCENARIO=default + # we recommend testing LTS's and latest stable release (bonus points to beta/canary) - 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 @@ -33,16 +36,17 @@ matrix: before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" - - "npm config set spin false" - - "npm install -g npm@^2" + - npm config set spin false + - npm install -g bower install: - - npm install -g bower - npm install - bower install script: - - ember try $EMBER_TRY_SCENARIO test && npm run nodetest + # 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 notifications: email: false diff --git a/bower.json b/bower.json index 2ec04db0..7671bce7 100644 --- a/bower.json +++ b/bower.json @@ -1,11 +1,7 @@ { "name": "ember-cookies", "dependencies": { - "ember": "~2.4.3", - "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", - "mocha": "~2.2.4", - "chai": "~2.3.0", - "ember-mocha-adapter": "~0.3.1" + "ember": "~2.10.0", + "ember-cli-shims": "0.1.3" } } diff --git a/config/ember-try.js b/config/ember-try.js index 014f603d..d1cc4970 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -2,19 +2,35 @@ module.exports = { scenarios: [ { - name: 'default', + name: 'ember-1.13', bower: { - dependencies: { } + dependencies: { + 'ember': '~1.13.0' + }, + resolutions: { + 'ember': '~1.13.0' + } } }, { - name: 'ember-1.13', + name: 'ember-lts-2.4', bower: { dependencies: { - 'ember': '~1.13.0' + 'ember': 'components/ember#lts-2-4' }, resolutions: { - 'ember': '~1.13.0' + 'ember': 'lts-2-4' + } + } + }, + { + name: 'ember-lts-2.8', + bower: { + dependencies: { + 'ember': 'components/ember#lts-2-8' + }, + resolutions: { + 'ember': 'lts-2-8' } } }, diff --git a/package.json b/package.json index cd0713d4..8d09adaf 100644 --- a/package.json +++ b/package.json @@ -2,61 +2,61 @@ "name": "ember-cookies", "version": "0.0.11", "description": "Cookies abstraction for Ember.js that works both in the browser as well as with Fastboot on the server.", + "keywords": [ + "ember-addon" + ], + "license": "MIT", + "author": "", "directories": { "doc": "doc", "test": "tests" }, + "repository": "https://github.com/simplabs/ember-cookies", "scripts": { "build": "ember build", "start": "ember server", - "test": "ember try:testall", + "test": "ember try:each", "nodetest": "node node-tests/runner.js" }, - "repository": "https://github.com/simplabs/ember-cookies", - "engines": { - "node": ">= 0.10.0" + "dependencies": { + "ember-cli-babel": "^5.1.7", + "ember-getowner-polyfill": "~1.1.1" }, - "author": "", - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.4.2", + "broccoli-asset-rev": "^2.4.5", "chai": "^3.5.0", "chalk": "^1.1.1", - "ember-ajax": "0.7.1", - "ember-cli": "2.4.3", + "ember-ajax": "^2.4.1", + "ember-cli": "2.10.0", "ember-cli-addon-tests": "^0.3.0", - "ember-cli-app-version": "^1.0.0", - "ember-cli-dependency-checker": "^1.2.0", + "ember-cli-app-version": "^2.0.0", + "ember-cli-chai": "^0.3.2", + "ember-cli-dependency-checker": "^1.3.0", "ember-cli-fastboot": "1.0.0-beta.7", - "ember-cli-htmlbars": "^1.0.3", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.4.0", - "ember-cli-mocha": "0.10.1", - "ember-cli-release": "0.2.8", + "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": "^2.0.1", + "ember-cli-mocha": "^0.13.1", + "ember-cli-release": "^0.2.9", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "~2.4.0", + "ember-data": "^2.10.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", - "ember-mocha": "0.8.11", "ember-resolver": "^2.0.3", "ember-sinon": "0.5.0", - "ember-suave": "2.0.1", - "ember-try": "^0.2.2", + "ember-suave": "^4.0.1", "glob": "^7.0.3", - "loader.js": "^4.0.1", + "loader.js": "^4.0.10", "mocha": "^2.4.5", "request": "^2.69.0", "rsvp": "^3.2.1", "symlink-or-copy": "^1.0.1" }, - "keywords": [ - "ember-addon" - ], - "dependencies": { - "ember-cli-babel": "^5.1.6", - "ember-getowner-polyfill": "~1.1.1" + "engines": { + "node": ">= 0.12.0" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/tests/.jshintrc b/tests/.jshintrc index 6ec0b7c1..d2bd1134 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -47,6 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index c9b43270..5120bd73 100644 --- a/tests/dummy/app/index.html +++ b/tests/dummy/app/index.html @@ -9,16 +9,16 @@ {{content-for "head"}} - - + + {{content-for "head-footer"}} {{content-for "body"}} - - + + {{content-for "body-footer"}} diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index 3bba78eb..cdc25787 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -2,7 +2,8 @@ import Ember from 'ember'; import config from './config/environment'; const Router = Ember.Router.extend({ - location: config.locationType + location: config.locationType, + rootURL: config.rootURL }); Router.map(function() { diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 4e9a4910..b213b1fd 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -4,12 +4,16 @@ module.exports = function(environment) { var ENV = { modulePrefix: 'dummy', environment: environment, - baseURL: '/', + rootURL: '/', locationType: 'auto', EmberENV: { 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 } }, @@ -33,7 +37,6 @@ module.exports = function(environment) { if (environment === 'test') { // Testem prefers this... - ENV.baseURL = '/'; ENV.locationType = 'none'; // keep test console output quieter diff --git a/tests/index.html b/tests/index.html index 64cb47e3..6252127b 100644 --- a/tests/index.html +++ b/tests/index.html @@ -10,9 +10,9 @@ {{content-for "head"}} {{content-for "test-head"}} - - - + + + {{content-for "head-footer"}} {{content-for "test-head-footer"}} @@ -21,12 +21,12 @@ {{content-for "body"}} {{content-for "test-body"}} - - - - - - + + + + + + {{content-for "body-footer"}} {{content-for "test-body-footer"}} diff --git a/tests/unit/services/cookies-test.js b/tests/unit/services/cookies-test.js index b5c7dd76..6356e5a1 100644 --- a/tests/unit/services/cookies-test.js +++ b/tests/unit/services/cookies-test.js @@ -1,7 +1,7 @@ /* jshint expr:true */ import { expect } from 'chai'; -import { describeModule, it } from 'ember-mocha'; -import { describe, beforeEach, afterEach } from 'mocha'; +import { describe, it, beforeEach, afterEach } from 'mocha'; +import { setupTest } from 'ember-mocha'; import Ember from 'ember'; const { Object: EmberOject, computed } = Ember; @@ -13,7 +13,9 @@ function randomString() { return Math.random().toString(36).substring(2); } -describeModule('service:cookies', 'CookiesService', {}, function() { +describe('CookiesService', function() { + setupTest('service:cookies'); + function itValidatesWriteOptions() { it('throws when the signed option is set', function() { expect(() => {