Merge branch 'Dhaulagiri-br-updates'

lukemelia · lukemelia · commit a258398027d7 · 2018-03-03T02:03:01.000-05:00
diff --git a/.bowerrc b/.bowerrc
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
diff --git a/.jscsrc b/.jscsrc
diff --git a/.npmignore b/.npmignore
@@ -14,3 +14,8 @@
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
diff --git a/.travis.yml b/.travis.yml
@@ -1,34 +1,33 @@
 ---
 language: node_js
 node_js:
+  # we recommend testing addons with the same minimum supported node version as Ember CLI
+  # so that your addon works for all apps
   - "4"
 
+sudo: false
 dist: trusty
-sudo: required
 
 addons:
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
+  chrome: stable
 
 cache:
   yarn: true
 
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
+matrix:
+  fast_finish: true
+
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add bower
 
 install:
-  - yarn install --no-lockfile --ignore-engines
-  - bower install
+  - yarn install --no-lockfile --ignore-engines --non-interactive
 
 script:
-  # 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
+  - node_modules/.bin/ember try:each --skip-cleanup
diff --git a/addon/components/basic-dialog.js b/addon/components/basic-dialog.js
@@ -1,5 +1,6 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
+import { oneWay } from '@ember/object/computed';
 import { isEmpty } from '@ember/utils';
 import { inject as service } from '@ember/service';
 import layout from '../templates/components/basic-dialog';
