maint: move to pingo

Fixes #88

.travis.yml

@@ -3,11 +3,17 @@ branches:
   only:
     - master
 node_js:
-  - '6'
+  - "9"
-sudo: false
+sudo: required
+dist: trusty
+addons:
+  chrome: stable
 cache:
   directories:
   - "$HOME/.npm"
+env:
+  global:
+    - JOBS=1
 before_install:
   - npm config set spin false
   - npm install -g phantomjs-prebuilt

README.md

@@ -10,7 +10,7 @@ You will need the following things properly installed on your computer.
 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/) (with NPM)
 * [Ember CLI](https://ember-cli.com/)
-* [PhantomJS](http://phantomjs.org/)
+* [Google Chrome](https://google.com/chrome/)
 
 ## Installation
 

app/app.js

@@ -1,11 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
+const App = Application.extend({
-
-App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/authenticators/application.js

@@ -1,9 +1,11 @@
-import Ember from 'ember';
+import { Promise } from 'rsvp';
+import $ from 'jquery';
+import { get } from '@ember/object';
+import { isEmpty } from '@ember/utils';
+import { run } from '@ember/runloop';
 import BaseAuthenticator from 'ember-simple-auth/authenticators/base';
 import config from '../config/environment';
 
-const { RSVP: { Promise }, $, get, isEmpty, run } = Ember;
-
 export default BaseAuthenticator.extend({
   serverTokenEndpoint: `${config.APP.API_HOST}/api/auth/login/`,
   tokenAttributeName: 'data.attributes.auth-token',

app/authorizers/application.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { isEmpty } from '@ember/utils';
+import { get } from '@ember/object';
 import BaseAuthorizer from 'ember-simple-auth/authorizers/base';
 
-const { isEmpty, get } = Ember;
-
 export default BaseAuthorizer.extend({
   authorize(data, block) {
     const accessToken = get(data, 'data.attributes.auth-token');

app/components/action-button.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({
   tagName: 'a',

app/components/admin-section-list.js

@@ -1,5 +1,3 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({});

app/components/ccdb-filter.js

@@ -1,5 +1,3 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({ });

app/components/ccdb-pagination.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
+import { alias } from '@ember/object/computed';
-const { Component, computed: { alias }, computed } = Ember;
+import { computed } from '@ember/object';
 
 export default Component.extend({
   // ARGS
@@ -8,7 +8,7 @@ export default Component.extend({
 
   // COMPUTED
   meta: alias('model.meta'),
-  links: alias('model.links'),
+  links: alias('meta.links'),
 
   currentPage: alias('meta.pagination.page'),
   totalRecords: alias('meta.pagination.count'),

app/components/ccdb-table.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import Table from 'ember-light-table';
 
-const { Component } = Ember;
-
 export default Component.extend({
   // ARGS
   model: null,

app/components/collection/create-container.js

@@ -1,8 +1,11 @@
-import Ember from 'ember';
+import { getProperties, set } from '@ember/object';
+import Component from '@ember/component';
+import { inject as service } from '@ember/service';
+import { debounce } from '@ember/runloop';
+import RSVP from 'rsvp';
 import Changeset from 'ember-changeset';
 import lookupValidator from 'ember-changeset-validations';
-
+import config from 'ccdb-web/config/environment';
-const { Component, inject: { service } } = Ember;
 
 export default Component.extend({
   store: service(),
@@ -11,81 +14,80 @@ export default Component.extend({
     this._super(...arguments);
     const model = this.get('model');
     const validations = this.get('validations');
+    const hasMany = this.get('hasMany');
 
     let changesets = {};
     changesets['new'] = [];
     changesets['delete'] = [];
-    changesets['hasMany'] = [];
+    changesets['hasMany'] = {};
     changesets['model'] = new Changeset(model,
                                         lookupValidator(validations['collection']),
                                         validations['collection']);
 
-    let collectionSpeciesChangesets = [];
+    hasMany.forEach((hasMany) => {
-    const collectionSpecies = model.get('collectionSpecies');
+      let relatedChangesets = [];
-    collectionSpecies.forEach((cs) => {
+      let validation = validations[hasMany];
-      const changeset = new Changeset(cs,
+      const related = model.get(hasMany);
-                                      lookupValidator(validations['collectionSpecies']),
+      related.forEach((r) => {
-                                      validations['collectionSpecies']);
+        const changeset = new Changeset(r, lookupValidator(validation),
-      collectionSpeciesChangesets.push({ model: cs, changeset: changeset });
+                                        validation);
+        relatedChangesets.push({ model: r, changeset: changeset });
+      });
+      changesets['hasMany'][hasMany] = relatedChangesets;
     });
-    changesets['hasMany']['collectionSpecies'] = collectionSpeciesChangesets;
-
-    let datasheetsChangesets = [];
-    const datasheets = model.get('datasheets');
-    datasheets.forEach((d) => {
-      const changeset = new Changeset(d,
-                                      lookupValidator(validations['datasheet']),
-                                      validations['datasheet']);
-      datasheetsChangesets.push({ model: d, changeset: changeset });
-    });
-    changesets['hasMany']['datasheets'] = datasheetsChangesets;
 
     this.set('changesets', changesets);
+    this.set('newStudyLocationAdmin', `${config.APP.API_HOST}/admin/locations/studylocation/add/`);
   },
 
   actions: {
-    addCollectionSpecies() {
+    addHasMany(modelName, relatedName) {
       const store = this.get('store');
       let changesets = this.get('changesets');
       const validations = this.get('validations');
-      const collection = this.get('model');
+      const validation = validations[relatedName];
-      const cs = store.createRecord('collection-species', { collection: collection });
+      const model = this.get('model');
-      collection.get('collectionSpecies').pushObject(cs);
+      const related = store.createRecord(modelName, { collection: model });
-      changesets['new'].pushObject(cs);
+      model.get(relatedName).pushObject(related);
-      const changeset = new Changeset(cs,
+      changesets['new'].pushObject(related);
-                                      lookupValidator(validations['collectionSpecies']),
+      const changeset = new Changeset(related, lookupValidator(validation), validation);
-                                      validations['collectionSpecies']);
+      changesets['hasMany'][relatedName].pushObject({ model: related, changeset: changeset });
-      changesets['hasMany']['collectionSpecies'].pushObject({ model: cs, changeset: changeset });
     },
 
-    deleteCollectionSpecies(changesetRecord) {
+    deleteHasMany(changesetRecord, relatedName) {
       let changesets = this.get('changesets');
       changesets['delete'].pushObject(changesetRecord.model);
-      changesets['hasMany']['collectionSpecies'].removeObject(changesetRecord);
+      changesets['hasMany'][relatedName].removeObject(changesetRecord);
+    },
+
+    // Gross, this side-effects by saving immediately. Someday I should clean
+    // this up, but for now, you have been warned.
+    addOption(relatedModelName, optionName, collectionAttrName, relatedAttrName, term) {
+      const props = getProperties(this, 'store', 'options', 'changesets');
+      const { store, options, changesets: { model } } = props;
+      let payload = {};
+      payload[relatedAttrName] = term;
+      const record = store.createRecord(relatedModelName, payload)
+      record.save().then((record) => {
+        set(options, optionName, store.peekAll(relatedModelName));
+        set(model, collectionAttrName, record);
+      });
     },
 
     updateDatasheet(changeset, event) {
       changeset.set('datasheet', event.target.files[0]);
     },
 
-    addDatasheet() {
+    searchStudyLocation(term) {
-      const store = this.get('store');
+      return new RSVP.Promise((resolve, reject) => {
-      let changesets = this.get('changesets');
+        debounce(this, this._performSearch, 'study-location', { page_size: 500, code: term }, resolve, reject, 400);
-      const validations = this.get('validations');
+      });
-      const collection = this.get('model');
-      const d = store.createRecord('datasheet-attachment', { collection: collection });
-      collection.get('datasheets').pushObject(d);
-      changesets['new'].pushObject(d);
-      const changeset = new Changeset(d,
-                                      lookupValidator(validations['datasheets']),
-                                      validations['datasheets']);
-      changesets['hasMany']['datasheets'].pushObject({ model: d, changeset: changeset });
-    },
-
-    deleteDatasheet(changesetRecord) {
-      let changesets = this.get('changesets');
-      changesets['delete'].pushObject(changesetRecord.model);
-      changesets['hasMany']['datasheets'].removeObject(changesetRecord);
     },
   },
+
+  _performSearch(model, payload, resolve, reject) {
+    this.get('store').query(model, payload).then((results) => {
+      resolve(results);
+    }, reject);
+  },
 });

app/components/collection/detail-container.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({
   // ARGS
@@ -24,6 +22,13 @@ export default Component.extend({
     { label: 'Species', valuePath: 'species.commonName' },
     { label: 'Count', valuePath: 'count' },
     { label: 'Count Estimated?', valuePath: 'countEstimated' },
-    { label: 'Sex', valuePath: 'sex' },
+    { label: 'Sex', valuePath: 'sex.name' },
+  ],
+
+  envMeasColumns: [
+    { label: 'Date Measured', valuePath: 'dateMeasured', },
+    { label: 'Time Measured', valuePath: 'timeMeasured', },
+    { label: 'Water Temp (deg C)', valuePath: 'waterTempC', },
+    { label: 'Air Temp (deg C)', valuePath: 'airTempC', },
   ],
 });

app/components/collection/list-container.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({
   // ARGS

app/components/confirm-button.js

@@ -0,0 +1,23 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: 'span',
+  showConfirm: false,
+  initialLabel: 'LABEL',
+  confirmLabel: 'CONFIRM LABEL',
+  cancelLabel: 'Cancel',
+
+  actions: {
+    initial() {
+      this.set('showConfirm', true);
+    },
+
+    cancel() {
+      this.set('showConfirm', false);
+    },
+
+    confirm() {
+      this.get('onClick')();
+    },
+  },
+});

app/components/crud-form.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({
   // ARGS

app/components/form-content.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({
   tagName: 'form',

app/components/loading-spinner.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
-const { Component } = Ember;
 
 export default Component.extend({
   classNames: ['spinner'],

app/components/validated-field.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
-
+import { get, computed } from '@ember/object';
-const { Component, computed, get, isEmpty } = Ember;
+import { isEmpty } from '@ember/utils';
 
 export default Component.extend({
   classNames: ['form-group'],

app/controllers/application.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
-
+import { inject as service } from '@ember/service';
-const { Controller, inject: { service } } = Ember;
 
 export default Controller.extend({
   session: service('session'),

app/controllers/collections/create.js

@@ -1,19 +1,23 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import CollectionValidations from 'ccdb-web/validations/collection';
 import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
+import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
 import DatasheetValidations from 'ccdb-web/validations/datasheet';
 import ValidationMixin from 'ccdb-web/mixins/validation';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(ValidationMixin, {
   CollectionValidations,
   CollectionSpeciesValidations,
   DatasheetValidations,
+  CollectionMeasurementValidations,
+
+  hasMany: ['collectionSpecies', 'datasheets', 'envMeasurements'],
 
   options: computed('projectOptions', 'studyLocationOptions',
                     'collectionTypeOptions', 'collectionMethodOptions',
-                    'speciesOptions', 'adfgPermitOptions', function() {
+                    'speciesOptions', 'adfgPermitOptions', 'sexOptions',
+                    function() {
     return {
       projects: this.get('projectOptions'),
       studyLocations: this.get('studyLocationOptions'),
@@ -21,17 +25,22 @@ export default Controller.extend(ValidationMixin, {
       collectionMethods: this.get('collectionMethodOptions'),
       species: this.get('speciesOptions'),
       adfgPermits: this.get('adfgPermitOptions'),
+      sexes: this.get('sexOptions'),
     };
   }),
 
   actions: {
     onSave(changeset) {
       const postSave = () => { this.transitionToRoute('collections.index'); };
-      return this.validationSave(changeset, postSave);
+      return this.transitionToRoute('loading').then(() => {
+        return this.validationSave(changeset, postSave);
+      });
     },
     onCancel(changeset) {
       const postCancel = () => { this.transitionToRoute('collections.index'); };
-      return this.validationCancel(changeset, postCancel);
+      return this.transitionToRoute('loading').then(() => {
+        return this.validationCancel(changeset, postCancel);
+      });
     },
   },
 });

app/controllers/collections/detail/edit.js

@@ -1,19 +1,23 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
 import CollectionValidations from 'ccdb-web/validations/collection';
 import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
+import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
 import DatasheetValidations from 'ccdb-web/validations/datasheet';
 import ValidationMixin from 'ccdb-web/mixins/validation';
 
-const { Controller, computed } = Ember;
-
 export default Controller.extend(ValidationMixin, {
   CollectionValidations,
   CollectionSpeciesValidations,
   DatasheetValidations,
+  CollectionMeasurementValidations,
+
+  hasMany: ['collectionSpecies', 'datasheets', 'envMeasurements'],
 
   options: computed('projectOptions', 'studyLocationOptions',
                     'collectionTypeOptions', 'collectionMethodOptions',
-                    'speciesOptions', 'adfgPermitOptions', function() {
+                    'speciesOptions', 'adfgPermitOptions', 'sexOptions',
+                    function() {
     return {
       projects: this.get('projectOptions'),
       studyLocations: this.get('studyLocationOptions'),
@@ -21,6 +25,7 @@ export default Controller.extend(ValidationMixin, {
       collectionMethods: this.get('collectionMethodOptions'),
       species: this.get('speciesOptions'),
       adfgPermits: this.get('adfgPermitOptions'),
+      sexes: this.get('sexOptions'),
     };
   }),
 
@@ -30,14 +35,18 @@ export default Controller.extend(ValidationMixin, {
         // Use the model's ID here because of the ArrayProxy in the route
         this.transitionToRoute('collections.detail', this.get('model.id'));
       };
-      return this.validationSave(changesets, postSave);
+      return this.transitionToRoute('loading').then(() => {
+        return this.validationSave(changesets, postSave);
+      });
     },
     onCancel(changesets) {
       const postCancel = () => {
         // Use the model's ID here because of the ArrayProxy in the route
         return this.transitionToRoute('collections.detail', this.get('model.id'));
       };
-      return this.validationCancel(changesets, postCancel);
+      return this.transitionToRoute('loading').then(() => {
+        return this.validationCancel(changesets, postCancel);
+      });
     },
   },
 });

app/controllers/collections/detail/index.js

@@ -1,11 +1,14 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
-
-const { Controller } = Ember;
 
 export default Controller.extend({
   actions: {
     editCollection() {
       this.transitionToRoute('collections.detail.edit', this.get('model'));
     },
+    deleteCollection() {
+      this.get('model')[0].destroyRecord().then(() => {
+        this.transitionToRoute('collections');
+      });
+    },
   },
 });

app/controllers/collections/index.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
-
+import { set, get, computed } from '@ember/object';
-const { Controller, computed, get, set } = Ember;
 
 
 export default Controller.extend({

app/controllers/login.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
-
+import { inject as service } from '@ember/service';
-const { Controller, inject: { service } } = Ember;
 
 export default Controller.extend({
   session: service(),

app/index.html

@@ -17,8 +17,8 @@
   <body>
     {{content-for "body"}}
 
-    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script integrity="" src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/ccdb-web.js"></script>
+    <script integrity="" src="{{rootURL}}assets/ccdb-web.js"></script>
 
     {{content-for "body-footer"}}
   </body>

app/mixins/file-upload.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
-
+import { isArray } from '@ember/array';
-const { Mixin, isArray } = Ember;
 const { keys } = Object;
 
 // Portions borrowed from https://github.com/funtusov/ember-cli-form-data

app/mixins/validation.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
-
+import { get } from '@ember/object';
-const { Mixin, get, RSVP } = Ember;
+import RSVP from 'rsvp';
 const { keys } = Object;
-const { isArray } = Array;
 
 export default Mixin.create({
   validationSave(changesets, postSave) {
@@ -55,9 +54,13 @@ export default Mixin.create({
         for (const model of changesets[key]) {
           model.destroyRecord();
         }
-      } else if (isArray(changesets[key])) {  // hasMany
+      } else if (key === 'hasMany') {
-        for (const { changeset } of changesets[key]) {
+        const hasMany = changesets[key];
-          changeset.rollback();
+        for (const hasManyKey of keys(changesets[key])) {
+          const hasManyChangesets = hasMany[hasManyKey];
+          for (const changeset of hasManyChangesets) {
+            changeset.rollback();
+          }
         }
       } else {  // single
         const changeset = changesets[key];

app/models/collection-measurement.js

@@ -0,0 +1,12 @@
+import DS from 'ember-data';
+
+const { Model, attr, belongsTo } = DS;
+
+export default Model.extend({
+  dateMeasured: attr('ccdb-date'),
+  timeMeasured: attr('string'),
+  waterTempC:   attr('number'),
+  airTempC:     attr('number'),
+
+  collection: belongsTo('collection'),
+});

app/models/collection-species.js

@@ -3,7 +3,7 @@ import DS from 'ember-data';
 const { Model, attr, belongsTo } = DS;
 
 export default Model.extend({
-  sex:            attr('string'),
+  sex:            belongsTo('sex'),
   count:          attr('number'),
   countEstimated: attr('boolean', { defaultValue: false }),
 

app/models/collection.js

@@ -1,16 +1,17 @@
-import Ember from 'ember';
+import { mapBy } from '@ember/object/computed';
+import { computed } from '@ember/object';
 import DS from 'ember-data';
 
-const { computed } = Ember;
 const { Model, attr, belongsTo, hasMany } = DS;
 
 export default Model.extend({
   displayName:         attr('string'),
   numberOfTraps:       attr('number'),
-  collectionStartDate: attr('string-null-to-empty'),
+  collectionStartDate: attr('ccdb-date'),
   collectionStartTime: attr('string-null-to-empty'),
-  collectionEndDate:   attr('string-null-to-empty'),
+  collectionEndDate:   attr('ccdb-date'),
   collectionEndTime:   attr('string-null-to-empty'),
+  notes:               attr('string', { defaultValue: '' }),
 
   project:           belongsTo('project'),
   studyLocation:     belongsTo('study-location'),
@@ -20,13 +21,14 @@ export default Model.extend({
 
   collectionSpecies: hasMany('collection-species'),
   datasheets:        hasMany('datasheet-attachment'),
+  envMeasurements:   hasMany('collection-measurement'),
 
   // computed
-  species: computed.mapBy('collectionSpecies', 'species'),
+  species: mapBy('collectionSpecies', 'species'),
 
-  speciesNames: computed.mapBy('species', 'commonName'),
+  speciesNames: mapBy('species', 'commonName'),
 
-  counts: computed.mapBy('collectionSpecies', 'count'),
+  counts: mapBy('collectionSpecies', 'count'),
 
   speciesAndCounts: computed('speciesNames', 'counts', function() {
     const speciesNames = this.get('speciesNames');

app/models/sex.js

@@ -0,0 +1,8 @@
+import DS from 'ember-data';
+
+const { Model, attr } = DS;
+
+export default Model.extend({
+  name:      attr('string'),
+  sortOrder: attr('number'),
+});

app/router.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 });

app/routes/application.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 
-const { Route } = Ember;
-
 export default Route.extend(ApplicationRouteMixin, {});

app/routes/collections/create.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
-
+import RSVP from 'rsvp';
-const { Route, RSVP } = Ember;
 
 export default Route.extend({
   model() {
@@ -8,11 +7,12 @@ export default Route.extend({
     return RSVP.hash({
       model: store.createRecord('collection'),
       projectOptions: store.findAll('project'),
-      studyLocationOptions: store.findAll('study-location'),
+      studyLocationOptions: store.query('study-location', { page_size: 500 }),
       collectionTypeOptions: store.findAll('collection-type'),
       collectionMethodOptions: store.findAll('collection-method'),
-      speciesOptions: store.findAll('species'),
+      speciesOptions: store.query('species', { page_size: 500 }),
       adfgPermitOptions: store.findAll('adfg-permit'),
+      sexOptions: store.findAll('sex'),
     });
   },
 

app/routes/collections/detail.js

@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
-
+import RSVP from 'rsvp';
-const { Route, RSVP } = Ember;
 
 export default Route.extend({
   model(params) {
     return RSVP.all([
       this.get('store').findRecord('collection', params.collection_id, {
-        include: 'collection-species,datasheets',
+        include: 'collection-species,datasheets,env-measurements',
       })
     ]);
   },

app/routes/collections/detail/edit.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
-
+import RSVP from 'rsvp';
-const { Route, RSVP } = Ember;
 
 export default Route.extend({
   model() {
@@ -9,11 +8,12 @@ export default Route.extend({
     return RSVP.hash({
       model: model,
       projectOptions: store.findAll('project'),
-      studyLocationOptions: store.findAll('study-location'),
+      studyLocationOptions: store.query('study-location', { page_size: 500 }),
       collectionTypeOptions: store.findAll('collection-type'),
       collectionMethodOptions: store.findAll('collection-method'),
-      speciesOptions: store.findAll('species'),
+      speciesOptions: store.query('species', { page_size: 500 }),
       adfgPermitOptions: store.findAll('adfg-permit'),
+      sexOptions: store.findAll('sex'),
     });
   },
 

app/routes/collections/index.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
-
+import RSVP from 'rsvp';
-const { Route, RSVP } = Ember;
 
 export default Route.extend({
   queryParams: {
@@ -30,10 +29,10 @@ export default Route.extend({
       projectOptions: store.findAll('project'),
       regionOptions: store.findAll('region'),
       siteOptions: store.findAll('site'),
-      studyLocationOptions: store.findAll('study-location'),
+      studyLocationOptions: store.query('study-location', { page_size: 500 }),
       collectionMethodOptions: store.findAll('collection-method'),
       adfgPermitOptions: store.findAll('adfg-permit'),
-      speciesOptions: store.findAll('species'),
+      speciesOptions: store.query('species', { page_size: 500 }),
       model: store.query('collection', Object.assign(params, opts)),
     });
   },
@@ -44,27 +43,38 @@ export default Route.extend({
 
     const store = this.get('store');
 
+    /* eslint-disable no-console */
+
     let project = controller.get('project');
+    console.log('project', project);
     project = project.map(id => store.peekRecord('project', id));
 
     let region = controller.get('region');
+    console.log('region', region);
     region = region.map(id => store.peekRecord('region', id));
 
     let site = controller.get('site');
+    console.log('site', site);
     site = site.map(id => store.peekRecord('site', id));
 
     let studyLocation = controller.get('study_location');
+    console.log('studyLocation', studyLocation);
     studyLocation = studyLocation.map(id => store.peekRecord('study-location', id));
 
     let collectionMethod = controller.get('collection_method');
+    console.log('collectionMethod', collectionMethod);
     collectionMethod = collectionMethod.map(id => store.peekRecord('collection-method', id));
 
     let adfgPermit = controller.get('adfg_permit');
+    console.log('adfgPermit', adfgPermit);
     adfgPermit = adfgPermit.map(id => store.peekRecord('adfg-permit', id));
 
     let species = controller.get('species');
+    console.log('species', species);
     species = species.map(id => store.peekRecord('species', id));
 
+    /* eslint-enable no-console */
+
     const numberOfTraps = controller.get('number_of_traps');
     const collectionStartDate = controller.get('collection_start_date');
     const collectionEndDate = controller.get('collection_end_date');

app/routes/index.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-const { Route } = Ember;
-
 export default Route.extend(AuthenticatedRouteMixin, {
   afterModel() {
     this.transitionTo('collections');

app/routes/login.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 
-const { Route } = Ember;
-
 export default Route.extend(UnauthenticatedRouteMixin, {});

app/routes/logout.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
-
+import { inject as service } from '@ember/service';
-const { Route, inject: { service }} = Ember;
 
 export default Route.extend({
   session: service('session'),

app/serializers/application.js

@@ -1,10 +1,16 @@
-import Ember from 'ember';
+import { capitalize } from '@ember/string';
 import DS from 'ember-data';
 
 const { JSONAPISerializer } = DS;
 
 export default JSONAPISerializer.extend({
   payloadTypeFromModelName(modelName) {
-    return modelName.split('-').map(key => Ember.String.capitalize(key)).join('');
+    return modelName.split('-').map(key => capitalize(key)).join('');
-  }
+  },
+
+  normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) {
+    let normalizedDocument = this._super(store, primaryModelClass, payload, id, requestType);
+    normalizedDocument.meta.links = normalizedDocument.links;
+    return normalizedDocument;
+  },
 });

app/templates/collections/create.hbs

@@ -4,8 +4,10 @@
   validations=(hash
     collection=CollectionValidations
     collectionSpecies=CollectionSpeciesValidations
+    envMeasurements=CollectionMeasurementValidations
     datasheet=DatasheetValidations)
   options=options
+  hasMany=hasMany
   onSave=(action 'onSave')
   onCancel=(action 'onCancel')
 }}

app/templates/collections/detail/edit.hbs

@@ -4,8 +4,10 @@
   validations=(hash
     collection=CollectionValidations
     collectionSpecies=CollectionSpeciesValidations
-    datasheet=DatasheetValidations)
+    datasheet=DatasheetValidations
+    envMeasurements=CollectionMeasurementValidations)
   options=options
+  hasMany=hasMany
   onSave=(action 'onSave')
   onCancel=(action 'onCancel')
 }}

app/templates/collections/detail/index.hbs

@@ -2,4 +2,5 @@
   collection/detail-container
   model=model
   editCollection=(action 'editCollection')
+  deleteCollection=(action 'deleteCollection')
 }}

app/templates/components/collection/create-container.hbs

@@ -21,27 +21,33 @@
             {{/validated-field}}
 
             {{#validated-field property='adfgPermit' label='ADFG Permit' changeset=changeset}}
-              {{#power-select
+              {{#power-select-with-create
                 options=options.adfgPermits
                 selected=changeset.adfgPermit
                 onchange=(action (mut changeset.adfgPermit))
+                oncreate=(action 'addOption' 'adfg-permit' 'adfgPermits' 'adfgPermit' 'name')
                 searchField='name'
-                as |adfgPermit|
+                as |adfgPermit term|
               }}
                 {{adfgPermit.name}}
-              {{/power-select}}
+              {{/power-select-with-create}}
             {{/validated-field}}
 
-            {{#validated-field property='studyLocation' label='Study location' changeset=changeset}}
+            {{#validated-field property='studyLocation' changeset=changeset}}
-                {{#power-select
+              <label class="control-label">
-                  options=options.studyLocations
+                Study location
-                  selected=changeset.studyLocation
+                <a href="{{newStudyLocationAdmin}}" target="_blank">+</a>
-                  onchange=(action (mut changeset.studyLocation))
+              </label>
-                  searchField='name'
+              {{#power-select
-                  as |studyLocation|
+                search=(action 'searchStudyLocation')
-                }}
+                options=options.studyLocations
-                  {{studyLocation.name}}
+                selected=changeset.studyLocation
-                {{/power-select}}
+                onchange=(action (mut changeset.studyLocation))
+                searchField='code'
+                as |studyLocation|
+              }}
+                {{studyLocation.code}}
+              {{/power-select}}
             {{/validated-field}}
 
             {{#validated-field property='collectionType' label='Collection type' changeset=changeset}}
@@ -73,114 +79,204 @@
             {{/validated-field}}
 
             {{#validated-field property='collectionStartDate' label='Collection start date' changeset=changeset}}
-              {{input value=changeset.collectionStartDate type='date' class='form-control'}}
+              {{
+                pikaday-input
+                onSelection=(action (mut changeset.collectionStartDate))
+                value=changeset.collectionStartDate
+                useUTC=true
+                placeholder='MM/DD/YYYY'
+                format='MM/DD/YYYY'
+                class='form-control'
+              }}
             {{/validated-field}}
 
             {{#validated-field property='collectionStartTime' label='Collection start time' changeset=changeset}}
-              {{input value=changeset.collectionStartTime type='time' class='form-control'}}
+              {{input value=changeset.collectionStartTime type='time' class='form-control' placeholder='HH:MM:SS (24 hour)'}}
             {{/validated-field}}
 
             {{#validated-field property='collectionEndDate' label='Collection end date' changeset=changeset}}
-              {{input value=changeset.collectionEndDate type='date' class='form-control'}}
+              {{
+                pikaday-input
+                onSelection=(action (mut changeset.collectionEndDate))
+                value=changeset.collectionEndDate
+                useUTC=true
+                placeholder='MM/DD/YYYY'
+                format='MM/DD/YYYY'
+                class='form-control'
+              }}
             {{/validated-field}}
 
             {{#validated-field property='collectionEndTime' label='Collection end time' changeset=changeset}}
-              {{input value=changeset.collectionEndTime type='time' class='form-control'}}
+              {{input value=changeset.collectionEndTime type='time' class='form-control' placeholder='HH:MM:SS (24 hour)'}}
             {{/validated-field}}
           {{/with}}
         {{/f.content}}
       </div>
     </div>
     <div class="col-md-8">
-      <table class="table">
+      <div class="row">
-        <caption>
+        <div class="col-md-12">
-          Species / Count Info
+          {{#validated-field property='notes' label='Notes' changeset=changesets.model}}
-          {{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addCollectionSpecies')}}
+            {{textarea value=changesets.model.notes class='form-control'}}
-        </caption>
+          {{/validated-field}}
-        <thead>
+        </div>
-          <tr>
+      </div>
-            <th class="col-md-3">Species</th>
+      <div class="row">
-            <th class="col-md-3">Count</th>
+        <div class="col-md-12">
-            <th class="col-md-3">Count Estimated</th>
+          <table class="table">
-            <th class="col-md-3">Sex</th>
+            <caption>
-            <th class="col-md-1">Delete</th>
+              Species / Count Info
-          </tr>
+              {{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'collection-species' 'collectionSpecies')}}
-        </thead>
+            </caption>
-        <tbody>
+            <thead>
-          {{#each changesets.hasMany.collectionSpecies as |cs|}}
+              <tr>
-            <tr class="form">
+                <th class="col-md-3">Species</th>
-              <td class="col-md-3">
+                <th class="col-md-3">Count</th>
-                {{#validated-field property='species' changeset=cs.changeset}}
+                <th class="col-md-3">Count Estimated</th>
-                  {{#power-select
+                <th class="col-md-3">Sex</th>
-                    options=options.species
+                <th class="col-md-1">Delete</th>
-                    selected=cs.changeset.species
+              </tr>
-                    onchange=(action (mut cs.changeset.species))
+            </thead>
-                    searchField='commonName'
+            <tbody>
-                    as |species|
+              {{#each changesets.hasMany.collectionSpecies as |cs|}}
-                  }}
+                <tr class="form">
-                    {{species.commonName}}
+                  <td class="col-md-3">
-                  {{/power-select}}
+                    {{#validated-field property='species' changeset=cs.changeset}}
-                {{/validated-field}}
+                      {{#power-select
-              </td>
+                        options=options.species
-              <td class="col-md-3">
+                        selected=cs.changeset.species
-                {{#validated-field property='count' changeset=cs.changeset}}
+                        onchange=(action (mut cs.changeset.species))
-                  {{input value=cs.changeset.count}}
+                        searchField='commonName'
-                {{/validated-field}}
+                        as |species|
-              </td>
+                      }}
-              <td class="col-md-3">
+                        {{species.commonName}}
-                {{#validated-field property='countEstimated' changeset=cs.changeset}}
+                      {{/power-select}}
-                  {{input checked=cs.changeset.countEstimated type='checkbox'}}
+                    {{/validated-field}}
-                {{/validated-field}}
+                  </td>
-              </td>
+                  <td class="col-md-3">
-              <td class="col-md-3">
+                    {{#validated-field property='count' changeset=cs.changeset}}
-                {{#validated-field property='sex' changeset=cs.changeset}}
+                      {{input value=cs.changeset.count}}
-                  {{input value=cs.changeset.sex}}
+                    {{/validated-field}}
-                {{/validated-field}}
+                  </td>
-              </td>
+                  <td class="col-md-3">
-              <td class="col-md-2">
+                    {{#validated-field property='countEstimated' changeset=cs.changeset}}
-                {{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteCollectionSpecies' cs)}}
+                      {{input checked=cs.changeset.countEstimated type='checkbox'}}
-              </td>
+                    {{/validated-field}}
-            </tr>
+                  </td>
-          {{/each}}
+                  <td class="col-md-3">
-        </tbody>
+                    {{#validated-field property='sex' changeset=cs.changeset}}
-      </table>
+                      {{#power-select
-    </div>
+                        options=options.sexes
-  </div>
+                        selected=cs.changeset.sex
-  <div class="row">
+                        onchange=(action (mut cs.changeset.sex))
-    <div class="col-md-12">
+                        searchField='name'
-      <form enctype="multipart/form-data">
+                        as |sex|
-      <table class="table">
+                      }}
-        <caption>
+                        {{sex.name}}
-          Attachments
+                      {{/power-select}}
-          {{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addDatasheet')}}
+                    {{/validated-field}}
-        </caption>
+                  </td>
-        <thead>
+                  <td class="col-md-2">
-          <tr>
+                    {{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' cs 'collectionSpecies')}}
-            <th>File</th>
+                  </td>
-            <th>Delete</th>
+                </tr>
-          </tr>
+              {{/each}}
-        </thead>
+            </tbody>
-        <tbody>
+          </table>
-          {{#each changesets.hasMany.datasheets as |d|}}
+        </div>
-            <tr class="form">
+      </div>
-              <td>
+      <div class="row">
-                {{#if d.model.isNew}}
+        <div class="col-md-12">
-                  {{#validated-field property='datasheet' changeset=d.changeset}}
+          <table class="table">
-                    <input type="file" onchange={{action 'updateDatasheet' d.changeset}} accept="image/png,image/jpeg,application/pdf">
+            <caption>
-                  {{/validated-field}}
+              Environmental Measurements
-                {{else}}
+              {{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'collection-measurement' 'envMeasurements')}}
-                  <a href="{{ d.model.datasheet }}">{{ d.model.datasheet }}</a>
+            </caption>
-                {{/if}}
+            <thead>
-              </td>
+              <tr>
-              <td>
+                <th class="col-md-3">Date Measured</th>
-                {{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteDatasheet' d)}}
+                <th class="col-md-3">Time Measured</th>
-              </td>
+                <th class="col-md-3">Water Temperature (deg C)</th>
-            </tr>
+                <th class="col-md-3">Air Temperature (deg C)</th>
-          {{/each}}
+                <th class="col-md-1">Delete</th>
-        </tbody>
+              </tr>
-      </table>
+            </thead>
-      </form>
+            <tbody>
-
+              {{#each changesets.hasMany.envMeasurements as |cm|}}
+                <tr class="form">
+                  <td class="col-md-3">
+                    {{#validated-field property='dateMeasured' changeset=cm.changeset}}
+                      {{
+                        pikaday-input
+                        onSelection=(action (mut cm.changeset.dateMeasured))
+                        value=cm.changeset.dateMeasured
+                        useUTC=true
+                        placeholder='MM/DD/YYYY'
+                        format='MM/DD/YYYY'
+                        class='form-control'
+                      }}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-3">
+                    {{#validated-field property='timeMeasured' changeset=cm.changeset}}
+                      {{input value=cm.changeset.timeMeasured type='time' class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-3">
+                    {{#validated-field property='waterTempC' changeset=cm.changeset}}
+                      {{input value=cm.changeset.waterTempC class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-3">
+                    {{#validated-field property='airTempC' changeset=cm.changeset}}
+                      {{input value=cm.changeset.airTempC class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-2">
+                    {{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' cm 'envMeasurements')}}
+                  </td>
+                </tr>
+              {{/each}}
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <form enctype="multipart/form-data">
+            <table class="table">
+              <caption>
+                Attachments
+                {{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'datasheet-attachment' 'datasheets')}}
+              </caption>
+              <thead>
+                <tr>
+                  <th>File</th>
+                  <th>Delete</th>
+                </tr>
+              </thead>
+              <tbody>
+                {{#each changesets.hasMany.datasheets as |d|}}
+                  <tr class="form">
+                    <td>
+                      {{#if d.model.isNew}}
+                        {{#validated-field property='datasheet' changeset=d.changeset}}
+                          <input type="file" onchange={{action 'updateDatasheet' d.changeset}} accept="image/png,image/jpeg,application/pdf">
+                        {{/validated-field}}
+                      {{else}}
+                        <a href="{{ d.model.datasheet }}">{{ d.model.datasheet }}</a>
+                      {{/if}}
+                    </td>
+                    <td>
+                      {{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' d 'datasheets')}}
+                    </td>
+                  </tr>
+                {{/each}}
+              </tbody>
+            </table>
+          </form>
+        </div>
+      </div>
     </div>
   </div>
   {{f.save}} {{f.cancel}}

app/templates/components/collection/detail-container.hbs

@@ -5,6 +5,13 @@
   onClick=(action editCollection)
 }}
 
+{{
+  confirm-button
+  initialLabel='Delete Collection'
+  confirmLabel='Yes, Delete Collection'
+  onClick=(action deleteCollection)
+}}
+
 <h3>Main Detail</h3>
 <div class="row">
   <div class="col-md-12">
@@ -33,14 +40,24 @@
 
 <hr>
 
+<h3>Environmental Measurements</h3>
+<div class="row">
+  <div class="col-md-12">
+    {{#ccdb-table model=model.[0].envMeasurements columns=envMeasColumns as |c|}}
+      {{#c.grid as |g|}}
+        {{g.head}}
+        {{g.body}}
+      {{/c.grid}}
+    {{/ccdb-table}}
+  </div>
+</div>
+
+<hr>
+
 <h3>Notes</h3>
 <div class="row">
   <div class="col-md-12">
-    <ul>
+    {{model.[0].notes}}
-      <li>PLACEHOLDER</li>
-      <li>PLACEHOLDER</li>
-      <li>PLACEHOLDER</li>
-    </ul>
   </div>
 </div>
 

app/templates/components/collection/list-container.hbs

@@ -102,7 +102,8 @@
           onSelection=(action (mut filters.collection_start_date))
           value=filters.collection_start_date
           useUTC=true
-          format='YYYY-MM-DD'
+          placeholder='MM/DD/YYYY'
+          format='MM/DD/YYYY'
           class='form-control'
         }}
       </div>
@@ -113,7 +114,8 @@
           onSelection=(action (mut filters.collection_end_date))
           value=filters.collection_end_date
           useUTC=true
-          format='YYYY-MM-DD'
+          placeholder='MM/DD/YYYY'
+          format='MM/DD/YYYY'
           class='form-control'
         }}
       </div>

app/templates/components/confirm-button.hbs

@@ -0,0 +1,6 @@
+{{#if showConfirm}}
+  {{action-button isDanger=true label=cancelLabel onClick=(action 'cancel')}}
+  {{action-button isSuccess=true label=confirmLabel onClick=(action 'confirm')}}
+{{else}}
+  {{action-button isDanger=true label=initialLabel onClick=(action 'initial')}}
+{{/if}}

app/transforms/ccdb-date.js

@@ -0,0 +1,19 @@
+import DS from 'ember-data';
+
+export default DS.Transform.extend({
+  deserialize(serialized) {
+    return serialized || '';
+  },
+
+  serialize(date) {
+    if (date !== '') {
+      date = new Date(date);
+      const day = date.getUTCDate();
+      const month = date.getUTCMonth() + 1;
+      const year = date.getUTCFullYear();
+      return `${year}-${month}-${day}`;
+    } else {
+      return null;
+    }
+  }
+});

app/validations/collection-measurement.js

@@ -0,0 +1,12 @@
+import {
+  validatePresence,
+  validateNumber,
+} from 'ember-changeset-validations/validators';
+
+export default {
+  dateMeasured: validatePresence(true),
+  timeMeasured: validatePresence(true),
+  waterTempC:   validateNumber({ allowBlank: true, integer: false, positive: false }),
+  airTempC:     validateNumber({ allowBlank: true, integer: false, positive: false }),
+  collection:   validatePresence(true),
+}

config/environment.js

@@ -20,12 +20,23 @@ module.exports = function(environment) {
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
+    },
+
+    sentry: {
+      dsn: 'https://fd3c695fa9394de48a7c69b7a322960b@sentry.io/1186914',
+      globalErrorCatching: false,
+    },
+
+    contentSecurityPolicy: {
+      'script-src': "'self' 'unsafe-inline' 'unsafe-eval'",
+      'img-src': 'data: app.getsentry.com',
     }
   };
 
   if (environment === 'development') {
     ENV.APP.API_HOST = 'http://localhost:8000';
     ENV.APP.API_NAMESPACE = 'api/v1';
+    ENV.sentry.development = true;
   }
 
   if (environment === 'test') {
@@ -40,7 +51,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-    ENV.APP.API_HOST = 'https://obscure-caverns-99102.herokuapp.com';
+    ENV.APP.API_HOST = 'https://ccdb-api.thermokar.st';
     ENV.APP.API_NAMESPACE = 'api/v1';
   }
 

package.json

@@ -17,25 +17,26 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^3.0.0",
-    "ember-changeset": "1.3.0",
+    "ember-changeset": "^1.3.0",
-    "ember-changeset-validations": "1.2.8",
+    "ember-changeset-validations": "^1.2.8",
-    "ember-cli": "~2.14.0",
+    "ember-cli": "^3.24.0",
     "ember-cli-app-version": "^3.0.0",
-    "ember-cli-babel": "^6.3.0",
+    "ember-cli-babel": "^6.6.0",
     "ember-cli-code-coverage": "^0.4.1",
-    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-dependency-checker": "^2.0.0",
-    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-eslint": "^4.0.0",
-    "ember-cli-flash": "1.4.3",
+    "ember-cli-flash": "^1.4.3",
     "ember-cli-htmlbars": "^2.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-moment-shim": "^3.5.0",
     "ember-cli-qunit": "^4.0.0",
+    "ember-cli-sentry": "^3.0.0",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
+    "ember-cli-uglify": "^2.0.0",
     "ember-composable-helpers": "^2.0.3",
-    "ember-data": "~2.14.3",
+    "ember-data": "~2.16.2",
     "ember-export-application-global": "^2.0.0",
     "ember-inflector": "^2.0.1",
     "ember-light-table": "^1.10.0",
@@ -43,16 +44,19 @@
     "ember-moment": "7.3.1",
     "ember-pikaday": "^2.2.3",
     "ember-power-select": "^1.8.5",
-    "ember-power-select-with-create": "0.4.3",
+    "ember-power-select-with-create": "^0.4.3",
     "ember-resolver": "^4.0.0",
     "ember-responsive": "^2.0.4",
     "ember-simple-auth": "1.4.0",
     "ember-sinon": "^1.0.0",
-    "ember-source": "~2.14.0",
+    "ember-source": "~2.16.0",
     "loader.js": "^4.2.3"
   },
   "engines": {
     "node": "^4.5 || 6.* || >= 7.*"
   },
-  "private": true
+  "private": true,
+  "dependencies": {
+    "npm": "^5.7.1"
+  }
 }

testem.js

@@ -3,10 +3,20 @@ module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
   launch_in_ci: [
-    'PhantomJS'
+    'Chrome'
   ],
   launch_in_dev: [
-    'PhantomJS',
     'Chrome'
-  ]
+  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=9222',
+        '--window-size=1440,900'
+      ]
+    },
+  }
 };

tests/helpers/destroy-app.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
-  Ember.run(application, 'destroy');
+  run(application, 'destroy');
 }

tests/helpers/flash-message.js

@@ -1,6 +1,3 @@
-import Ember from 'ember';
 import FlashObject from 'ember-cli-flash/flash/object';
 
-const { K } = Ember;
+FlashObject.reopen({ init() {} });
-
-FlashObject.reopen({ init: K });

tests/helpers/module-for-acceptance.js

@@ -1,10 +1,8 @@
 import { module } from 'qunit';
-import Ember from 'ember';
+import { resolve } from 'rsvp';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { resolve } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {

tests/helpers/responsive.js

@@ -1,17 +1,16 @@
-import Ember from 'ember';
+import { registerAsyncHelper } from '@ember/test';
+import { A } from '@ember/array';
+import { computed } from '@ember/object';
+import { classify } from '@ember/string';
+import { getOwner } from '@ember/application';
 import MediaService from 'ember-responsive/media';
 
-const {
-  getOwner
-} = Ember;
-const { classify } = Ember.String;
-
 MediaService.reopen({
   // Change this if you want a different default breakpoint in tests.
   _defaultBreakpoint: 'desktop',
 
-  _breakpointArr: Ember.computed('breakpoints', function() {
+  _breakpointArr: computed('breakpoints', function() {
-    return Object.keys(this.get('breakpoints')) || Ember.A([]);
+    return Object.keys(this.get('breakpoints')) || A([]);
   }),
 
   _forceSetBreakpoint(breakpoint) {
@@ -45,7 +44,7 @@ MediaService.reopen({
   }
 });
 
-export default Ember.Test.registerAsyncHelper('setBreakpoint', function(app, breakpoint) {
+export default registerAsyncHelper('setBreakpoint', function(app, breakpoint) {
   // this should use getOwner once that's supported
   const mediaService = app.__deprecatedInstance__.lookup('service:media');
   mediaService._forceSetBreakpoint(breakpoint);

tests/helpers/start-app.js

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

tests/unit/authenticators/application-test.js

@@ -1,6 +1,6 @@
+import $ from 'jquery';
 import { moduleFor, test } from 'ember-qunit';
 import sinon from 'sinon';
-import Ember from 'ember';
 
 moduleFor('authenticator:application', 'Unit | application', {
   unit: true,
@@ -35,28 +35,28 @@ test('`invalidate` should invalidate the session', function(assert) {
 
 test('`makeRequest` should make a request', function(assert) {
   assert.expect(2);
-  const stub = sinon.stub(Ember.$, 'ajax');
+  const stub = sinon.stub($, 'ajax');
   stub.resolves(42);
   const authenticator = this.subject();
   authenticator.set('serverTokenEndpoint', 'foo')
   const promise = authenticator.makeRequest({bar: 'baz'}).then((d) => {
     assert.equal(d, 42);
   });
-  assert.ok(Ember.$.ajax.calledWithMatch({url: 'foo', data: {bar: 'baz'}}));
+  assert.ok($.ajax.calledWithMatch({url: 'foo', data: {bar: 'baz'}}));
-  Ember.$.ajax.restore();
+  $.ajax.restore();
   return promise;
 });
 
 test('authenticate should craft a nice payload', function(assert) {
   assert.expect(2);
-  const stub = sinon.stub(Ember.$, 'ajax');
+  const stub = sinon.stub($, 'ajax');
   stub.resolves(42);
   const authenticator = this.subject();
   authenticator.set('serverTokenEndpoint', 'foo')
   const promise = authenticator.authenticate('myusername', 'mypassword').then((d) => {
     assert.equal(d, 42);
   });
-  assert.ok(Ember.$.ajax.calledWithMatch({url: 'foo', data: {username: 'myusername', password: 'mypassword'}}));
+  assert.ok($.ajax.calledWithMatch({url: 'foo', data: {username: 'myusername', password: 'mypassword'}}));
-  Ember.$.ajax.restore();
+  $.ajax.restore();
   return promise;
 });