From a52710f090729ebd8d4fda5618e8986329a3ee69 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 29 Oct 2015 16:52:20 -0700 Subject: [PATCH 01/25] New index --- .../protected/species/index/controller.js | 6 ---- app/pods/protected/species/index/route.js | 9 ----- .../species/index/species-table/component.js | 17 +++++++++ .../species/index/species-table/template.hbs | 33 +++++++++++++++++ app/pods/protected/species/index/template.hbs | 36 +++---------------- 5 files changed, 54 insertions(+), 47 deletions(-) delete mode 100644 app/pods/protected/species/index/controller.js create mode 100644 app/pods/protected/species/index/species-table/component.js create mode 100644 app/pods/protected/species/index/species-table/template.hbs diff --git a/app/pods/protected/species/index/controller.js b/app/pods/protected/species/index/controller.js deleted file mode 100644 index 77916f1..0000000 --- a/app/pods/protected/species/index/controller.js +++ /dev/null @@ -1,6 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Controller.extend({ - sortParams: ['speciesName', 'strainCount'], - sortedSpecies: Ember.computed.sort('model', 'sortParams'), -}); diff --git a/app/pods/protected/species/index/route.js b/app/pods/protected/species/index/route.js index 89c832d..7e7714a 100644 --- a/app/pods/protected/species/index/route.js +++ b/app/pods/protected/species/index/route.js @@ -1,17 +1,8 @@ import Ember from 'ember'; export default Ember.Route.extend({ - currentUser: Ember.inject.service('session-account'), - model: function() { return this.store.findAll('species'); }, - 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/index/species-table/component.js b/app/pods/protected/species/index/species-table/component.js new file mode 100644 index 0000000..b0e6815 --- /dev/null +++ b/app/pods/protected/species/index/species-table/component.js @@ -0,0 +1,17 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + currentUser: Ember.inject.service('session-account'), + + metaData: null, + + setupMetaDataOnInit: Ember.on('init', function() { + this.get('currentUser.account').then((user) => { + this.set('metaData', user.get('metaData')); + }); + }), + + sortParams: ['speciesName', 'strainCount'], + sortedSpecies: Ember.computed.sort('species', 'sortParams'), + +}); diff --git a/app/pods/protected/species/index/species-table/template.hbs b/app/pods/protected/species/index/species-table/template.hbs new file mode 100644 index 0000000..b56eba8 --- /dev/null +++ b/app/pods/protected/species/index/species-table/template.hbs @@ -0,0 +1,33 @@ +

Total species: {{species.length}}

