diff --git a/app/helpers/contribution-status.js b/app/helpers/contribution-status.js index 4f8ea38..cab5832 100644 --- a/app/helpers/contribution-status.js +++ b/app/helpers/contribution-status.js @@ -25,8 +25,6 @@ export default Helper.extend({ status.push('pending'); } - status.push('pending'); - return status.join(' '); }, diff --git a/tests/unit/helpers/contribution-status-test.js b/tests/unit/helpers/contribution-status-test.js new file mode 100644 index 0000000..f0b9f91 --- /dev/null +++ b/tests/unit/helpers/contribution-status-test.js @@ -0,0 +1,22 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; +import Contribution from 'kredits-web/models/contribution'; + +module('Unit | Helper | contribution-status', function (hooks) { + setupTest(hooks); + + test('returns the appropriate status', function (assert) { + const contributionStatus = this.owner.factoryFor('helper:contribution-status').create(); + const kredits = this.owner.lookup('service:kredits'); + + kredits.set('currentBlock', 23000); + + const contributionUnconfirmed = Contribution.create({ confirmedAt: 23001, vetoed: false }); + const contributionConfirmed = Contribution.create({ confirmedAt: 21000, vetoed: false }); + const contributionVetoed = Contribution.create({ confirmedAt: 23001, vetoed: true }); + + assert.equal(contributionStatus.compute([contributionUnconfirmed]), 'unconfirmed'); + assert.equal(contributionStatus.compute([contributionConfirmed]), 'confirmed'); + assert.equal(contributionStatus.compute([contributionVetoed]), 'vetoed'); + }); +}); diff --git a/tests/unit/helpers/contribution-status.js b/tests/unit/helpers/contribution-status.js deleted file mode 100644 index 785b56c..0000000 --- a/tests/unit/helpers/contribution-status.js +++ /dev/null @@ -1,21 +0,0 @@ -import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; - -module('Unit | Helper | contribution-status', function (hooks) { - setupTest(hooks); - - test('returns the appropriate status', function (assert) { - const contributionStatus = this.owner.factoryFor('helper:contribution-status').create(); - const kredits = this.owner.lookup('service:kredits'); - - kredits.set('currentBlock', 23000); - - const contributionUnconfirmed = { confirmedAt: 23001, vetoed: false }; - const contributionConfirmed = { confirmedAt: 21000, vetoed: false }; - const contributionVetoed = { confirmedAt: 23001, vetoed: true }; - - assert.eq(contributionStatus.compute([contributionUnconfirmed]), 'unconfirmed'); - assert.eq(contributionStatus.compute([contributionConfirmed]), 'confirmed'); - assert.eq(contributionStatus.compute([contributionVetoed]), 'vetoed'); - }); -}); diff --git a/tests/unit/helpers/is-confirmed-contribution.js b/tests/unit/helpers/is-confirmed-contribution.js deleted file mode 100644 index 3db7534..0000000 --- a/tests/unit/helpers/is-confirmed-contribution.js +++ /dev/null @@ -1,21 +0,0 @@ -import { module, test } from 'qunit'; -import { setupTest } from 'ember-qunit'; - -module('Unit | Helper | contribution-status', function (hooks) { - setupTest(hooks); - - test('returns the appropriate status', function (assert) { - const contributionStatus = this.owner.factoryFor('helper:contribution-status').create(); - const kredits = this.owner.lookup('service:kredits'); - - kredits.set('currentBlock', 23000); - - const contributionUnconfirmed = { confirmedAt: 23001, vetoed: false }; - const contributionConfirmed = { confirmedAt: 21000, vetoed: false }; - const contributionVetoed = { confirmedAt: 23001, vetoed: true }; - - assert.notOk(contributionStatus.compute([contributionUnconfirmed]), 'unconfirmed'); - assert.notOk(contributionStatus.compute([contributionVetoed]), 'vetoed'); - assert.ok(contributionStatus.compute([contributionConfirmed]), 'confirmed'); - }); -});