@@ -13,7 +14,7 @@ export default Component.extend({
   wrapperClassNames: null,
 
   modalService: service('modal-dialog'),
-  destinationElementId: computed.oneWay('modalService.destinationElementId'),
+  destinationElementId: oneWay('modalService.destinationElementId'),
 
   variantWrapperClass: 'emd-static',
   containerClassNamesString: computed('containerClassNames.[]', 'targetAttachmentClass', 'attachmentClass', 'containerClass', function() {
diff --git a/addon/components/modal-dialog.js b/addon/components/modal-dialog.js
@@ -1,3 +1,4 @@
+import { oneWay, readOnly } from '@ember/object/computed';
 import Component from '@ember/component';
 import { dasherize } from '@ember/string';
 import { computed } from '@ember/object';
@@ -13,7 +14,7 @@ export default Component.extend({
   tagName: '',
   layout,
   modalService: service('modal-dialog'),
-  destinationElementId: computed.oneWay('modalService.destinationElementId'),
+  destinationElementId: oneWay('modalService.destinationElementId'),
   modalDialogComponentName: computed('renderInPlace', 'tetherTarget', 'animatable', 'hasLiquidWormhole', 'hasLiquidTether', function(){
     let tetherTarget = this.get('tetherTarget');
     let hasLiquidTether = this.get('hasLiquidTether');
@@ -33,8 +34,8 @@ export default Component.extend({
     return 'ember-modal-dialog/-basic-dialog';
   }),
   animatable: null,
-  hasLiquidWormhole: computed.readOnly('modalService.hasLiquidWormhole'),
-  hasLiquidTether: computed.readOnly('modalService.hasLiquidTether'),
+  hasLiquidWormhole: readOnly('modalService.hasLiquidWormhole'),
+  hasLiquidTether: readOnly('modalService.hasLiquidTether'),
 
   didReceiveAttrs() {
     this._super(...arguments);
@@ -71,7 +72,7 @@ export default Component.extend({
   clickOutsideToClose: false,
   renderInPlace: false,
   tetherTarget: null,
-  stack: computed.oneWay('elementId'), // pass a `stack` string to set a "stack" to be passed to liquid-wormhole / liquid-tether
+  stack: oneWay('elementId'), // pass a `stack` string to set a "stack" to be passed to liquid-wormhole / liquid-tether
   value: 0, // pass a `value` to set a "value" to be passed to liquid-wormhole / liquid-tether
 
   targetAttachment: 'middle center',
diff --git a/bower.json b/bower.json
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,3 +1,5 @@
+/* eslint-env node */
 module.exports = {
+  useYarn: true,
   useVersionCompatibility: true
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,8 +1,10 @@
 /* eslint-env node */
+'use strict';
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     snippetSearchPaths: ['tests/dummy/app']
   });
 
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   "repository": "https://github.com/yapplabs/ember-modal-dialog",
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
+    "start": "ember serve",
     "deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -",
     "test": "ember try:each"
   },
@@ -27,37 +27,37 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.6.0",
-    "ember-cli": "^2.13.1",
+    "ember-cli": "~2.17.0",
     "ember-cli-build-notifications": "^0.2.0",
     "ember-cli-dependency-checker": "^2.1.0",
-    "ember-cli-eslint": "^3.1.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-github-pages": "^0.1.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.4",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.7.0",
     "ember-cli-lorem-ipsum": "0.0.2",
     "ember-cli-qunit": "^4.3.2",
     "ember-cli-release": "^1.0.0-beta.2",
-    "ember-cli-sass": "^6.2.0",
-    "ember-cli-shims": "^1.1.0",
-    "ember-cli-uglify": "^1.2.0",
+    "ember-cli-sass": "^7.1.2",
+    "ember-cli-shims": "^1.2.0",
+    "ember-cli-uglify": "^2.0.0",
     "ember-code-snippet": "^1.10.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-native-dom-helpers": "^0.4.0",
     "ember-resolver": "^4.1.0",
-    "ember-source": "~2.13.0",
+    "ember-source": "~2.17.0",
     "ember-tether": "^1.0.0-beta.0",
-    "ember-truth-helpers": "^1.3.0",
+    "ember-truth-helpers": "^2.0.0",
     "eslint-plugin-ember": "^4.3.0",
     "liquid-fire": "^0.27.3",
     "liquid-tether": "^2.0.4",
     "liquid-wormhole": "^2.0.5",
     "loader.js": "^4.4.0"
   },
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
diff --git a/testem.js b/testem.js
@@ -1,11 +1,22 @@
 /* eslint-env node */
 module.exports = {
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "Chrome"
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'Chrome'
   ],
-  "launch_in_dev": [
-    "Chrome"
-  ]
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900'
+      ]
+    }
+  }
 };
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -3,9 +3,7 @@ import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-App = Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -1,15 +1,20 @@
 /* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    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
       }
     },
 
@@ -24,10 +29,6 @@ module.exports = function(environment) {
     }
   };
 
-  if (environment === 'production') {
-    ENV.rootURL = '/ember-modal-dialog'; // for gh-pages live demo
-  }
-
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
     // ENV.APP.LOG_ACTIVE_GENERATION = true;
@@ -47,5 +48,9 @@ module.exports = function(environment) {
     ENV.APP.rootElement = '#ember-testing';
   }
 
+  if (environment === 'production') {
+    ENV.rootURL = '/ember-modal-dialog'; // for gh-pages live demo
+  }
+
   return ENV;
 };
diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -1,5 +1,4 @@
 /* eslint-env node */
-
 module.exports = {
   browsers: [
     'ie 9',
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,5 +1,5 @@
-import { Promise } from 'rsvp';
 import { module } from 'qunit';
+import { resolve } from 'rsvp';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
@@ -15,7 +15,7 @@ export default function(name, options = {}) {
 
     afterEach() {
       let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
-      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+      return resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }
diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,21 +1,18 @@
-import { run } from '@ember/runloop';
-import { merge } from '@ember/polyfills';
 import Application from '../../app';
 import config from '../../config/environment';
+import { merge } from '@ember/polyfills';
+import { run } from '@ember/runloop';
 import registerAssertHelpers from './modal-asserts';
 
 export default function startApp(attrs) {
-  let application;
-
   let attributes = merge({}, config.APP);
   attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  run(function() {
-    application = Application.create(attributes);
+  return run(() => {
+    let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
     registerAssertHelpers();
+    return application;
   });
-
-  return application;
 }
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -1,6 +1,7 @@
-import resolver from './helpers/resolver';
-import { setResolver } from '@ember/test-helpers';
-import { start } from 'ember-cli-qunit';
+import Application from '../app';
+import { setApplication } from '@ember/test-helpers';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create({ autoboot: false }));
 
-setResolver(resolver);
 start();
diff --git a/yarn.lock b/yarn.lock
