Merge 5f80a53 into 9527d44

.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: 'frost-standard'
+}

.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
@@ -13,7 +13,7 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log
 .idea
 coverage.json

.npmignore

@@ -8,10 +8,10 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
-testem.json
+testem.js
 .idea

.travis.yml

@@ -20,9 +20,8 @@ addons:
     - g++-4.8
 env:
   matrix:
-  - EMBER_TRY_SCENARIO=ember-2-8
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
+  - EMBER_TRY_SCENARIO=ember-default
   global:
     - CXX=g++-4.8
     - secure: R/sDLMQAy0D7pHnpnu1PQTU1JHEIYkS64NIg0/NgZxxkHRB/1ftCp3rjFgrwFgve1BfDizKCkEiXMX8X9kwsCf45uK4kUjKjNaQE72pU8Pjbs5MrGvWGWLpnoF/X0nLLclqe+QD4dyTMmkNqbQDY8ypn2zfdX7b+df7LoreOh/xHLZfwk0NcyMN3KQUPvoax5WxDQpDqMH+BxCInlxcbLvsnVuVdaNzH1OzZypXGu2jGjhXwgc49OKfw25ta4KEG5C+YPsxDG9hwCW5L/MXyKxIvBoKzduKOjwGRMiZwHfYoUWmM3GTbJXRGdAMJQh4bd2sxW2x3evg57AK0vr6g2i2BcEwyCotMQooGQfKuQqhv7l8XObdyJMt3b1Wwm4eZy/J+HhkvrV0YCjzAFLoLeoRy6V7ziNNOLrIrtI3OKsrcoD6AqdKQzV6e4TCLOjoMHcGW8ZiCx4SOBHhFMW4gFlihkJDulVdLsv8pCL/rDLLor11mChija9vuYNO7UpMIOrqlGDXhQxhp4M6AdvDXny+muFBSTuff7I1VArEeuLXbsoKzGNMnBVuHkM6CN42GuZ5uRLF/luW48m5F3DugguRWOm5DYTbgWAJ8ozW6raKmJLWVHgmBDRvowgW7Utd61kGt95mNPBNfbvIlhRZcOyU4ZOsZR+qpPEjnqst9qkA=
@@ -63,7 +62,7 @@ deploy:
     secure: Gyp3pPBVZ8RceL1CLtKBu57eyJbFUAYVima2nyYKbyTox/kBUTiVLr7OWEyiVd6iGKSZK9YwmWoFPomZwt4WnwJ4khwRP7o1iBDVPMylEz9gTjuutZ3mTlvItWRowLX7nvy4Zbhi7lAuUidAtrR4ISS3v8y10FuySMjXgZTBI2NyOPIEn2dlSugZ0h/I12Z20Gx0xjGkY0ZA8LRRNupLXFEjtEOcDy9oTyxtzPfAwNgMgUFjdGSuM4oice12QYlq6hL1DbnRhyRY7yHlZVvb3OeBxSLhiGukvYYZKrl5arGTQXgJoyPg0vQca4GgnDxoaN0m0Iy+hEDhjKZu7Zk49bRGLre9VAzLKD8Og8LErv36nns8PLU9Air1MOptyy1ggDFzFGwcVUcq8BSzzANAMFIekq6T9HR6k0pFWjlvcRPBOtKWtwBobFPITKDm5qHVBx1N78pEp3mjo2QySmpvANyGs0YuHQSelwrqJ8lA9HqVwZnPJSKEz4L6VXiLSGZvM2N3DgH6W8mQPXWnbNDD1x5tnbPABDmU5Nprk+QMtN6Y2/B4rwaR/e1KDQYgu3k+Gy4TdRLB2wfgrQRTzhGXGVvbWxytbmGvGWLeILXnb+yvPSyTGX9MVfB9+74dbezd7EXw28TUJV6aUd24b4icnnzxSuaXuJv9BO1nLRoCbzk=
   on:
     all_branches: true
