Updated merge from master

This commit is contained in:
Matthew Dillon 2015-07-07 14:41:40 -08:00
commit 8ab97c00e1
127 changed files with 578 additions and 1802 deletions

View file

@ -0,0 +1,3 @@
import FlashObject from 'ember-cli-flash/flash/object';
FlashObject.reopen({ _destroyLater: null });

View file

@ -1,4 +1,6 @@
import resolver from './helpers/resolver';
import flashMessageHelper from './helpers/flash-message';
import {
setResolver
} from 'ember-qunit';

View file

@ -1,15 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('controller:characteristics/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
// Replace this with your real tests.
test('it exists', function(assert) {
var controller = this.subject();
assert.ok(controller);
});

View file

@ -1,15 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('controller:measurements/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
// Replace this with your real tests.
test('it exists', function(assert) {
var controller = this.subject();
assert.ok(controller);
});

View file

@ -1,15 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('controller:sortable', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
// Replace this with your real tests.
test('it exists', function(assert) {
var controller = this.subject();
assert.ok(controller);
});

View file

@ -1,15 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('controller:strains/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
// Replace this with your real tests.
test('it exists', function(assert) {
var controller = this.subject();
assert.ok(controller);
});

View file

@ -1,12 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('controller:compare', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
// Replace this with your real tests.
test('it exists', function(assert) {
var controller = this.subject();
assert.ok(controller);
});

View file

@ -1,11 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:compare', 'Unit | Route | compare', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,21 +0,0 @@
import {
moduleForComponent,
test
} from 'ember-qunit';
moduleForComponent('add-button', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,21 +0,0 @@
import {
moduleForComponent,
test
} from 'ember-qunit';
moduleForComponent('characteristic-index-row', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,19 +0,0 @@
import { moduleForComponent, test } from 'ember-qunit';
moduleForComponent('genbank-url', 'Unit | Component | genbank url', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar'],
unit: true
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,19 +0,0 @@
import { moduleForComponent, test } from 'ember-qunit';
moduleForComponent('loading-panel', 'Unit | Component | loading panel', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar'],
unit: true
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,19 +0,0 @@
import { moduleForComponent, test } from 'ember-qunit';
moduleForComponent('measurement-search-panel', 'Unit | Component | measurement search panel', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar'],
unit: true
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,19 +0,0 @@
import { moduleForComponent, test } from 'ember-qunit';
moduleForComponent('search-button', 'Unit | Component | search button', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar'],
unit: true
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,19 +0,0 @@
import { moduleForComponent, test } from 'ember-qunit';
moduleForComponent('site-name', 'Unit | Component | site name', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar'],
unit: true
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,21 +0,0 @@
import {
moduleForComponent,
test
} from 'ember-qunit';
moduleForComponent('sortable-table-header', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,21 +0,0 @@
import {
moduleForComponent,
test
} from 'ember-qunit';
moduleForComponent('sortable-table', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,21 +0,0 @@
import {
moduleForComponent,
test
} from 'ember-qunit';
moduleForComponent('species-index-row', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,21 +0,0 @@
import {
moduleForComponent,
test
} from 'ember-qunit';
moduleForComponent('strain-index-row', {
// Specify the other units that are required for this test
// needs: ['component:foo', 'helper:bar']
});
test('it renders', function(assert) {
assert.expect(2);
// Creates the component instance
var component = this.subject();
assert.equal(component._state, 'preRender');
// Renders the component to the page
this.render();
assert.equal(component._state, 'inDOM');
});

View file

@ -1,11 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:loading', 'Unit | Route | loading', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,12 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('controller:measurements', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
// Replace this with your real tests.
test('it exists', function(assert) {
var controller = this.subject();
assert.ok(controller);
});

View file

@ -1,11 +0,0 @@
import { moduleFor, test } from 'ember-qunit';
moduleFor('route:measurements', 'Unit | Route | measurements', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:characteristics', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:characteristics/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:measurements', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:measurements/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:species', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:species/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:species/new', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:species/show', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:strains', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:strains/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:strains/new', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:strains/show', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:users', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,14 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('route:users/index', {
// Specify the other units that are required for this test.
// needs: ['controller:foo']
});
test('it exists', function(assert) {
var route = this.subject();
assert.ok(route);
});

View file

@ -1,10 +1,10 @@
import { getProperty } from '../../../helpers/get-property';
import parseBase64 from '../../../utils/parse-base64';
import { module, test } from 'qunit';
module('Unit | Helper | get property');
module('Unit | Utility | parse base64');
// Replace this with your real tests.
test('it works', function(assert) {
var result = getProperty(42);
var result = parseBase64();
assert.ok(result);
});

View file

@ -0,0 +1,10 @@
import userCanAdd from '../../../utils/user-can-add';
import { module, test } from 'qunit';
module('Unit | Utility | user can add');
// Replace this with your real tests.
test('it works', function(assert) {
var result = userCanAdd();
assert.ok(result);
});

View file

@ -0,0 +1,10 @@
import userCanEdit from '../../../utils/user-can-edit';
import { module, test } from 'qunit';
module('Unit | Utility | user can edit');
// Replace this with your real tests.
test('it works', function(assert) {
var result = userCanEdit();
assert.ok(result);
});

View file

@ -1,12 +0,0 @@
import {
moduleFor,
test
} from 'ember-qunit';
moduleFor('view:application');
// Replace this with your real tests.
test('it exists', function(assert) {
var view = this.subject();
assert.ok(view);
});