From 4dbfb73b3c95c0c90cfcbb799fc9d0303ab991b4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 11:27:22 -0700 Subject: [PATCH] Refactor species edit --- app/mirage/config.js | 15 ++++-------- app/mirage/factories/species.js | 1 + app/pods/protected/species/edit/controller.js | 24 ++++++++++--------- app/pods/protected/species/edit/route.js | 19 ++++++--------- app/pods/protected/species/edit/template.hbs | 5 ++-- .../species/species-form/component.js | 16 ++++++++++--- .../species/species-form/template.hbs | 4 ++-- tests/acceptance/species-test.js | 17 +++++++++++++ 8 files changed, 60 insertions(+), 41 deletions(-) diff --git a/app/mirage/config.js b/app/mirage/config.js index 48732c1..408f6bc 100644 --- a/app/mirage/config.js +++ b/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) { - return { 'user': db.users.find(request.params.id) }; - }); + this.get('/users/:id'); - this.get('/species', function(db) { - return { 'species': db.species }; - }); - - this.get('/species/:id', function(db, request) { - return { 'species': db.species.find(request.params.id) }; - }); + this.get('/species'); + this.get('/species/:id'); + this.put('/species/:id'); } diff --git a/app/mirage/factories/species.js b/app/mirage/factories/species.js index 9e8aa7f..faf07da 100644 --- a/app/mirage/factories/species.js +++ b/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(), }); diff --git a/app/pods/protected/species/edit/controller.js b/app/pods/protected/species/edit/controller.js index 186e7e4..02c6354 100644 --- a/app/pods/protected/species/edit/controller.js +++ b/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')) { - species.save().then((species) => { - this.transitionToRoute('protected.species.show', species); + if (model.get('hasDirtyAttributes')) { + model.save().then((model) => { + 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(); - species.rollbackAttributes(); + model.get('errors').clear(); + model.rollbackAttributes(); - this.transitionToRoute('protected.species.show', species); + this.transitionToRoute('protected.species.show', model); }, }, diff --git a/app/pods/protected/species/edit/route.js b/app/pods/protected/species/edit/route.js index 1f5b616..7767f41 100644 --- a/app/pods/protected/species/edit/route.js +++ b/app/pods/protected/species/edit/route.js @@ -1,7 +1,9 @@ import Ember from 'ember'; -export default Ember.Route.extend({ - currentUser: Ember.inject.service('session-account'), +const { Route, inject: { service } } = Ember; + +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) { - if (!species.get('canEdit')) { - this.transitionTo('species.show', species.get('id')); + afterModel: function(model) { + if (!model.get('canEdit')) { + 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')); - }); - }, - }); diff --git a/app/pods/protected/species/edit/template.hbs b/app/pods/protected/species/edit/template.hbs index aa8272e..68fed98 100644 --- a/app/pods/protected/species/edit/template.hbs +++ b/app/pods/protected/species/edit/template.hbs @@ -1,7 +1,6 @@ {{ protected/species/species-form species=model - metaData=metaData - save="save" - cancel="cancel" + on-save=(action "save") + on-cancel=(action "cancel") }} diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js index d7b34b7..0e261d8 100644 --- a/app/pods/protected/species/species-form/component.js +++ b/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'](); }, } }); diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs index 2b2ae76..ea1b693 100644 --- a/app/pods/protected/species/species-form/template.hbs +++ b/app/pods/protected/species/species-form/template.hbs @@ -4,7 +4,7 @@
- {{input value=species.speciesName}} + {{input value=species.speciesName class="species-name"}}
@@ -38,7 +38,7 @@ Cancel {{#if species.hasDirtyAttributes}} - {{/if}} diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js index 35e9af0..1e7f433 100644 --- a/tests/acceptance/species-test.js +++ b/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'); + }); + }); +});