From 139d48091b0ed0070185c5bebbf4202caa20d47f Mon Sep 17 00:00:00 2001 From: Bryan Crotaz Date: Sat, 22 Dec 2018 10:48:32 +0000 Subject: [PATCH 1/2] add ember-cli-release and ember-cli-update --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b1885e2..2f6b034 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,10 @@ "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.1", "ember-cli-qunit": "^1.0.0", - "ember-cli-release": "0.2.3", + "ember-cli-release": "^0.2.3", "ember-cli-sri": "^1.0.3", "ember-cli-uglify": "^1.2.0", + "ember-cli-update": "^0.27.3", "ember-data": "1.13.8", "ember-disable-prototype-extensions": "^1.0.0", "ember-disable-proxy-controllers": "^1.0.0", From 6d1d6cafd69c719f1001a307e6eaef41baeaa322 Mon Sep 17 00:00:00 2001 From: Bryan Crotaz Date: Sat, 22 Dec 2018 10:52:15 +0000 Subject: [PATCH 2/2] ember-cli 3.6.0 --- .bowerrc | 4 - .editorconfig | 14 --- .eslintignore | 20 ++++ .eslintrc.js | 52 ++++++++++ .gitignore | 22 +++-- .jshintrc | 32 ------- .npmignore | 43 ++++++--- .template-lintrc.js | 5 + .travis.yml | 60 ++++++++---- .watchmanconfig | 2 +- CONTRIBUTING.md | 26 +++++ LICENSE.md | 2 +- bower.json | 16 ---- config/ember-try.js | 110 +++++++++++++++------- ember-cli-build.js | 9 +- index.js | 4 +- package.json | 79 +++++++++------- testem.js | 25 +++++ testem.json | 12 --- tests/.jshintrc | 52 ---------- tests/dummy/app/app.js | 14 +-- tests/dummy/app/index.html | 16 ++-- tests/dummy/app/resolver.js | 3 + tests/dummy/app/router.js | 7 +- tests/dummy/app/templates/application.hbs | 2 +- tests/dummy/config/environment.js | 16 ++-- tests/dummy/config/optional-features.json | 3 + tests/dummy/config/targets.js | 18 ++++ tests/dummy/public/crossdomain.xml | 15 --- tests/helpers/.gitkeep | 0 tests/helpers/resolver.js | 11 --- tests/helpers/start-app.js | 18 ---- tests/index.html | 32 +++---- tests/integration/.gitkeep | 0 tests/test-helper.js | 12 ++- 35 files changed, 419 insertions(+), 337 deletions(-) delete mode 100644 .bowerrc create mode 100644 .eslintignore create mode 100644 .eslintrc.js delete mode 100644 .jshintrc create mode 100644 .template-lintrc.js create mode 100644 CONTRIBUTING.md delete mode 100644 bower.json create mode 100644 testem.js delete mode 100644 testem.json delete mode 100644 tests/.jshintrc create mode 100644 tests/dummy/app/resolver.js create mode 100644 tests/dummy/config/optional-features.json create mode 100644 tests/dummy/config/targets.js delete mode 100644 tests/dummy/public/crossdomain.xml create mode 100644 tests/helpers/.gitkeep delete mode 100644 tests/helpers/resolver.js delete mode 100644 tests/helpers/start-app.js create mode 100644 tests/integration/.gitkeep diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 959e169..0000000 --- a/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "bower_components", - "analytics": false -} diff --git a/.editorconfig b/.editorconfig index 47c5438..219985c 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/.eslintignore b/.eslintignore new file mode 100644 index 0000000..72df373 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,20 @@ +# unconventional js +/blueprints/*/files/ +/vendor/ + +# compiled output +/dist/ +/tmp/ + +# dependencies +/bower_components/ +/node_modules/ + +# misc +/coverage/ +!.* + +# ember-try +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..ec0142c --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,52 @@ +module.exports = { + root: true, + parserOptions: { + ecmaVersion: 2017, + sourceType: 'module' + }, + plugins: [ + 'ember' + ], + extends: [ + 'eslint:recommended', + 'plugin:ember/recommended' + ], + env: { + browser: true + }, + rules: { + }, + overrides: [ + // node files + { + files: [ + '.eslintrc.js', + '.template-lintrc.js', + 'ember-cli-build.js', + 'index.js', + 'testem.js', + 'blueprints/*/index.js', + 'config/**/*.js', + 'tests/dummy/config/**/*.js' + ], + excludedFiles: [ + 'addon/**', + 'addon-test-support/**', + 'app/**', + 'tests/dummy/app/**' + ], + parserOptions: { + sourceType: 'script', + ecmaVersion: 2015 + }, + env: { + browser: false, + node: true + }, + plugins: ['node'], + rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { + // add your custom rules and overrides for node files here + }) + } + ] +}; diff --git a/.gitignore b/.gitignore index 86fceae..29c9bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,23 @@ -# 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 -/tmp +/dist/ +/tmp/ # dependencies -/node_modules -/bower_components +/bower_components/ +/node_modules/ # misc /.sass-cache /connect.lock -/coverage/* +/coverage/ /libpeerconnection.log -npm-debug.log -testem.log +/npm-debug.log* +/testem.log +/yarn-error.log + +# ember-try +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 08096ef..0000000 --- a/.jshintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "predef": [ - "document", - "window", - "-Promise" - ], - "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/.npmignore b/.npmignore index d522ca2..82ca2cb 100644 --- a/.npmignore +++ b/.npmignore @@ -1,15 +1,30 @@ -bower_components/ -tests/ -tmp/ -dist/ +# compiled output +/dist/ +/tmp/ -.bowerrc -.editorconfig -.ember-cli -.travis.yml -.npmignore -**/.gitkeep -bower.json -ember-cli-build.js -Brocfile.js -testem.json +# dependencies +/bower_components/ + +# misc +/.bowerrc +/.editorconfig +/.ember-cli +/.eslintignore +/.eslintrc.js +/.gitignore +/.template-lintrc.js +/.travis.yml +/.watchmanconfig +/bower.json +/config/ember-try.js +/CONTRIBUTING.md +/ember-cli-build.js +/testem.js +/tests/ +/yarn.lock +.gitkeep + +# ember-try +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/.template-lintrc.js b/.template-lintrc.js new file mode 100644 index 0000000..b45e96f --- /dev/null +++ b/.template-lintrc.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = { + extends: 'recommended' +}; diff --git a/.travis.yml b/.travis.yml index 8197d31..0ceeee4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,60 @@ --- language: node_js node_js: - - "0.12" + # we recommend testing addons with the same minimum supported node version as Ember CLI + # so that your addon works for all apps + - "6" sudo: false +dist: trusty + +addons: + chrome: stable cache: directories: - - node_modules + - $HOME/.npm env: - - EMBER_TRY_SCENARIO=default - - EMBER_TRY_SCENARIO=ember-release - - EMBER_TRY_SCENARIO=ember-beta - - EMBER_TRY_SCENARIO=ember-canary + global: + # See https://git.io/vdao3 for details. + - JOBS=1 + +branches: + only: + - master + # npm version tags + - /^v\d+\.\d+\.\d+/ -matrix: - fast_finish: true +jobs: + fail_fast: 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" + include: + # runs linting and tests with current locked deps + + - stage: "Tests" + name: "Tests" + script: + - npm run lint:hbs + - npm run lint:js + - npm test -install: - - npm install -g bower - - npm install - - bower install + # we recommend new addons test the current and previous LTS + # as well as latest stable release (bonus points to beta/canary) + - stage: "Additional Tests" + env: EMBER_TRY_SCENARIO=ember-lts-2.16 + - env: EMBER_TRY_SCENARIO=ember-lts-2.18 + - env: EMBER_TRY_SCENARIO=ember-release + - env: EMBER_TRY_SCENARIO=ember-beta + - env: EMBER_TRY_SCENARIO=ember-canary + - env: EMBER_TRY_SCENARIO=ember-default-with-jquery + +before_install: + - npm config set spin false + - npm install -g npm@4 + - npm --version script: - - ember try $EMBER_TRY_SCENARIO test + - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO 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/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..4d14b95 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# How To Contribute + +## Installation + +* `git clone ` +* `cd my-addon` +* `npm install` + +## Linting + +* `npm run lint:hbs` +* `npm run lint:js` +* `npm run lint:js -- --fix` + +## Running tests + +* `ember test` – Runs the test suite on the current Ember version +* `ember test --server` – Runs the test suite in "watch mode" +* `ember try:each` – Runs the test suite against multiple Ember versions + +## Running the dummy application + +* `ember serve` +* Visit the dummy application at [http://localhost:4200](http://localhost:4200). + +For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/). \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index 00e9fbb..198f6da 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 +Copyright (c) 2018 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 deleted file mode 100644 index 0fde474..0000000 --- a/bower.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "ember-cli-deploy-git-tag", - "dependencies": { - "ember": "1.13.7", - "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.13.8", - "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5", - "ember-qunit": "0.4.9", - "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.18.0" - } -} \ No newline at end of file diff --git a/config/ember-try.js b/config/ember-try.js index 83dab0f..a18fc96 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,35 +1,77 @@ -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' - } - } - ] +'use strict'; + +const getChannelURL = require('ember-source-channel-url'); + +module.exports = function() { + return Promise.all([ + getChannelURL('release'), + getChannelURL('beta'), + getChannelURL('canary') + ]).then((urls) => { + return { + scenarios: [ + { + name: 'ember-lts-2.16', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.16.0' + } + } + }, + { + name: 'ember-lts-2.18', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.18.0' + } + } + }, + { + name: 'ember-release', + npm: { + devDependencies: { + 'ember-source': urls[0] + } + } + }, + { + name: 'ember-beta', + npm: { + devDependencies: { + 'ember-source': urls[1] + } + } + }, + { + name: 'ember-canary', + npm: { + devDependencies: { + 'ember-source': urls[2] + } + } + }, + { + name: 'ember-default-with-jquery', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ + 'jquery-integration': true + }) + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1' + } + } + } + ] + }; + }); }; diff --git a/ember-cli-build.js b/ember-cli-build.js index d37d64c..dc5a39e 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,13 +1,14 @@ -/* global require, module */ -var EmberApp = require('ember-cli/lib/broccoli/ember-addon'); +'use strict'; + +const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { - var app = new EmberApp(defaults, { + let app = new EmberAddon(defaults, { // Add options here }); /* - This build file specifes the options for the dummy test app of this + This build file specifies the options for the dummy test app of this addon, located in `/tests/dummy` This build file does *not* influence how the addon or the app using it behave. You most likely want to be modifying `./index.js` or app's build file diff --git a/index.js b/index.js index 62f81a8..1730882 100644 --- a/index.js +++ b/index.js @@ -2,8 +2,10 @@ var RSVP = require('rsvp'); var gitty = require("gitty"); var DeployPluginBase = require('ember-cli-deploy-plugin'); +'use strict'; + module.exports = { - name: 'ember-cli-deploy-git-tag', + name: require('./package').name, createDeployPlugin: function(options) { var DeployPlugin = DeployPluginBase.extend({ diff --git a/package.json b/package.json index 2f6b034..045c788 100644 --- a/package.json +++ b/package.json @@ -2,55 +2,64 @@ "name": "ember-cli-deploy-git-tag", "version": "0.2.1", "description": "Tag Ember releases in git", + "keywords": [ + "ember-addon", + "ember-cli-deploy-plugin" + ], + "repository": "https://github.com/minutebase/ember-cli-deploy-git-tag", + "license": "MIT", + "author": "richard@minutebase.com", "directories": { "doc": "doc", "test": "tests" }, "scripts": { "build": "ember build", - "start": "ember server", - "test": "node tests/runner.js" + "lint:hbs": "ember-template-lint .", + "lint:js": "eslint .", + "start": "ember serve", + "test": "ember test", + "test:all": "ember try:each" }, - "repository": "https://github.com/minutebase/ember-cli-deploy-git-tag", - "engines": { - "node": ">= 0.10.0" + "dependencies": { + "ember-cli-babel": "^7.1.2", + "ember-cli-deploy-plugin": "0.2.0", + "gitty": "^3.2.3", + "rsvp": "^3.5.0" }, - "author": "richard@minutebase.com", - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.1.2", + "@ember/optional-features": "^0.6.3", + "broccoli-asset-rev": "^2.7.0", "chai": "^3.3.0", "chai-as-promised": "^5.1.0", - "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", - "ember-cli-htmlbars": "0.7.9", - "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-qunit": "^1.0.0", - "ember-cli-release": "^0.2.3", - "ember-cli-sri": "^1.0.3", - "ember-cli-uglify": "^1.2.0", + "ember-cli": "~3.6.0", + "ember-cli-dependency-checker": "^3.0.0", + "ember-cli-eslint": "^4.2.3", + "ember-cli-htmlbars": "^3.0.0", + "ember-cli-htmlbars-inline-precompile": "^1.0.3", + "ember-cli-inject-live-reload": "^1.8.2", + "ember-cli-sri": "^2.1.1", + "ember-cli-template-lint": "^1.0.0-beta.1", + "ember-cli-uglify": "^2.1.0", "ember-cli-update": "^0.27.3", - "ember-data": "1.13.8", - "ember-disable-prototype-extensions": "^1.0.0", - "ember-disable-proxy-controllers": "^1.0.0", - "ember-export-application-global": "^1.0.3", - "ember-try": "0.0.6", + "ember-disable-prototype-extensions": "^1.1.3", + "ember-export-application-global": "^2.0.0", + "ember-load-initializers": "^1.1.0", + "ember-maybe-import-regenerator": "^0.1.6", + "ember-qunit": "^3.4.1", + "ember-resolver": "^5.0.1", + "ember-source": "~3.6.0", + "ember-source-channel-url": "^1.1.0", + "ember-try": "^1.0.0", + "eslint-plugin-ember": "^5.2.0", + "eslint-plugin-node": "^7.0.1", "glob": "^5.0.15", - "mocha": "^2.3.3" + "loader.js": "^4.7.0", + "mocha": "^2.3.3", + "qunit-dom": "^0.8.0" }, - "keywords": [ - "ember-addon", - "ember-cli-deploy-plugin" - ], - "dependencies": { - "ember-cli-babel": "^5.1.3", - "ember-cli-deploy-plugin": "0.2.0", - "gitty": "^3.2.3", - "rsvp": "^3.5.0" + "engines": { + "node": "6.* || 8.* || >= 10.*" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/testem.js b/testem.js new file mode 100644 index 0000000..726d187 --- /dev/null +++ b/testem.js @@ -0,0 +1,25 @@ +module.exports = { + test_page: 'tests/index.html?hidepassed', + disable_watching: true, + launch_in_ci: [ + 'Chrome' + ], + launch_in_dev: [ + 'Chrome' + ], + browser_args: { + Chrome: { + ci: [ + // --no-sandbox is needed when running Chrome inside a container + process.env.CI ? '--no-sandbox' : null, + '--headless', + '--disable-gpu', + '--disable-dev-shm-usage', + '--disable-software-rasterizer', + '--mute-audio', + '--remote-debugging-port=0', + '--window-size=1440,900' + ].filter(Boolean) + } + } +}; diff --git a/testem.json b/testem.json deleted file mode 100644 index 0f35392..0000000 --- a/testem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "framework": "qunit", - "test_page": "tests/index.html?hidepassed", - "disable_watching": true, - "launch_in_ci": [ - "PhantomJS" - ], - "launch_in_dev": [ - "PhantomJS", - "Chrome" - ] -} diff --git a/tests/.jshintrc b/tests/.jshintrc deleted file mode 100644 index 6ec0b7c..0000000 --- a/tests/.jshintrc +++ /dev/null @@ -1,52 +0,0 @@ -{ - "predef": [ - "document", - "window", - "location", - "setTimeout", - "$", - "-Promise", - "define", - "console", - "visit", - "exists", - "fillIn", - "click", - "keyEvent", - "triggerEvent", - "find", - "findWithAssert", - "wait", - "DS", - "andThen", - "currentURL", - "currentPath", - "currentRouteName" - ], - "node": false, - "browser": false, - "boss": true, - "curly": true, - "debug": false, - "devel": false, - "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 8d66b95..b3b2bd6 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -1,16 +1,12 @@ -import Ember from 'ember'; -import Resolver from 'ember/resolver'; -import loadInitializers from 'ember/load-initializers'; +import Application from '@ember/application'; +import Resolver from './resolver'; +import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -var App; - -Ember.MODEL_FACTORY_INJECTIONS = true; - -App = Ember.Application.extend({ +const App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, - Resolver: Resolver + Resolver }); loadInitializers(App, config.modulePrefix); diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html index 1c49d36..61400b2 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/dummy/app/router.js b/tests/dummy/app/router.js index cef554b..d0bb009 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -1,8 +1,9 @@ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -var Router = Ember.Router.extend({ - location: config.locationType +const Router = EmberRouter.extend({ + location: config.locationType, + rootURL: config.rootURL }); Router.map(function() { diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index f8bc38e..5230580 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,3 +1,3 @@

