Merge branch 'master' into clostridium

* master:
  Refactor characteristics/new
  Refactor characteristics/edit
  Refactor characteristics/show
  Refactor characteristics/index
  MetaData mixin
  Additional creation checks
  Set up tests for existing pod
This commit is contained in:
Matthew Dillon 2015-11-05 15:37:01 -07:00
commit dc5b54cfbf
29 changed files with 341 additions and 244 deletions

View file

@ -16,4 +16,9 @@ export function testConfig() {
this.post('/species');
this.get('/species/:id');
this.put('/species/:id');
this.get('/characteristics');
this.post('/characteristics');
this.get('/characteristics/:id');
this.put('/characteristics/:id');
}

View file

@ -0,0 +1,10 @@
import Mirage, { faker } from 'ember-cli-mirage';
export default Mirage.Factory.extend({
characteristicName() { return faker.lorem.words().join(' '); },
characteristicTypeName() { return faker.lorem.words().join(' '); },
strains: [],
measurements: [],
sortOrder: faker.random.number(),
canEdit: faker.random.boolean(),
});