Skip to content

Commit

Permalink
Merge pull request #160 from 67P/bugfix/remove_redundant_pending_status
Browse files Browse the repository at this point in the history
Remove redundant pending status from contribution-status helper
  • Loading branch information
raucao committed Nov 15, 2019
2 parents b245742 + 58f1382 commit 97cc710
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 44 deletions.
2 changes: 0 additions & 2 deletions app/helpers/contribution-status.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ export default Helper.extend({
status.push('pending');
}

status.push('pending');

return status.join(' ');
},

Expand Down
22 changes: 22 additions & 0 deletions tests/unit/helpers/contribution-status-test.js
Original file line number Diff line number Diff line change
@@ -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');
});
});
21 changes: 0 additions & 21 deletions tests/unit/helpers/contribution-status.js

This file was deleted.

21 changes: 0 additions & 21 deletions tests/unit/helpers/is-confirmed-contribution.js

This file was deleted.

0 comments on commit 97cc710

Please sign in to comment.