Update Ember to 3.1 #55

Merged
raucao merged 5 commits from dev/ember_upgrade into master 2018-04-17 10:53:30 +00:00
3 changed files with 2 additions and 33 deletions
Showing only changes of commit 8d303ea5af - Show all commits
-20
View File
@@ -1,20 +0,0 @@
/**
* This pauses the app's boot process until the window load event is fired.
* It allows the user provided Web3 instance (e.g. Metamask, Mist Browser)
* to be inserted before we try to use it.
*/
export default {
name: 'defer-loading',
initialize: function(application) {
// Load event already fired, so web3 should be loaded if available
if (window.windowLoadComplete) { return true; }
// Pause app loading
application.deferReadiness();
window.addEventListener('load', function() {
// Continue app loading
application.advanceReadiness();
});
}
};
-10
View File
@@ -1,10 +0,0 @@
import Contributor from 'kredits-web/models/contributor';
import Proposal from 'kredits-web/models/proposal';
export default {
name: 'register-models',
initialize: function(app) {
app.register('model:contributor', Contributor, { singleton: false });
app.register('model:proposal', Proposal, { singleton: false });
}
};
+2 -3
View File
@@ -1,13 +1,12 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
import { run } from '@ember/runloop';
import Contributor from 'kredits-web/models/contributor';
module('Unit | Model | contributor', function(hooks) {
setupTest(hooks);
test('#avatarURL() returns correct URL', function(assert) {
let model = run(() => this.owner.lookup('service:store').createRecord('contributor'));
let model = Contributor.create();
model.set('github_uid', '318');
assert.equal(model.get('avatarURL'), 'https://avatars2.githubusercontent.com/u/318?v=3&s=128');