@@ -45,7 +45,7 @@
- {{text-editor value=strain.notes}}
+ {{text-editor value=strain.notes update=(action "notesDidChange")}}
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/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/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/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/package.json b/package.json
index f094a4e..9b901cb 100644
--- a/package.json
+++ b/package.json
@@ -30,14 +30,16 @@
"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-one-way-input": "0.1.3",
+ "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",
diff --git a/tests/acceptance/species-test.js b/tests/acceptance/species-test.js
new file mode 100644
index 0000000..656acd5
--- /dev/null
+++ b/tests/acceptance/species-test.js
@@ -0,0 +1,70 @@
+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");
+ });
+});
+
+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);
+ });
+});
+
+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');
+ });
+ });
+});
+
+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');
+ });
+ });
+});
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/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);
+});
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);
+});
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);
+});
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) {
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);
});