Refactor species edit

app/mirage/config.js

@@ -8,16 +8,11 @@ export default function() {
 export function testConfig() {
   this.urlPrefix = 'https://bactdb-test.herokuapp.com';
   this.namespace = '/api/hymenobacter';
+  this.timing = 0;
 
-  this.get('/users/:id', function(db, request) {
+  this.get('/users/:id');
-    return { 'user': db.users.find(request.params.id) };
-  });
 
-  this.get('/species', function(db) {
+  this.get('/species');
-    return { 'species': db.species };
+  this.get('/species/:id');
-  });
+  this.put('/species/:id');
-
-  this.get('/species/:id', function(db, request) {
-    return { 'species': db.species.find(request.params.id) };
-  });
 }

app/mirage/factories/species.js

@@ -8,4 +8,5 @@ export default Mirage.Factory.extend({
   strains: [],
   totalStrains: 0,
   sortOrder: faker.random.number(),
+  canEdit: faker.random.boolean(),
 });

app/pods/protected/species/edit/controller.js

@@ -1,29 +1,31 @@
 import Ember from 'ember';
 import ajaxError from '../../../../utils/ajax-error';
 
-export default Ember.Controller.extend({
+const { Controller } = Ember;
+
+export default Controller.extend({
   actions: {
     save: function() {
-      let species = this.get('model');
+      const model = this.get('model');
 
-      if (species.get('hasDirtyAttributes')) {
+      if (model.get('hasDirtyAttributes')) {
-        species.save().then((species) => {
+        model.save().then((model) => {
-          this.transitionToRoute('protected.species.show', species);
+          this.transitionToRoute('protected.species.show', model);
         }, () => {
-          ajaxError(species.get('errors'), this.get('flashMessages'));
+          ajaxError(model.get('errors'), this.get('flashMessages'));
         });
       } else {
-        this.transitionToRoute('protected.species.show', species);
+        this.transitionToRoute('protected.species.show', model);
       }
     },
 
     cancel: function() {
-      let species = this.get('model');
+      const model = this.get('model');
 
-      species.get('errors').clear();
+      model.get('errors').clear();
-      species.rollbackAttributes();
+      model.rollbackAttributes();
 
-      this.transitionToRoute('protected.species.show', species);
+      this.transitionToRoute('protected.species.show', model);
     },
 
   },

app/pods/protected/species/edit/route.js

@@ -1,7 +1,9 @@
 import Ember from 'ember';
 
-export default Ember.Route.extend({
+const { Route, inject: { service } } = Ember;
-  currentUser: Ember.inject.service('session-account'),
+
+export default Route.extend({
+  currentUser: service('session-account'),
 
   beforeModel: function(transition) {
     this._super(transition);
@@ -12,17 +14,10 @@ export default Ember.Route.extend({
     });
   },
 
-  afterModel: function(species) {
+  afterModel: function(model) {
-    if (!species.get('canEdit')) {
+    if (!model.get('canEdit')) {
-      this.transitionTo('species.show', species.get('id'));
+      this.transitionTo('species.show', model.get('id'));
     }
   },
 
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    this.get('currentUser.account').then((user) => {
-      controller.set('metaData', user.get('metaData'));
-    });
-  },
-
 });

app/pods/protected/species/edit/template.hbs

@@ -1,7 +1,6 @@
 {{
   protected/species/species-form
   species=model
-  metaData=metaData
+  on-save=(action "save")
-  save="save"
+  on-cancel=(action "cancel")
-  cancel="cancel"
 }}

app/pods/protected/species/species-form/component.js

@@ -1,17 +1,27 @@
 import Ember from 'ember';
 
-const { Component } = Ember;
+const { Component, inject: { service } } = Ember;
 
 export default Component.extend({
+  currentUser: service('session-account'),
+
   species: null,
+  "on-save": null,
+  "on-cancel": null,
+
+  setupMetaDataOnInit: Ember.on('init', function() {
+    this.get('currentUser.account').then((user) => {
+      this.set('metaData', user.get('metaData'));
+    });
+  }),
 
   actions: {
     save: function() {
-      this.sendAction('save');
+      return this.attrs['on-save']();
     },
 
     cancel: function() {
-      this.sendAction('cancel');
+      return this.attrs['on-cancel']();
     },
   }
 });

app/pods/protected/species/species-form/template.hbs

@@ -4,7 +4,7 @@
     <div data-row-span="2">
       <div data-field-span="1">
         <label>Species Name</label>
-        {{input value=species.speciesName}}
+        {{input value=species.speciesName class="species-name"}}
       </div>
       <div data-field-span="1">
         <label>Type Species?</label>
@@ -38,7 +38,7 @@
     Cancel
   </a>
   {{#if species.hasDirtyAttributes}}
-    <button type="submit" class="button-green smaller">
+    <button type="submit" class="button-green smaller save-species">
       Save
     </button>
   {{/if}}

tests/acceptance/species-test.js

@@ -37,3 +37,20 @@ test('visiting /species/:id', function(assert) {
     assert.equal(find(".flakes-information-box > legend > em").text().trim(), species.speciesName);
   });
 });
+
+test('editing /species/:id/edit', function(assert) {
+  const species = server.create('species', { 'canEdit': true });
+  visit(`/species/${species.id}/edit`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/species/${species.id}/edit`);
+
+    fillIn('.species-name', 'Revised Species Name');
+    click('.save-species');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/species/${species.id}`);
+      assert.equal(find(".flakes-information-box > legend > em").text().trim(), 'Revised Species Name');
+    });
+  });
+});