[EOSF-594] Add example controller unit tests and component integration tests

app/controllers/content/index.js

@@ -137,7 +137,7 @@ export default Ember.Controller.extend(Analytics, {
  let text = this.get('model.license.text');
  if (text) {
  text = text.replace(/({{year}})/g, this.get('model.licenseRecord').year || '');
- text = text.replace(/({{copyrightHolders}})/g, this.get('model.licenseRecord').copyright_holders ? this.get('model.licenseRecord').copyright_holders.join(',') : false || '');
+ text = text.replace(/({{copyrightHolders}})/g, this.get('model.licenseRecord').copyright_holders ? this.get('model.licenseRecord').copyright_holders.join(', ') : false || '');
  }
  return text;
  }),

app/controllers/submit.js

@@ -304,7 +304,7 @@ export default Ember.Controller.extend(Analytics, BasicsValidations, NodeActions
  let license = this.get('model.license');
  return {
  year: record ? record.year : null,
- copyrightHolders: record && record.copyright_holders ? record.copyright_holders.join(',') : null,
+ copyrightHolders: record && record.copyright_holders ? record.copyright_holders.join(', ') : null,
  licenseType: license || null
  };
  }),
@@ -313,7 +313,7 @@ export default Ember.Controller.extend(Analytics, BasicsValidations, NodeActions
  if (this.get('model.licenseRecord') || this.get('model.license.content')) {
  changed = changed || (this.get('model.license.name') !== this.get('basicsLicense.licenseType.name'));
  changed = changed || (this.get('model.licenseRecord').year !== this.get('basicsLicense.year'));
- changed = changed || ((this.get('model.licenseRecord.copyright_holders.length') ? this.get('model.licenseRecord.copyright_holders').join(',') : '') !== this.get('basicsLicense.copyrightHolders'));
+ changed = changed || ((this.get('model.licenseRecord.copyright_holders.length') ? this.get('model.licenseRecord.copyright_holders').join(', ') : '') !== this.get('basicsLicense.copyrightHolders'));
  } else {
  changed = changed || ((this.get('availableLicenses').toArray().length ? this.get('availableLicenses').toArray()[0].get('name') : null) !== this.get('basicsLicense.licenseType.name'));
  let date = new Date();
@@ -675,7 +675,7 @@ export default Ember.Controller.extend(Analytics, BasicsValidations, NodeActions
  this.set('basicsLicense', {
  licenseType: license || this.get('availableLicenses').toArray()[0],
  year: this.get('model.licenseRecord') ? this.get('model.licenseRecord').year : date.getUTCFullYear().toString(),
- copyrightHolders: this.get('model.licenseRecord') ? this.get('model.licenseRecord').copyright_holders.join(',') : ''
+ copyrightHolders: this.get('model.licenseRecord') ? this.get('model.licenseRecord').copyright_holders.join(', ') : ''
  });
  });
  },