+ +{{add-button label="Add Species" link="protected.species.new" canAdd=metaData.canAdd}} + + + + + + + + + + {{#each sortedSpecies as |species|}} + + + + + {{/each}} + +
NameStrains
+ + {{#link-to 'protected.species.show' species}} + {{species.speciesName}} + {{/link-to}} + + + {{#each species.strains as |strain index|}} + {{if index ","}} + {{#link-to 'protected.strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} + {{/each}} +
diff --git a/app/pods/protected/species/index/template.hbs b/app/pods/protected/species/index/template.hbs index 0774bb3..b3a3f8a 100644 --- a/app/pods/protected/species/index/template.hbs +++ b/app/pods/protected/species/index/template.hbs @@ -1,34 +1,6 @@

{{genus-name}} Species

-

Total species: {{model.length}}

-{{add-button label="Add Species" link="protected.species.new" canAdd=metaData.canAdd}} - - - - - - - - - - {{#each sortedSpecies as |species|}} - - - - - {{/each}} - -
NameStrains
- - {{#link-to 'protected.species.show' species}} - {{species.speciesName}} - {{/link-to}} - - - {{#each species.strains as |strain index|}} - {{if index ","}} - {{#link-to 'protected.strains.show' strain.id}} - {{{strain.strainNameMU}}} - {{/link-to}} - {{/each}} -
+{{ + protected/species/index/species-table + species=model +}} From 8684d0d1481831f31ba1549db6044ca517843511 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 29 Oct 2015 17:00:13 -0700 Subject: [PATCH 02/25] Destructuring --- app/pods/protected/species/index/route.js | 4 +++- app/pods/protected/species/index/species-table/component.js | 6 ++++-- app/pods/protected/species/species-form/component.js | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/pods/protected/species/index/route.js b/app/pods/protected/species/index/route.js index 7e7714a..c30060f 100644 --- a/app/pods/protected/species/index/route.js +++ b/app/pods/protected/species/index/route.js @@ -1,6 +1,8 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { Route } = Ember; + +export default Route.extend({ model: function() { return this.store.findAll('species'); }, diff --git a/app/pods/protected/species/index/species-table/component.js b/app/pods/protected/species/index/species-table/component.js index b0e6815..af6e952 100644 --- a/app/pods/protected/species/index/species-table/component.js +++ b/app/pods/protected/species/index/species-table/component.js @@ -1,7 +1,9 @@ import Ember from 'ember'; -export default Ember.Component.extend({ - currentUser: Ember.inject.service('session-account'), +const { Component, inject: { service }} = Ember; + +export default Component.extend({ + currentUser: service('session-account'), metaData: null, diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js index a53a469..d7b34b7 100644 --- a/app/pods/protected/species/species-form/component.js +++ b/app/pods/protected/species/species-form/component.js @@ -1,6 +1,10 @@ import Ember from 'ember'; -export default Ember.Component.extend({ +const { Component } = Ember; + +export default Component.extend({ + species: null, + actions: { save: function() { this.sendAction('save'); From d80e95c1ebbbbe7e808e3141fee58e3178eec947 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 29 Oct 2015 20:52:16 -0700 Subject: [PATCH 03/25] cleaning some tests --- app/authenticators/jwt-resolved.js | 2 +- app/pods/users/lockoutauthenticate/route.js | 2 +- tests/test-helper.js | 2 +- tests/unit/models/measurement-test.js | 2 +- tests/unit/models/strain-test.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/authenticators/jwt-resolved.js b/app/authenticators/jwt-resolved.js index 4abf71b..568647d 100644 --- a/app/authenticators/jwt-resolved.js +++ b/app/authenticators/jwt-resolved.js @@ -23,7 +23,7 @@ export default BaseAuthenticator.extend({ return RSVP.resolve(data); }, - invalidate: function(data) { + invalidate: function(/* data */) { return RSVP.resolve(); }, }); diff --git a/app/pods/users/lockoutauthenticate/route.js b/app/pods/users/lockoutauthenticate/route.js index 992f534..8ace7ef 100644 --- a/app/pods/users/lockoutauthenticate/route.js +++ b/app/pods/users/lockoutauthenticate/route.js @@ -12,7 +12,7 @@ export default Ember.Route.extend(UnauthenticatedRouteMixin, { this.get('session').authenticate('authenticator:jwt-resolved', token).then(() => { this.get('currentUser.account').then((account) => { this.transitionTo('protected.users.changepassword', account.get('id')); - }) + }); }); }, diff --git a/tests/test-helper.js b/tests/test-helper.js index 0b009b7..718d0c4 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,5 +1,5 @@ import resolver from './helpers/resolver'; -import flashMessageHelper from './helpers/flash-message'; +// import flashMessageHelper from './helpers/flash-message'; import { setResolver diff --git a/tests/unit/models/measurement-test.js b/tests/unit/models/measurement-test.js index 0548082..7f4245c 100644 --- a/tests/unit/models/measurement-test.js +++ b/tests/unit/models/measurement-test.js @@ -5,7 +5,7 @@ import { moduleForModel('measurement', { // Specify the other units that are required for this test. - needs: ['model:strain'] + needs: ['model:strain', 'model:characteristic'] }); test('it exists', function(assert) { diff --git a/tests/unit/models/strain-test.js b/tests/unit/models/strain-test.js index 30b1e2c..be749c8 100644 --- a/tests/unit/models/strain-test.js +++ b/tests/unit/models/strain-test.js @@ -5,7 +5,7 @@ import { moduleForModel('strain', { // Specify the other units that are required for this test. - needs: ['model:measurement'] + needs: ['model:measurement', 'model:characteristic', 'model:species'] }); test('it exists', function(assert) { From 61970663522c61aeb756200a96cc6363ef0f0b7b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 30 Oct 2015 09:22:19 -0700 Subject: [PATCH 04/25] More test cleanup --- app/utils/date-helpers.js | 6 +----- app/utils/parse-base64.js | 2 +- tests/unit/utils/parse-base64-test.js | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/utils/date-helpers.js b/app/utils/date-helpers.js index c493e38..8d839c5 100644 --- a/app/utils/date-helpers.js +++ b/app/utils/date-helpers.js @@ -1,7 +1,3 @@ -function formatDate(date, format) { +export default function formatDate(date, format) { return window.moment(date).format(format); } - -export { - formatDate -}; diff --git a/app/utils/parse-base64.js b/app/utils/parse-base64.js index 5735e8f..eaf7f7b 100644 --- a/app/utils/parse-base64.js +++ b/app/utils/parse-base64.js @@ -4,6 +4,6 @@ export default function parseBase64(token) { tokenData = atob(token.split('.')[1]); return JSON.parse(tokenData); } catch (e) { - return tokenData; + return token; } } diff --git a/tests/unit/utils/parse-base64-test.js b/tests/unit/utils/parse-base64-test.js index c0387b4..ecdf56e 100644 --- a/tests/unit/utils/parse-base64-test.js +++ b/tests/unit/utils/parse-base64-test.js @@ -1,10 +1,10 @@ import parseBase64 from '../../../utils/parse-base64'; import { module, test } from 'qunit'; -module('Unit | Utility | parse base64'); +module('parseBase64'); // Replace this with your real tests. test('it works', function(assert) { - var result = parseBase64(); + var result = parseBase64('123'); assert.ok(result); }); From 257ca6edffc3567df811b9a8d31ac48f6414c40f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 2 Nov 2015 13:22:56 -0700 Subject: [PATCH 05/25] Explicit parameters --- app/pods/protected/species/index/species-table/component.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/pods/protected/species/index/species-table/component.js b/app/pods/protected/species/index/species-table/component.js index af6e952..fea0c08 100644 --- a/app/pods/protected/species/index/species-table/component.js +++ b/app/pods/protected/species/index/species-table/component.js @@ -6,6 +6,7 @@ export default Component.extend({ currentUser: service('session-account'), metaData: null, + species: null, setupMetaDataOnInit: Ember.on('init', function() { this.get('currentUser.account').then((user) => { From 2313135e684b51be98682247f744655f481e02ec Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 2 Nov 2015 16:28:57 -0700 Subject: [PATCH 06/25] ember-cli-mirage --- .jshintrc | 1 + app/mirage/config.js | 82 +++++++++++++++++++++++++++++++++ app/mirage/factories/contact.js | 20 ++++++++ app/mirage/scenarios/default.js | 7 +++ bower.json | 5 +- package.json | 5 +- tests/.jshintrc | 1 + 7 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 app/mirage/config.js create mode 100644 app/mirage/factories/contact.js create mode 100644 app/mirage/scenarios/default.js diff --git a/.jshintrc b/.jshintrc index 32bd9c7..e964d3f 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,5 +1,6 @@ { "predef": [ + "server", "document", "window", "-Promise", diff --git a/app/mirage/config.js b/app/mirage/config.js new file mode 100644 index 0000000..d006425 --- /dev/null +++ b/app/mirage/config.js @@ -0,0 +1,82 @@ +export default function() { + + // These comments are here to help you get started. Feel free to delete them. + + /* + Config (with defaults). + + Note: these only affect routes defined *after* them! + */ + // this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server + // this.namespace = ''; // make this `api`, for example, if your API is namespaced + // this.timing = 400; // delay for each request, automatically set to 0 during testing + + /* + Route shorthand cheatsheet + */ + /* + GET shorthands + + // Collections + this.get('/contacts'); + this.get('/contacts', 'users'); + this.get('/contacts', ['contacts', 'addresses']); + + // Single objects + this.get('/contacts/:id'); + this.get('/contacts/:id', 'user'); + this.get('/contacts/:id', ['contact', 'addresses']); + */ + + /* + POST shorthands + + this.post('/contacts'); + this.post('/contacts', 'user'); // specify the type of resource to be created + */ + + /* + PUT shorthands + + this.put('/contacts/:id'); + this.put('/contacts/:id', 'user'); // specify the type of resource to be updated + */ + + /* + DELETE shorthands + + this.del('/contacts/:id'); + this.del('/contacts/:id', 'user'); // specify the type of resource to be deleted + + // Single object + related resources. Make sure parent resource is first. + this.del('/contacts/:id', ['contact', 'addresses']); + */ + + /* + Function fallback. Manipulate data in the db via + + - db.{collection} + - db.{collection}.find(id) + - db.{collection}.where(query) + - db.{collection}.update(target, attrs) + - db.{collection}.remove(target) + + // Example: return a single object with related models + this.get('/contacts/:id', function(db, request) { + var contactId = +request.params.id; + + return { + contact: db.contacts.find(contactId), + addresses: db.addresses.where({contact_id: contactId}) + }; + }); + + */ +} + +/* +You can optionally export a config that is only loaded during tests +export function testConfig() { + +} +*/ diff --git a/app/mirage/factories/contact.js b/app/mirage/factories/contact.js new file mode 100644 index 0000000..1b3a3ea --- /dev/null +++ b/app/mirage/factories/contact.js @@ -0,0 +1,20 @@ +/* + This is an example factory definition. + + Create more files in this directory to define additional factories. +*/ +import Mirage/*, {faker} */ from 'ember-cli-mirage'; + +export default Mirage.Factory.extend({ + // name: 'Pete', // strings + // age: 20, // numbers + // tall: true, // booleans + + // email: function(i) { // and functions + // return 'person' + i + '@test.com'; + // }, + + // firstName: faker.name.firstName, // using faker + // lastName: faker.name.firstName, + // zipCode: faker.address.zipCode +}); diff --git a/app/mirage/scenarios/default.js b/app/mirage/scenarios/default.js new file mode 100644 index 0000000..e07271c --- /dev/null +++ b/app/mirage/scenarios/default.js @@ -0,0 +1,7 @@ +export default function(/* server */) { + + // Seed your development database using your factories. This + // data will not be loaded in your tests. + + // server.createList('contact', 10); +} diff --git a/bower.json b/bower.json index abdb8ab..0c58bd9 100644 --- a/bower.json +++ b/bower.json @@ -18,6 +18,9 @@ "antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356", "jquery-mousewheel": "~3.1.4", "jquery-ui": "~1.11.4", - "quill": "~0.19.14" + "quill": "~0.19.14", + "pretender": "~0.10.1", + "lodash": "~3.7.0", + "Faker": "~3.0.0" } } diff --git a/package.json b/package.json index f094a4e..32ad610 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,15 @@ "ember-cli-htmlbars-inline-precompile": "^0.2.0", "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-mirage": "0.1.11", "ember-cli-qunit": "^1.0.0", - "ember-simple-auth": "1.0.0", "ember-cli-release": "0.2.3", "ember-cli-sri": "^1.0.3", "ember-cli-uglify": "^1.2.0", "ember-data": "1.13.13", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.3", - "ember-select-2": "1.3.0" + "ember-select-2": "1.3.0", + "ember-simple-auth": "1.0.0" } } diff --git a/tests/.jshintrc b/tests/.jshintrc index 6ec0b7c..4f9f51d 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -1,5 +1,6 @@ { "predef": [ + "server", "document", "window", "location", From afa70efdad4893193034175fa8c4256c03c3600f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 2 Nov 2015 16:38:34 -0700 Subject: [PATCH 07/25] Tweak mirage config --- app/mirage/config.js | 83 ++++---------------------------------------- 1 file changed, 6 insertions(+), 77 deletions(-) diff --git a/app/mirage/config.js b/app/mirage/config.js index d006425..02a1be7 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -1,82 +1,11 @@ export default function() { - - // These comments are here to help you get started. Feel free to delete them. - - /* - Config (with defaults). - - Note: these only affect routes defined *after* them! - */ - // this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server - // this.namespace = ''; // make this `api`, for example, if your API is namespaced - // this.timing = 400; // delay for each request, automatically set to 0 during testing - - /* - Route shorthand cheatsheet - */ - /* - GET shorthands - - // Collections - this.get('/contacts'); - this.get('/contacts', 'users'); - this.get('/contacts', ['contacts', 'addresses']); - - // Single objects - this.get('/contacts/:id'); - this.get('/contacts/:id', 'user'); - this.get('/contacts/:id', ['contact', 'addresses']); - */ - - /* - POST shorthands - - this.post('/contacts'); - this.post('/contacts', 'user'); // specify the type of resource to be created - */ - - /* - PUT shorthands - - this.put('/contacts/:id'); - this.put('/contacts/:id', 'user'); // specify the type of resource to be updated - */ - - /* - DELETE shorthands - - this.del('/contacts/:id'); - this.del('/contacts/:id', 'user'); // specify the type of resource to be deleted - - // Single object + related resources. Make sure parent resource is first. - this.del('/contacts/:id', ['contact', 'addresses']); - */ - - /* - Function fallback. Manipulate data in the db via - - - db.{collection} - - db.{collection}.find(id) - - db.{collection}.where(query) - - db.{collection}.update(target, attrs) - - db.{collection}.remove(target) - - // Example: return a single object with related models - this.get('/contacts/:id', function(db, request) { - var contactId = +request.params.id; - - return { - contact: db.contacts.find(contactId), - addresses: db.addresses.where({contact_id: contactId}) - }; - }); - - */ + // Don't use mirage for development (for now) + this.urlPrefix = 'http://127.0.0.1:8901'; + this.namespace = 'api'; + this.passthrough(); } -/* -You can optionally export a config that is only loaded during tests export function testConfig() { - + this.urlPrefix = 'http://127.0.0.1:8901'; + this.namespace = 'api'; } -*/ From 9c065af74a0a9f4b1ed881296cddbd42cab91464 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 2 Nov 2015 18:06:45 -0700 Subject: [PATCH 08/25] Rough in species index test --- app/mirage/config.js | 14 +++++++-- app/mirage/factories/contact.js | 20 ------------- app/mirage/factories/species.js | 11 +++++++ app/mirage/factories/users.js | 8 +++++ .../species/index/species-table/template.hbs | 2 +- config/environment.js | 1 + tests/acceptance/species-test.js | 29 +++++++++++++++++++ 7 files changed, 61 insertions(+), 24 deletions(-) delete mode 100644 app/mirage/factories/contact.js create mode 100644 app/mirage/factories/species.js create mode 100644 app/mirage/factories/users.js create mode 100644 tests/acceptance/species-test.js diff --git a/app/mirage/config.js b/app/mirage/config.js index 02a1be7..a0fc750 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -1,11 +1,19 @@ export default function() { // Don't use mirage for development (for now) this.urlPrefix = 'http://127.0.0.1:8901'; - this.namespace = 'api'; + this.namespace = '/api'; this.passthrough(); } export function testConfig() { - this.urlPrefix = 'http://127.0.0.1:8901'; - this.namespace = 'api'; + this.urlPrefix = 'https://bactdb-test.herokuapp.com'; + this.namespace = '/api/hymenobacter'; + + this.get('/users/:id', function(db, request) { + return { 'user': db.users.find(request.params.id) }; + }); + + this.get('/species', function(db) { + return { 'species': db.species }; + }); } diff --git a/app/mirage/factories/contact.js b/app/mirage/factories/contact.js deleted file mode 100644 index 1b3a3ea..0000000 --- a/app/mirage/factories/contact.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - This is an example factory definition. - - Create more files in this directory to define additional factories. -*/ -import Mirage/*, {faker} */ from 'ember-cli-mirage'; - -export default Mirage.Factory.extend({ - // name: 'Pete', // strings - // age: 20, // numbers - // tall: true, // booleans - - // email: function(i) { // and functions - // return 'person' + i + '@test.com'; - // }, - - // firstName: faker.name.firstName, // using faker - // lastName: faker.name.firstName, - // zipCode: faker.address.zipCode -}); diff --git a/app/mirage/factories/species.js b/app/mirage/factories/species.js new file mode 100644 index 0000000..814b3f2 --- /dev/null +++ b/app/mirage/factories/species.js @@ -0,0 +1,11 @@ +import Mirage, { faker } from 'ember-cli-mirage'; + +export default Mirage.Factory.extend({ + speciesName: faker.lorem.words, + typeSpecies: faker.random.boolean, + etymology: faker.lorem.sentences, + genusName: 'hymenobacter', + strains: [], + totalStrains: 0, + sortOrder: faker.random.number, +}); diff --git a/app/mirage/factories/users.js b/app/mirage/factories/users.js new file mode 100644 index 0000000..7e14018 --- /dev/null +++ b/app/mirage/factories/users.js @@ -0,0 +1,8 @@ +import Mirage, { faker } from 'ember-cli-mirage'; + +export default Mirage.Factory.extend({ + name() { return faker.name.firstName() + ' ' + faker.name.lastName(); }, + email: faker.internet.email, + role: 'R', + canEdit: false, +}); diff --git a/app/pods/protected/species/index/species-table/template.hbs b/app/pods/protected/species/index/species-table/template.hbs index b56eba8..f96f9cf 100644 --- a/app/pods/protected/species/index/species-table/template.hbs +++ b/app/pods/protected/species/index/species-table/template.hbs @@ -1,4 +1,4 @@ -

Total species: {{species.length}}

+

Total species: {{species.length}}

{{add-button label="Add Species" link="protected.species.new" canAdd=metaData.canAdd}} diff --git a/config/environment.js b/config/environment.js index fed6d95..849cfed 100644 --- a/config/environment.js +++ b/config/environment.js @@ -36,6 +36,7 @@ module.exports = function(environment) { apiURL = 'https://bactdb-test.herokuapp.com'; ENV.APP.LOG_ACTIVE_GENERATION = false; ENV.APP.LOG_VIEW_LOOKUPS = false; + ENV.locationType = 'none'; } if (environment === 'production') { diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js new file mode 100644 index 0000000..d6f4151 --- /dev/null +++ b/tests/acceptance/species-test.js @@ -0,0 +1,29 @@ +import Ember from 'ember'; +import { module, test } from 'qunit'; +import startApp from '../helpers/start-app'; +import { authenticateSession } from '../helpers/ember-simple-auth'; + +module('Acceptance | species', { + beforeEach: function() { + this.application = startApp(); + authenticateSession(this.application, { + access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg" + }); + server.create('users', { role: 'A', canEdit: true }); + }, + + afterEach: function() { + Ember.run(this.application, 'destroy'); + } +}); + +test('visiting /species', function(assert) { + const species = server.createList('species', 20); + visit('/species'); + + andThen(function() { + assert.equal(currentURL(), '/species'); + assert.equal(find(".flakes-table > tbody > tr").length, species.length); + assert.equal(find("#total-species").text(), "Total species: 20"); + }); +}); From dc620858f5af34dc3358a6f02c7db6898693f0d8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 06:55:21 -0700 Subject: [PATCH 09/25] trying a different phantomjs route --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66dd107..d53044e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,10 @@ cache: - node_modules before_install: - - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH + - mkdir travis-phantomjs + - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 + - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs + - export PATH=$PWD/travis-phantomjs:$PATH - "npm config set spin false" - "npm install -g npm@^2" From 68646e6ba60bed5f01af6c5e0bc04317678e3911 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 07:09:58 -0700 Subject: [PATCH 10/25] Drop node version --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d53044e..7d3324e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ --- language: node_js -node_js: - - "0.12" sudo: false From 51b8736610c03fb8d21a718eb9f8b67c53f30e1b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 07:17:58 -0700 Subject: [PATCH 11/25] nvm --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7d3324e..2b4c290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ cache: - node_modules before_install: + - mkdir -p ~/.nvm/versions + - source ~/.nvm/nvm.sh && nvm install 0.12.2 - mkdir travis-phantomjs - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs From 2b2489a35a70ef18ad9955ca452c147ba9647cd4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 09:21:31 -0700 Subject: [PATCH 12/25] fix format date import --- app/helpers/null-time.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/null-time.js b/app/helpers/null-time.js index 8d87835..1efd82f 100644 --- a/app/helpers/null-time.js +++ b/app/helpers/null-time.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import { formatDate } from '../utils/date-helpers'; +import formatDate from '../utils/date-helpers'; export default Ember.Helper.helper(function(params) { let value = params[0], From d1e3d05db2b474d1f14bd3609aba9084c21d1c05 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 09:22:04 -0700 Subject: [PATCH 13/25] Refactor species/show --- app/mirage/config.js | 4 ++ app/mirage/factories/species.js | 8 +-- app/pods/protected/species/show/controller.js | 4 +- app/pods/protected/species/show/route.js | 6 +- .../species/show/species-card/component.js | 14 ++++ .../species/show/species-card/template.hbs | 62 +++++++++++++++++ app/pods/protected/species/show/template.hbs | 67 ++----------------- tests/acceptance/species-test.js | 10 +++ 8 files changed, 106 insertions(+), 69 deletions(-) create mode 100644 app/pods/protected/species/show/species-card/component.js create mode 100644 app/pods/protected/species/show/species-card/template.hbs diff --git a/app/mirage/config.js b/app/mirage/config.js index a0fc750..48732c1 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -16,4 +16,8 @@ export function testConfig() { this.get('/species', function(db) { return { 'species': db.species }; }); + + this.get('/species/:id', function(db, request) { + return { 'species': db.species.find(request.params.id) }; + }); } diff --git a/app/mirage/factories/species.js b/app/mirage/factories/species.js index 814b3f2..9e8aa7f 100644 --- a/app/mirage/factories/species.js +++ b/app/mirage/factories/species.js @@ -1,11 +1,11 @@ import Mirage, { faker } from 'ember-cli-mirage'; export default Mirage.Factory.extend({ - speciesName: faker.lorem.words, - typeSpecies: faker.random.boolean, - etymology: faker.lorem.sentences, + speciesName() { return faker.lorem.words().join(' '); }, + typeSpecies: faker.random.boolean(), + etymology: faker.lorem.sentences(), genusName: 'hymenobacter', strains: [], totalStrains: 0, - sortOrder: faker.random.number, + sortOrder: faker.random.number(), }); diff --git a/app/pods/protected/species/show/controller.js b/app/pods/protected/species/show/controller.js index b44b6a7..684673b 100644 --- a/app/pods/protected/species/show/controller.js +++ b/app/pods/protected/species/show/controller.js @@ -1,6 +1,8 @@ import Ember from 'ember'; -export default Ember.Controller.extend({ +const { Controller } = Ember; + +export default Controller.extend({ actions: { delete: function() { this.get('model').destroyRecord().then(() => { diff --git a/app/pods/protected/species/show/route.js b/app/pods/protected/species/show/route.js index 94f8361..c99362f 100644 --- a/app/pods/protected/species/show/route.js +++ b/app/pods/protected/species/show/route.js @@ -1,8 +1,10 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +const { Route } = Ember; + +export default Route.extend({ model: function(params) { - return this.store.findRecord('species', params.species_id, { reload: true }); + return this.store.findRecord('species', params.species_id); }, }); diff --git a/app/pods/protected/species/show/species-card/component.js b/app/pods/protected/species/show/species-card/component.js new file mode 100644 index 0000000..1492c0b --- /dev/null +++ b/app/pods/protected/species/show/species-card/component.js @@ -0,0 +1,14 @@ +import Ember from 'ember'; + +const { Component } = Ember; + +export default Component.extend({ + species: null, + "on-delete": null, + + actions: { + deleteSpecies: function() { + return this.attrs['on-delete'](); + }, + }, +}); diff --git a/app/pods/protected/species/show/species-card/template.hbs b/app/pods/protected/species/show/species-card/template.hbs new file mode 100644 index 0000000..fac8247 --- /dev/null +++ b/app/pods/protected/species/show/species-card/template.hbs @@ -0,0 +1,62 @@ +
+
+
+ + Species {{species.speciesName}} + + + {{! ROW 1 }} +
+
+
Strains
+
+
    + {{#each species.strains as |strain index|}} +
  • + {{#link-to 'protected.strains.show' strain.id}} + {{{strain.strainNameMU}}} + {{/link-to}} +
    • + {{/each}} +
+
+
+
+
Type Species?
+
+ {{if species.typeSpecies 'Yes' 'No'}} +
+
+
+ + {{! ROW 2 }} +
+
+
Etymology
+
+ {{{species.etymology}}} +
+
+
+ + {{! ROW 3 }} +
+
+
Record Created
+
{{null-time species.createdAt 'LL'}}
+
+
+
Record Updated
+
{{null-time species.updatedAt 'LL'}}
+
+
+
+
+
+{{#if species.canEdit}} +
+ {{#link-to 'protected.species.edit' species class="button-gray smaller"}} + Edit + {{/link-to}} + {{delete-button delete=(action 'deleteSpecies')}} +{{/if}} diff --git a/app/pods/protected/species/show/template.hbs b/app/pods/protected/species/show/template.hbs index 841a671..d2656ec 100644 --- a/app/pods/protected/species/show/template.hbs +++ b/app/pods/protected/species/show/template.hbs @@ -1,62 +1,5 @@ -
-
-
- - Species {{model.speciesName}} - - - {{! ROW 1 }} -
-
-
Strains
-
-
    - {{#each model.strains as |strain index|}} -
  • - {{#link-to 'protected.strains.show' strain.id}} - {{{strain.strainNameMU}}} - {{/link-to}} -
    • - {{/each}} -
-
-
-
-
Type Species?
-
- {{if model.typeSpecies 'Yes' 'No'}} -
-
-
- - {{! ROW 2 }} -
-
-
Etymology
-
- {{{model.etymology}}} -
-
-
- - {{! ROW 3 }} -
-
-
Record Created
-
{{null-time model.createdAt 'LL'}}
-
-
-
Record Updated
-
{{null-time model.updatedAt 'LL'}}
-
-
-
-
-
-{{#if model.canEdit}} -
- {{#link-to 'protected.species.edit' model class="button-gray smaller"}} - Edit - {{/link-to}} - {{delete-button delete=(action 'delete')}} -{{/if}} +{{ + protected/species/show/species-card + species=model + on-delete=(action 'delete') +}} diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js index d6f4151..35e9af0 100644 --- a/tests/acceptance/species-test.js +++ b/tests/acceptance/species-test.js @@ -27,3 +27,13 @@ test('visiting /species', function(assert) { assert.equal(find("#total-species").text(), "Total species: 20"); }); }); + +test('visiting /species/:id', function(assert) { + const species = server.create('species'); + visit(`/species/${species.id}`); + + andThen(function() { + assert.equal(currentURL(), `/species/${species.id}`); + assert.equal(find(".flakes-information-box > legend > em").text().trim(), species.speciesName); + }); +}); From 4dbfb73b3c95c0c90cfcbb799fc9d0303ab991b4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 11:27:22 -0700 Subject: [PATCH 14/25] 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'); + }); + }); +}); From 58cbf4027d2095372000689e3ed2ae1d99899e33 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 13:41:04 -0700 Subject: [PATCH 15/25] SaveModel Mixin #43 --- app/mixins/save-model.js | 31 +++++++++++++++++++ app/pods/protected/species/edit/controller.js | 31 +++---------------- tests/unit/mixins/save-model-test.js | 12 +++++++ 3 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 app/mixins/save-model.js create mode 100644 tests/unit/mixins/save-model-test.js diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js new file mode 100644 index 0000000..5db43fa --- /dev/null +++ b/app/mixins/save-model.js @@ -0,0 +1,31 @@ +import Ember from 'ember'; +import ajaxError from '../utils/ajax-error'; + +export default Ember.Mixin.create({ + actions: { + save: function() { + const model = this.get('model'); + const fallbackRoute = this.get('fallbackRoute'); + + if (model.get('hasDirtyAttributes')) { + model.save().then((model) => { + this.transitionToRoute(fallbackRoute, model); + }, () => { + ajaxError(model.get('errors'), this.get('flashMessages')); + }); + } else { + this.transitionToRoute(fallbackRoute, model); + } + }, + + cancel: function() { + const model = this.get('model'); + const fallbackRoute = this.get('fallbackRoute'); + + model.get('errors').clear(); + model.rollbackAttributes(); + + this.transitionToRoute(fallbackRoute, model); + }, + }, +}); diff --git a/app/pods/protected/species/edit/controller.js b/app/pods/protected/species/edit/controller.js index 02c6354..5f7591b 100644 --- a/app/pods/protected/species/edit/controller.js +++ b/app/pods/protected/species/edit/controller.js @@ -1,32 +1,9 @@ import Ember from 'ember'; -import ajaxError from '../../../../utils/ajax-error'; +import SaveModel from '../../../../mixins/save-model'; const { Controller } = Ember; -export default Controller.extend({ - actions: { - save: function() { - const model = this.get('model'); - - if (model.get('hasDirtyAttributes')) { - model.save().then((model) => { - this.transitionToRoute('protected.species.show', model); - }, () => { - ajaxError(model.get('errors'), this.get('flashMessages')); - }); - } else { - this.transitionToRoute('protected.species.show', model); - } - }, - - cancel: function() { - const model = this.get('model'); - - model.get('errors').clear(); - model.rollbackAttributes(); - - this.transitionToRoute('protected.species.show', model); - }, - - }, +export default Controller.extend(SaveModel, { + // Required for SaveModel mixin + fallbackRoute: 'protected.species.show', }); diff --git a/tests/unit/mixins/save-model-test.js b/tests/unit/mixins/save-model-test.js new file mode 100644 index 0000000..63ff660 --- /dev/null +++ b/tests/unit/mixins/save-model-test.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; +import SaveModelMixin from '../../../mixins/save-model'; +import { module, test } from 'qunit'; + +module('Unit | Mixin | save model'); + +// Replace this with your real tests. +test('it works', function(assert) { + var SaveModelObject = Ember.Object.extend(SaveModelMixin); + var subject = SaveModelObject.create(); + assert.ok(subject); +}); From 76942a10d0cd92f5613141f5b38e96ab44a6c82c Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 13:47:58 -0700 Subject: [PATCH 16/25] ElevatedAccess Mixin --- app/mixins/elevated-access.js | 22 ++++++++++++++++++++ app/mixins/save-model.js | 7 ++++--- app/pods/protected/species/edit/route.js | 25 ++++++----------------- tests/unit/mixins/elevated-access-test.js | 12 +++++++++++ 4 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 app/mixins/elevated-access.js create mode 100644 tests/unit/mixins/elevated-access-test.js diff --git a/app/mixins/elevated-access.js b/app/mixins/elevated-access.js new file mode 100644 index 0000000..15607e3 --- /dev/null +++ b/app/mixins/elevated-access.js @@ -0,0 +1,22 @@ +import Ember from 'ember'; + +const { Mixin , inject: { service } } = Ember; + +export default Mixin.create({ + currentUser: service('session-account'), + + beforeModel: function(transition) { + this._super(transition); + this.get('currentUser.account').then((user) => { + if (user.get('isReader')) { + this.transitionTo(this.get('fallbackRouteBefore')); + } + }); + }, + + afterModel: function(model) { + if (!model.get('canEdit')) { + this.transitionTo(this.get('fallbackRouteAfter'), model.get('id')); + } + }, +}); diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js index 5db43fa..0f83491 100644 --- a/app/mixins/save-model.js +++ b/app/mixins/save-model.js @@ -1,7 +1,9 @@ import Ember from 'ember'; import ajaxError from '../utils/ajax-error'; -export default Ember.Mixin.create({ +const { Mixin } = Ember; + +export default Mixin.create({ actions: { save: function() { const model = this.get('model'); @@ -20,12 +22,11 @@ export default Ember.Mixin.create({ cancel: function() { const model = this.get('model'); - const fallbackRoute = this.get('fallbackRoute'); model.get('errors').clear(); model.rollbackAttributes(); - this.transitionToRoute(fallbackRoute, model); + this.transitionToRoute(this.get('fallbackRoute'), model); }, }, }); diff --git a/app/pods/protected/species/edit/route.js b/app/pods/protected/species/edit/route.js index 7767f41..f429c37 100644 --- a/app/pods/protected/species/edit/route.js +++ b/app/pods/protected/species/edit/route.js @@ -1,23 +1,10 @@ import Ember from 'ember'; +import ElevatedAccess from '../../../../mixins/elevated-access'; -const { Route, inject: { service } } = Ember; - -export default Route.extend({ - currentUser: service('session-account'), - - beforeModel: function(transition) { - this._super(transition); - this.get('currentUser.account').then((user) => { - if (user.get('isReader')) { - this.transitionTo('protected.species.index'); - } - }); - }, - - afterModel: function(model) { - if (!model.get('canEdit')) { - this.transitionTo('species.show', model.get('id')); - } - }, +const { Route } = Ember; +export default Route.extend(ElevatedAccess, { + // Required for ElevatedAccess mixin + fallbackRouteBefore: 'protected.species.index', + fallbackRouteAfter: 'protected.species.show', }); diff --git a/tests/unit/mixins/elevated-access-test.js b/tests/unit/mixins/elevated-access-test.js new file mode 100644 index 0000000..9791fc6 --- /dev/null +++ b/tests/unit/mixins/elevated-access-test.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; +import ElevatedAccessMixin from '../../../mixins/elevated-access'; +import { module, test } from 'qunit'; + +module('Unit | Mixin | elevated access'); + +// Replace this with your real tests. +test('it works', function(assert) { + var ElevatedAccessObject = Ember.Object.extend(ElevatedAccessMixin); + var subject = ElevatedAccessObject.create(); + assert.ok(subject); +}); From cc85ee6f278793757eb0748255e89e4f56d7b8d1 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 13:54:45 -0700 Subject: [PATCH 17/25] Using mixins on new species --- app/mixins/elevated-access.js | 14 +++++++++ app/mixins/save-model.js | 2 ++ app/pods/protected/species/new/controller.js | 30 ++++---------------- app/pods/protected/species/new/route.js | 28 ++++-------------- app/pods/protected/species/new/template.hbs | 4 +-- 5 files changed, 29 insertions(+), 49 deletions(-) diff --git a/app/mixins/elevated-access.js b/app/mixins/elevated-access.js index 15607e3..e557331 100644 --- a/app/mixins/elevated-access.js +++ b/app/mixins/elevated-access.js @@ -5,6 +5,9 @@ const { Mixin , inject: { service } } = Ember; export default Mixin.create({ currentUser: service('session-account'), + fallbackRouteBefore: null, + fallbackRouteAfter: null, + beforeModel: function(transition) { this._super(transition); this.get('currentUser.account').then((user) => { @@ -19,4 +22,15 @@ export default Mixin.create({ this.transitionTo(this.get('fallbackRouteAfter'), model.get('id')); } }, + + actions: { + willTransition: function(/*transition*/) { + const controller = this.get('controller'); + const model = controller.get('model'); + + if (model.get('isNew')) { + model.destroyRecord(); + } + }, + }, }); diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js index 0f83491..e7d920e 100644 --- a/app/mixins/save-model.js +++ b/app/mixins/save-model.js @@ -4,6 +4,8 @@ import ajaxError from '../utils/ajax-error'; const { Mixin } = Ember; export default Mixin.create({ + fallbackRoute: null, + actions: { save: function() { const model = this.get('model'); diff --git a/app/pods/protected/species/new/controller.js b/app/pods/protected/species/new/controller.js index 6170616..5f7591b 100644 --- a/app/pods/protected/species/new/controller.js +++ b/app/pods/protected/species/new/controller.js @@ -1,29 +1,9 @@ import Ember from 'ember'; -import ajaxError from '../../../../utils/ajax-error'; +import SaveModel from '../../../../mixins/save-model'; -export default Ember.Controller.extend({ - actions: { - save: function() { - let species = this.get('model'); +const { Controller } = Ember; - if (species.get('hasDirtyAttributes')) { - species.save().then((species) => { - this.transitionToRoute('protected.species.show', species.get('id')); - }, () => { - ajaxError(species.get('errors'), this.get('flashMessages')); - }); - } else { - species.destroyRecord().then(() => { - this.transitionToRoute('protected.species.index'); - }); - } - }, - - cancel: function() { - this.get('model').destroyRecord().then(() => { - this.transitionToRoute('protected.species.index'); - }); - }, - - }, +export default Controller.extend(SaveModel, { + // Required for SaveModel mixin + fallbackRoute: 'protected.species.show', }); diff --git a/app/pods/protected/species/new/route.js b/app/pods/protected/species/new/route.js index caf8dba..7ed36ec 100644 --- a/app/pods/protected/species/new/route.js +++ b/app/pods/protected/species/new/route.js @@ -1,30 +1,14 @@ import Ember from 'ember'; +import ElevatedAccess from '../../../../mixins/elevated-access'; -export default Ember.Route.extend({ - currentUser: Ember.inject.service('session-account'), +const { Route } = Ember; - beforeModel: function(transition) { - this._super(transition); - this.get('currentUser.account').then((user) => { - if (user.get('isReader')) { - this.transitionTo('protected.species.index'); - } - }); - }, +export default Route.extend(ElevatedAccess, { + // Required for ElevatedAccess mixin + fallbackRouteBefore: 'protected.species.index', + fallbackRouteAfter: 'protected.species.show', model: function() { return this.store.createRecord('species'); }, - - actions: { - willTransition: function(/*transition*/) { - const controller = this.get('controller'); - const species = controller.get('model'); - - if (species.get('isNew')) { - species.destroyRecord(); - } - }, - }, - }); diff --git a/app/pods/protected/species/new/template.hbs b/app/pods/protected/species/new/template.hbs index c3b8a05..68fed98 100644 --- a/app/pods/protected/species/new/template.hbs +++ b/app/pods/protected/species/new/template.hbs @@ -1,6 +1,6 @@ {{ protected/species/species-form species=model - save="save" - cancel="cancel" + on-save=(action "save") + on-cancel=(action "cancel") }} From 3f5eb26a3396ae1ded8373905576dafd29c729b2 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 13:58:01 -0700 Subject: [PATCH 18/25] DeleteModel Mixin --- app/mixins/delete-model.js | 15 +++++++++++++++ app/pods/protected/species/show/controller.js | 13 ++++--------- tests/unit/mixins/delete-model-test.js | 12 ++++++++++++ 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 app/mixins/delete-model.js create mode 100644 tests/unit/mixins/delete-model-test.js diff --git a/app/mixins/delete-model.js b/app/mixins/delete-model.js new file mode 100644 index 0000000..e16fb76 --- /dev/null +++ b/app/mixins/delete-model.js @@ -0,0 +1,15 @@ +import Ember from 'ember'; + +const { Mixin } = Ember; + +export default Mixin.create({ + transitionRoute: null, + + actions: { + delete: function() { + this.get('model').destroyRecord().then(() => { + this.transitionToRoute(this.get('transitionRoute')); + }); + }, + }, +}); diff --git a/app/pods/protected/species/show/controller.js b/app/pods/protected/species/show/controller.js index 684673b..4a659e0 100644 --- a/app/pods/protected/species/show/controller.js +++ b/app/pods/protected/species/show/controller.js @@ -1,14 +1,9 @@ import Ember from 'ember'; +import DeleteModel from '../../../../mixins/delete-model'; const { Controller } = Ember; -export default Controller.extend({ - actions: { - delete: function() { - this.get('model').destroyRecord().then(() => { - this.transitionToRoute('protected.species.index'); - }); - }, - }, - +export default Controller.extend(DeleteModel, { + // Required for DeleteModel mixin + transitionRoute: 'protected.species.index', }); diff --git a/tests/unit/mixins/delete-model-test.js b/tests/unit/mixins/delete-model-test.js new file mode 100644 index 0000000..b49b132 --- /dev/null +++ b/tests/unit/mixins/delete-model-test.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; +import DeleteModelMixin from '../../../mixins/delete-model'; +import { module, test } from 'qunit'; + +module('Unit | Mixin | delete model'); + +// Replace this with your real tests. +test('it works', function(assert) { + var DeleteModelObject = Ember.Object.extend(DeleteModelMixin); + var subject = DeleteModelObject.create(); + assert.ok(subject); +}); From 406a33ccdbdd4ccef071783c0b3a691b02723657 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 14:15:35 -0700 Subject: [PATCH 19/25] ember-one-way-input --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 32ad610..9b901cb 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "ember-data": "1.13.13", "ember-disable-proxy-controllers": "^1.0.0", "ember-export-application-global": "^1.0.3", + "ember-one-way-input": "0.1.3", "ember-select-2": "1.3.0", "ember-simple-auth": "1.0.0" } From 16d77dead7a3a4072ee79b7c06b1f38cfdcb5b3f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 3 Nov 2015 15:48:35 -0700 Subject: [PATCH 20/25] WIP (checkbox) --- app/mixins/save-model.js | 4 ++- .../species/species-form/component.js | 28 +++++++++++++++++-- .../species/species-form/template.hbs | 14 ++++------ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/mixins/save-model.js b/app/mixins/save-model.js index e7d920e..97cc97b 100644 --- a/app/mixins/save-model.js +++ b/app/mixins/save-model.js @@ -7,10 +7,12 @@ export default Mixin.create({ fallbackRoute: null, actions: { - save: function() { + save: function(properties) { const model = this.get('model'); const fallbackRoute = this.get('fallbackRoute'); + model.setProperties(properties); + if (model.get('hasDirtyAttributes')) { model.save().then((model) => { this.transitionToRoute(fallbackRoute, model); diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js index 0e261d8..5b73342 100644 --- a/app/pods/protected/species/species-form/component.js +++ b/app/pods/protected/species/species-form/component.js @@ -8,6 +8,21 @@ export default Component.extend({ species: null, "on-save": null, "on-cancel": null, + "on-update": null, + + speciesName: null, + typeSpecies: null, + + updateField: function(property, value) { + this.set(property, value); + }, + + resetOnInit: Ember.on('init', function() { + ['speciesName', 'typeSpecies'].forEach((field) => { + const valueInSpecies = this.get('species').get(field); + this.set(field, valueInSpecies); + }); + }), setupMetaDataOnInit: Ember.on('init', function() { this.get('currentUser.account').then((user) => { @@ -17,11 +32,20 @@ export default Component.extend({ actions: { save: function() { - return this.attrs['on-save'](); + return this.attrs['on-save'](this.getProperties(['speciesName', 'typeSpecies'])); }, cancel: function() { return this.attrs['on-cancel'](); }, - } + + nameDidChange: function(value) { + this.updateField('speciesName', value); + }, + + typeSpeciesDidChange: function() { + this.toggleProperty('typeSpecies'); + console.log(this.get('typeSpecies')); + }, + }, }); diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs index ea1b693..0813123 100644 --- a/app/pods/protected/species/species-form/template.hbs +++ b/app/pods/protected/species/species-form/template.hbs @@ -1,14 +1,14 @@
- {{species.speciesName}} + {{speciesName}}
- {{input value=species.speciesName class="species-name"}} + {{one-way-input type="text" class="species-name" value=speciesName update=(action "nameDidChange")}}
- {{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}} + {{one-way-input type="checkbox" value=typeSpecies update=(action "typeSpeciesDidChange")}} {{if typeSpecies 'Yes' 'No'}}
{{#unless species.isNew}} @@ -37,9 +37,7 @@ Cancel - {{#if species.hasDirtyAttributes}} - - {{/if}} + From cb43c27c6ffb1a3edb822df37e646f89a081cdd1 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 4 Nov 2015 10:55:12 -0700 Subject: [PATCH 21/25] Fixed up checkbox input --- app/pods/protected/species/species-form/component.js | 1 - app/pods/protected/species/species-form/template.hbs | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js index 5b73342..dc1b605 100644 --- a/app/pods/protected/species/species-form/component.js +++ b/app/pods/protected/species/species-form/component.js @@ -45,7 +45,6 @@ export default Component.extend({ typeSpeciesDidChange: function() { this.toggleProperty('typeSpecies'); - console.log(this.get('typeSpecies')); }, }, }); diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs index 0813123..df9089a 100644 --- a/app/pods/protected/species/species-form/template.hbs +++ b/app/pods/protected/species/species-form/template.hbs @@ -8,7 +8,8 @@
- {{one-way-input type="checkbox" value=typeSpecies update=(action "typeSpeciesDidChange")}} {{if typeSpecies 'Yes' 'No'}} + + {{if typeSpecies 'Yes' 'No'}}
{{#unless species.isNew}} From dbcc573f693cb519cacdc45f008d4115ab928d7a Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 4 Nov 2015 11:35:31 -0700 Subject: [PATCH 22/25] Quill DDAU --- app/pods/components/text-editor/component.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pods/components/text-editor/component.js b/app/pods/components/text-editor/component.js index 07c8f7a..01d00fd 100644 --- a/app/pods/components/text-editor/component.js +++ b/app/pods/components/text-editor/component.js @@ -3,7 +3,8 @@ import Ember from 'ember'; export default Ember.Component.extend({ quill: null, - value: null, // passed in + value: null, + update: null, didInsertElement: function() { let quill = new Quill(`#${this.get('elementId')} .editor`, { @@ -22,11 +23,10 @@ export default Ember.Component.extend({ quill.on('text-change', (delta, source) => { if (source === 'user') { - this.set('value', Ember.$(quill.getHTML()).html()); + this.attrs['update'](Ember.$(quill.getHTML()).html()); } }); this.set('quill', quill); }, - }); From 30e7000a81d5d2090358cf1db54819d394872624 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 4 Nov 2015 12:26:43 -0700 Subject: [PATCH 23/25] Wrapping up form cleanup --- .../species/species-form/component.js | 37 +++++++++++++++---- .../species/species-form/template.hbs | 16 ++++---- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/app/pods/protected/species/species-form/component.js b/app/pods/protected/species/species-form/component.js index dc1b605..290e6e5 100644 --- a/app/pods/protected/species/species-form/component.js +++ b/app/pods/protected/species/species-form/component.js @@ -5,23 +5,30 @@ const { Component, inject: { service } } = Ember; export default Component.extend({ currentUser: service('session-account'), + // Read-only attributes species: null, + isNew: null, + isDirty: false, + + // Actions "on-save": null, "on-cancel": null, "on-update": null, + // Property mapping + propertiesList: ['speciesName', 'typeSpecies', 'strains', 'etymology'], speciesName: null, typeSpecies: null, - - updateField: function(property, value) { - this.set(property, value); - }, + strains: null, + etymology: null, resetOnInit: Ember.on('init', function() { - ['speciesName', 'typeSpecies'].forEach((field) => { + this.get('propertiesList').forEach((field) => { const valueInSpecies = this.get('species').get(field); this.set(field, valueInSpecies); }); + // Read-only attributes + this.set('isNew', this.get('species.isNew')); }), setupMetaDataOnInit: Ember.on('init', function() { @@ -30,21 +37,35 @@ export default Component.extend({ }); }), + updateField: function(property, value) { + this.set(property, value); + // Manually compare against passed in value + if (this.get('species').get(property) !== value) { + this.set('isDirty', true); + } else { + this.set('isDirty', false); + } + }, + actions: { save: function() { - return this.attrs['on-save'](this.getProperties(['speciesName', 'typeSpecies'])); + return this.attrs['on-save'](this.getProperties(this.get('propertiesList'))); }, cancel: function() { return this.attrs['on-cancel'](); }, - nameDidChange: function(value) { + speciesNameDidChange: function(value) { this.updateField('speciesName', value); }, typeSpeciesDidChange: function() { - this.toggleProperty('typeSpecies'); + this.updateField('typeSpecies', !this.get('typeSpecies')); + }, + + etymologyDidChange: function(value) { + this.updateField('etymology', value); }, }, }); diff --git a/app/pods/protected/species/species-form/template.hbs b/app/pods/protected/species/species-form/template.hbs index df9089a..888b03e 100644 --- a/app/pods/protected/species/species-form/template.hbs +++ b/app/pods/protected/species/species-form/template.hbs @@ -4,7 +4,7 @@
- {{one-way-input type="text" class="species-name" value=speciesName update=(action "nameDidChange")}} + {{one-way-input type="text" class="species-name" value=speciesName update=(action "speciesNameDidChange")}}
@@ -12,11 +12,11 @@ {{if typeSpecies 'Yes' 'No'}}
- {{#unless species.isNew}} + {{#unless isNew}}
- {{#each species.strains as |strain index|}} + {{#each strains as |strain index|}} {{if index ","}} {{#link-to 'protected.strains.show' strain.id}} {{{strain.strainNameMU}}} @@ -30,7 +30,7 @@
- {{text-editor value=species.etymology}} + {{text-editor value=etymology update=(action "etymologyDidChange")}}
@@ -38,7 +38,9 @@ Cancel - + {{# if isDirty}} + + {{/if}} From 19ce57998377ce8f7fe01eac9953d8bd775aaae7 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 4 Nov 2015 13:05:03 -0700 Subject: [PATCH 24/25] Test new species (plus minor cleanup) --- app/mirage/config.js | 1 + app/mixins/elevated-access.js | 2 +- app/pods/protected/species/edit/route.js | 5 +++++ tests/acceptance/species-test.js | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/mirage/config.js b/app/mirage/config.js index 408f6bc..79cee5e 100644 --- a/app/mirage/config.js +++ b/app/mirage/config.js @@ -13,6 +13,7 @@ export function testConfig() { this.get('/users/:id'); this.get('/species'); + this.post('/species'); this.get('/species/:id'); this.put('/species/:id'); } diff --git a/app/mixins/elevated-access.js b/app/mixins/elevated-access.js index e557331..326042a 100644 --- a/app/mixins/elevated-access.js +++ b/app/mixins/elevated-access.js @@ -18,7 +18,7 @@ export default Mixin.create({ }, afterModel: function(model) { - if (!model.get('canEdit')) { + if (!model.get('isNew') && !model.get('canEdit')) { this.transitionTo(this.get('fallbackRouteAfter'), model.get('id')); } }, diff --git a/app/pods/protected/species/edit/route.js b/app/pods/protected/species/edit/route.js index f429c37..fd5b75c 100644 --- a/app/pods/protected/species/edit/route.js +++ b/app/pods/protected/species/edit/route.js @@ -7,4 +7,9 @@ export default Route.extend(ElevatedAccess, { // Required for ElevatedAccess mixin fallbackRouteBefore: 'protected.species.index', fallbackRouteAfter: 'protected.species.show', + + model: function(params) { + return this.store.findRecord('species', params.species_id); + }, + }); diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js index 1e7f433..656acd5 100644 --- a/tests/acceptance/species-test.js +++ b/tests/acceptance/species-test.js @@ -54,3 +54,17 @@ test('editing /species/:id/edit', function(assert) { }); }); }); + +test('creating /species/new', function(assert) { + visit(`/species/new`); + + andThen(function() { + assert.equal(currentURL(), `/species/new`); + fillIn('.species-name', 'New Species Name'); + click('.save-species'); + + andThen(function() { + assert.equal(find(".flakes-information-box > legend > em").text().trim(), 'New Species Name'); + }); + }); +}); From c672a245aa3987d7a2382d35be329e54bb2d9e47 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 4 Nov 2015 13:36:09 -0700 Subject: [PATCH 25/25] Temporary fix for quill editor use in strains edit --- app/pods/protected/strains/strain-form/component.js | 10 +++++++++- app/pods/protected/strains/strain-form/template.hbs | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js index a53a469..8ac9027 100644 --- a/app/pods/protected/strains/strain-form/component.js +++ b/app/pods/protected/strains/strain-form/component.js @@ -9,5 +9,13 @@ export default Ember.Component.extend({ cancel: function() { this.sendAction('cancel'); }, - } + + isolatedFromDidChange: function(value) { + this.set('strain.isolatedFrom', value); + }, + + notesDidChange: function(value) { + this.set('strain.notes', value); + }, + }, }); diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs index cf33026..109d037 100644 --- a/app/pods/protected/strains/strain-form/template.hbs +++ b/app/pods/protected/strains/strain-form/template.hbs @@ -25,7 +25,7 @@
- {{text-editor value=strain.isolatedFrom}} + {{text-editor value=strain.isolatedFrom update=(action "isolatedFromDidChange")}}
@@ -45,7 +45,7 @@
- {{text-editor value=strain.notes}} + {{text-editor value=strain.notes update=(action "notesDidChange")}}