Welcome to Ember

-{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index c59bcd5..182d3fc 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -1,15 +1,19 @@ -/* jshint node: true */ +'use strict'; module.exports = function(environment) { - var ENV = { + let ENV = { modulePrefix: 'dummy', - environment: environment, - baseURL: '/', + environment, + 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 } }, @@ -29,7 +33,6 @@ module.exports = function(environment) { if (environment === 'test') { // Testem prefers this... - ENV.baseURL = '/'; ENV.locationType = 'none'; // keep test console output quieter @@ -37,10 +40,11 @@ module.exports = function(environment) { ENV.APP.LOG_VIEW_LOOKUPS = false; ENV.APP.rootElement = '#ember-testing'; + ENV.APP.autoboot = false; } if (environment === 'production') { - + // here you can enable a production-specific feature } return ENV; diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json new file mode 100644 index 0000000..b190262 --- /dev/null +++ b/tests/dummy/config/optional-features.json @@ -0,0 +1,3 @@ +{ + "jquery-integration": false +} diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js new file mode 100644 index 0000000..8ffae36 --- /dev/null +++ b/tests/dummy/config/targets.js @@ -0,0 +1,18 @@ +'use strict'; + +const browsers = [ + 'last 1 Chrome versions', + 'last 1 Firefox versions', + 'last 1 Safari versions' +]; + +const isCI = !!process.env.CI; +const isProduction = process.env.EMBER_ENV === 'production'; + +if (isCI || isProduction) { + browsers.push('ie 11'); +} + +module.exports = { + browsers +}; diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml deleted file mode 100644 index 0c16a7a..0000000 --- a/tests/dummy/public/crossdomain.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js deleted file mode 100644 index 28f4ece..0000000 --- a/tests/helpers/resolver.js +++ /dev/null @@ -1,11 +0,0 @@ -import Resolver from 'ember/resolver'; -import config from '../../config/environment'; - -var resolver = Resolver.create(); - -resolver.namespace = { - modulePrefix: config.modulePrefix, - podModulePrefix: config.podModulePrefix -}; - -export default resolver; diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js deleted file mode 100644 index 0f7aab1..0000000 --- a/tests/helpers/start-app.js +++ /dev/null @@ -1,18 +0,0 @@ -import Ember from 'ember'; -import Application from '../../app'; -import config from '../../config/environment'; - -export default function startApp(attrs) { - var application; - - var attributes = Ember.merge({}, config.APP); - attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; - - Ember.run(function() { - application = Application.create(attributes); - application.setupForTesting(); - application.injectTestHelpers(); - }); - - return application; -} diff --git a/tests/index.html b/tests/index.html index 8fea6fe..5209b85 100644 --- a/tests/index.html +++ b/tests/index.html @@ -7,27 +7,27 @@ - {{content-for 'head'}} - {{content-for 'test-head'}} + {{content-for "head"}} + {{content-for "test-head"}} - - - + + + - {{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"}} diff --git a/tests/integration/.gitkeep b/tests/integration/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/tests/test-helper.js b/tests/test-helper.js index e6cfb70..0382a84 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,6 +1,8 @@ -import resolver from './helpers/resolver'; -import { - setResolver -} from 'ember-qunit'; +import Application from '../app'; +import config from '../config/environment'; +import { setApplication } from '@ember/test-helpers'; +import { start } from 'ember-qunit'; -setResolver(resolver); +setApplication(Application.create(config.APP)); + +start();