@@ -717,7 +717,7 @@ export default Ember.Controller.extend(Analytics, BasicsValidations, NodeActions
 
  let newCopyrightHolders = [];
  if (this.get('basicsLicense.copyrightHolders') && this.get('basicsLicense.copyrightHolders').length) {
- newCopyrightHolders = this.get('basicsLicense.copyrightHolders').slice().split(',');
+ newCopyrightHolders = this.get('basicsLicense.copyrightHolders').slice().split(', ');
  }
 
  if (this.get('abstractChanged')) node.set('description', this.get('basicsAbstract'));

bower.json

@@ -12,7 +12,9 @@
  "toastr": "^2.1.2",
  "hint.css": "^2.3.2",
  "jquery.tagsinput": "^1.3.6",
- "loaders.css": "^0.1.2"
+ "loaders.css": "^0.1.2",
+ "jquery-mockjax": "~2.2.1",
+ "Faker": "~3.0.0"
  },
  "resolutions": {
  "jquery": "~2.2.4"

package.json

@@ -38,6 +38,7 @@
  "ember-cli-code-coverage": "0.3.11",
  "ember-cli-dependency-checker": "^1.2.0",
  "ember-cli-dropzonejs": "0.7.0",
+ "ember-cli-fake-server": "0.3.2",
  "ember-cli-eslint": "3.0.3",
  "ember-cli-htmlbars": "^1.0.3",
  "ember-cli-htmlbars-inline-precompile": "^0.3.1",
@@ -56,7 +57,9 @@
  "ember-collection": "1.0.0-alpha.6",
  "ember-cp-validations": "^2.9.4",
  "ember-data": "^2.7.0",
+ "ember-data-factory-guy": "2.11.6",
  "ember-export-application-global": "^1.0.5",
+ "ember-faker": "^1.1.1",
  "ember-font-awesome": "2.1.1",
  "ember-get-config": "0.0.4",
  "ember-i18n": "4.3.1",
@@ -73,6 +76,8 @@
  "ember-truth-helpers": "1.2.0",
  "ember-welcome-page": "^1.0.1",
  "eslint": "^3.18.0",
+ "faker": "^4.1.0",
+ "jscs": "^3.0.7",
  "liquid-fire": "0.24.1",
  "loader.js": "^4.0.1",
  "pagination-pager": "2.4.2",

tests/helpers/module-for-acceptance.js

@@ -2,22 +2,47 @@ import { module } from 'qunit';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
+import FactoryGuy, { manualSetup } from 'ember-data-factory-guy';
+import config from 'ember-get-config';
+import FakeServer, { stubRequest } from 'ember-cli-fake-server';
 
 const { RSVP: { Promise } } = Ember;
 
 export default function(name, options = {}) {
  module(name, {
  beforeEach() {
- this.application = startApp();
+ this.application = startApp();
+ FakeServer.start();
+ manualSetup(this.application.__container__);
+ const url = config.OSF.apiUrl;
+ const provider = FactoryGuy.build('preprint-provider');
 
- if (options.beforeEach) {
- return options.beforeEach.apply(this, arguments);
- }
- },
+ stubRequest('get', url + '/v2/users/me', (request) => {
+ request.unauthorized({});
+ });
+ stubRequest('get', url + '/v2/preprint_providers', (request) => {
+ request.ok({data: [{
+ attributes: provider.data.attributes,
+ type: "preprint_providers",
+ id: "osf"
+ }]});
+ });
+ stubRequest('get', url + '/v2/preprint_providers/osf', (request) => {
+ request.ok({data: {
+ attributes: provider.data.attributes,
+ type: "preprint_providers",
+ id: "osf"
+ }});
+ });
 
+ if (options.beforeEach) {
+ return options.beforeEach.apply(this, arguments);
+ }
+ },
  afterEach() {
- let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
- return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+ FakeServer.stop();
+ let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+ return Promise.resolve(afterEach).then(() => destroyApp(this.application));
  }
  });
 }

tests/integration/components/author-link-test.js

@@ -0,0 +1,37 @@
+import Ember from 'ember';
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import FactoryGuy, { manualSetup } from 'ember-data-factory-guy';
+
+moduleForComponent('author-link', 'Integration | Component | author link', {
+ integration: true,
+ beforeEach: function() {
+ manualSetup(this.container);
+ }
+});
+
+test('renders non-links', function(assert) {
+ let contributorModel = FactoryGuy.make('contributor');
+ // Problem here is that author link expects a share search-result contributor,
+ // not a store instance of a contributor and its user(s).
+ let contributor = {users: {identifiers: []}};
+ contributor.users.name = contributorModel.get('users.fullName');
+ contributor = Ember.merge(contributor, contributorModel.serialize().data.attributes);
+ this.set('contributor', contributor);
+ this.render(hbs`{{author-link contributor=contributor}}`);
+ assert.ok(!this.$('a').length);
+ assert.equal(this.$().text().trim(), contributorModel.get('users.fullName'));
+});
+
+test('renders links', function(assert) {
+ let contributorModel = FactoryGuy.make('contributor');
+ let contributor = {users: {identifiers: []}};
+ contributor.users.name = contributorModel.get('users.fullName');
+ contributor = Ember.merge(contributor, contributorModel.serialize().data.attributes);
+ contributor.users.identifiers.push('https://staging.osf.io/cool');
+ this.set('contributor', contributor);
+
+ this.render(hbs`{{author-link contributor=contributor}}`);
+ assert.ok(this.$('a').length);
+ assert.equal(this.$().text().trim(), contributorModel.get('users.fullName'));
+});

tests/unit/controllers/content/index-test.js