-    condition: "$EMBER_TRY_SCENARIO = 'default'"
+    condition: "$EMBER_TRY_SCENARIO = 'ember-default'"
     node: '6.9.1'
     tags: true
 

.travis/maybe-bump-version.sh

@@ -6,7 +6,7 @@ then
   exit 0
 fi
 
-if [ "$EMBER_TRY_SCENARIO" != "default" ]
+if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
 then
   echo "Skipping version bump for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
   exit 0

.travis/maybe-check-coverage.sh

@@ -6,7 +6,7 @@ then
   exit 0
 fi
 
-if [ "$EMBER_TRY_SCENARIO" != "default" ]
+if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
 then
   echo "Skipping version bump for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
   exit 0

.travis/maybe-publish-coverage.sh

@@ -14,7 +14,7 @@ then
   exit 0
 fi
 
-if [ "$EMBER_TRY_SCENARIO" != "default" ]
+if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
 then
   echo "Skipping coverage publish for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
   exit 0

addon/components/frost-list.js

@@ -129,12 +129,14 @@ export default Component.extend({
 
   // == Lifecycle Hooks =======================================================
 
-  didUpdateAttrs ({newAttrs}) {
-    if (newAttrs.scrollTop) {
+  didUpdateAttrs () {
+    const scrollTop = this.get('scrollTop')
+
+    if (scrollTop) {
       // TODO Push this down into frost-scroll
       const scrollbar = this.$('.frost-scroll')[0]
       if (scrollbar) {
-        scrollbar.scrollTop = newAttrs.scrollTop
+        scrollbar.scrollTop = scrollTop
         window.Ps.update(scrollbar)
       }
     }

config/ember-try.js

@@ -1,30 +1,36 @@
+/* eslint-env node */
+
 module.exports = {
   scenarios: [
     {
-      name: 'default',
-      npm: {
-        devDependencies: {}
-      }
-    },
-    {
-      name: 'ember-2-3',
+      name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          'ember': '~2.3.0'
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
-          'ember': '~2.3.0'
+          'ember': 'lts-2-8'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-2-8',
+      name: 'ember-lts-2.12',
       bower: {
         dependencies: {
-          'ember': '~2.8.0'
+          'ember': 'components/ember#lts-2-12'
         },
         resolutions: {
-          'ember': '~2.8.0'
+          'ember': 'lts-2-12'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
@@ -75,6 +81,12 @@ module.exports = {
           'ember-source': null
         }
       }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
+      }
     }
   ]
 }

config/environment.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 'use strict'
 
 module.exports = function (/* environment, appConfig */) {

ember-cli-build.js

@@ -1,6 +1,5 @@
-/* jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
 
 module.exports = function (defaults) {
   var app = new EmberAddon(defaults, {

index.js

@@ -1,5 +1,4 @@
-/* globals module */
-/* eslint node: 0 */
+/* eslint-env node */
 
 'use strict'
 

package.json

@@ -13,7 +13,7 @@
     "lint": "lint-all-the-things",
     "start": "ember server",
     "test": "npm run lint && npm run test-addon",
-    "test-addon": "EMBER_TRY_SCENARIO=${EMBER_TRY_SCENARIO:=default} && ember try:one $EMBER_TRY_SCENARIO --- COVERAGE=true ember test"
+    "test-addon": "EMBER_TRY_SCENARIO=${EMBER_TRY_SCENARIO:=ember-default} && ember try:one $EMBER_TRY_SCENARIO --- COVERAGE=true ember test"
   },
   "repository": "git@github.com:ciena-frost/ember-frost-list.git",
   "engines": {
@@ -29,43 +29,40 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.2.0",
+    "broccoli-asset-rev": "^2.4.5",
     "chai-jquery": "^2.0.0",
     "ember-async-image": "0.1.1",
-    "ember-cli": "~2.11.0",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.12.3",
     "ember-cli-chai": "0.3.2",
     "ember-cli-code-coverage": "0.3.5",
-    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-htmlbars-inline-precompile": "^0.3.6",
-    "ember-cli-inject-live-reload": "^1.3.1",
+    "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-mocha": "0.13.2",
     "ember-cli-notifications": "^4.0.1",
     "ember-cli-shims": "^1.0.2",
-    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.8.0",
     "ember-computed-decorators": "0.3.0",
     "ember-concurrency": "0.7.19",
     "ember-data": "^2.11.1",
     "ember-data-factory-guy": "git://github.com/juwara0/ember-data-factory-guy#removeOnlyDev",
     "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
     "ember-elsewhere": "0.4.1",
-    "ember-export-application-global": "^1.0.4",
+    "ember-export-application-global": "^1.0.5",
     "ember-frost-test": "1.0.1",
     "ember-get-config": "0.2.1",
     "ember-hook": "1.4.1",
-    "ember-load-initializers": "^0.6.3",
+    "ember-load-initializers": "^0.6.0",
     "ember-prop-types": "^3.10.3",
     "ember-resolver": "^2.0.3",
     "ember-simple-uuid": "0.1.4",
     "ember-sinon": "0.6.0",
-    "ember-source": "~2.11.2",
+    "ember-source": "~2.12.0",
     "ember-spread": "^1.1.2",
-    "ember-test-utils": "^4.0.0",
+    "ember-test-utils": "^5.1.1",
     "ember-truth-helpers": "1.3.0",
-    "loader.js": "^4.0.0",
+    "loader.js": "^4.2.3",
     "pr-bumper": "^1.11.0",
     "pull-report": "^0.3.1",
     "sinon-chai": "^2.8.0"
@@ -75,8 +72,8 @@
     "frost"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.10",
-    "ember-cli-htmlbars": "^1.0.1",
+    "ember-cli-babel": "^5.1.7",
+    "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-sass": "^5.4.0",
     "ember-frost-core": "^1.14.3",
     "ember-frost-sort": "^7.0.0",
@@ -93,4 +90,4 @@
   "pr-bumper": {
     "coverage": 96.15
   }
-}
+}

testem.js

@@ -1,3 +1,5 @@
+/* eslint-env node */
+
 var Reporter = require('ember-test-utils/reporter')
 
 module.exports = {

tests/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    embertest: true
+  }
+}

tests/dummy/config/environment.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 
 module.exports = function (environment) {
   var ENV = {
@@ -11,6 +11,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
       }
     },
 
@@ -37,7 +41,6 @@ module.exports = function (environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.rootURL = '/'
     ENV.locationType = 'none'
 
     // keep test console output quieter

tests/helpers/start-app.js

@@ -5,16 +5,13 @@ import Application from '../../app'
 import config from '../../config/environment'
 
 export default function startApp (attrs) {
-  let application
-
   let attributes = merge({}, config.APP)
   attributes = merge(attributes, attrs) // use defaults, but you can override;
 
-  run(() => {
-    application = Application.create(attributes)
+  return run(() => {
+    let application = Application.create(attributes)
     application.setupForTesting()
     application.injectTestHelpers()
+    return application
   })
-
-  return application
 }

tests/index.html

@@ -21,10 +21,10 @@
 
     {{content-for 'body'}}
     {{content-for 'test-body'}}
+    <script src="/testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/vendor.js"></script>
     <script src="{{rootURL}}assets/test-support.js"></script>
     <script src="{{rootURL}}assets/dummy.js"></script>
-    <script src="{{rootURL}}testem.js" integrity=""></script>
     <script src="{{rootURL}}assets/tests.js"></script>
 
     {{content-for 'body-footer'}}

tests/unit/helpers/is-lead-selection.js

@@ -1,4 +1,5 @@
-/* jshint expr:true */
+/* eslint-env node */
+
 import {expect} from 'chai'
 import {floor} from 'ember-frost-list/helpers/is-lead-selection'
 import {describe, it} from 'mocha'