@@ -1,12 +1,105 @@
+import Ember from 'ember';
 import { moduleFor, test } from 'ember-qunit';
+import FactoryGuy, { manualSetup } from 'ember-data-factory-guy';
 
-moduleFor('controller:content/index', 'Unit | Controller | content/index', {
- // Specify the other units that are required for this test.
- needs: ['service:metrics', 'service:theme']
+moduleFor('controller:content/index', 'Unit | Controller | content', {
+ needs: ['service:metrics', 'service:theme', 'model:file', 'model:preprint',
+ 'model:preprint-provider', 'model:node', 'model:license',
+ 'model:user', 'model:citation', 'model:draft-registration',
+ 'model:contributor', 'model:comment', 'model:institution',
+ 'model:registration', 'model:file-provider', 'model:log',
+ 'model:node-link', 'model:wiki'],
+ beforeEach: function() {
+ manualSetup(this.container);
+ }
 });
 
 // Replace this with your real tests.
 test('it exists', function(assert) {
- let controller = this.subject();
- assert.ok(controller);
+ let controller = this.subject();
+ assert.ok(controller);
+});
+
+test('fullLicenseText computed property with multiple copyright holders and year', function(assert) {
+ let ctrl = this.subject();
+ let preprint = FactoryGuy.make('preprint');
+ let license = preprint.get('license');
+ Ember.run(() => {
+ ctrl.set('model', preprint);
+ license.set('text', 'On {{year}}, for {{copyrightHolders}}');
+ preprint.set('licenseRecord', {
+ year: '2001',
+ copyright_holders: ['Henrique', 'Someone Else']
+ });
+ assert.equal(ctrl.get('fullLicenseText'), 'On 2001, for Henrique, Someone Else');
+ });
+});
+
+test('fullLicenseText computed property with no copyright holders or year', function(assert) {
+ let ctrl = this.subject();
+ let preprint = FactoryGuy.make('preprint');
+ let license = preprint.get('license');
+ Ember.run(() => {
+ ctrl.set('model', preprint);
+ license.set('text', 'On {{year}}, for {{copyrightHolders}}');
+ preprint.set('licenseRecord', {
+ year: '',
+ copyright_holders: []
+ });
+
+ assert.equal(ctrl.get('fullLicenseText'), 'On , for ');
+ });
+});
+test('fullLicenseText computed property with {{}} for copyrightHolders', function(assert) {
+ let ctrl = this.subject();
+ let preprint = FactoryGuy.make('preprint');
+ let license = preprint.get('license');
+ Ember.run(() => {
+ ctrl.set('model', preprint);
+ license.set('text', 'On {{year}}, for {{copyrightHolders}}');
+ preprint.set('licenseRecord', {
+ year: '{{year}}',
+ copyright_holders: ['{{copyrightHolders}}']
+ });
+
+ assert.equal(ctrl.get('fullLicenseText'), 'On {{year}}, for {{copyrightHolders}}');
+ });
+});
+
+test('useShortenedDescription computed property', function(assert) {
+ let ctrl = this.subject();
+ let node = FactoryGuy.make('node');
+ Ember.run(() => {
+ ctrl.set('node', node);
+
+ node.set('description', 'string'.repeat(100).slice(0, 351));
+ assert.ok(ctrl.get('useShortenedDescription'));
+
+ node.set('description', 'string'.repeat(100).slice(0, 350));
+ assert.ok(!ctrl.get('useShortenedDescription'));
+
+ node.set('description', 'string'.repeat(100).slice(0, 349));
+ assert.ok(!ctrl.get('useShortenedDescription'));
+ });
+});
+
+test('description computed property', function(assert) {
+ let ctrl = this.subject();
+ let node = FactoryGuy.make('node');
+ Ember.run(() => {
+ ctrl.set('node', node);
+ ctrl.set('expandedAbstract', false);
+
+ //Test cut at 350 characters
+ let description = 'string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string string str';
+ let notExpanded = description.slice(0, 350);
+ node.set('description', description);
+ assert.equal(ctrl.get('description'), notExpanded.trim());
+
+ //Test cut at less than 350 characters to not cut in middle of word
+ description = 'string stringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstringstring';
+ notExpanded = 'string ';
+ node.set('description', description);
+ assert.equal(ctrl.get('description'), notExpanded.trim());
+ });
 });