Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Merge branch 'development' into 223-Try_Catch_Jenkins
Browse files Browse the repository at this point in the history
  • Loading branch information
slaweet authored May 18, 2017
2 parents 85c4aaa + 3f2e401 commit 665817b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/app/components/forging/forging.pug
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ div.offline-hide
div Approval
div.progress-label {{$ctrl.delegate.approval}}%
round-progress(max='100', current='$ctrl.delegate.approval', color='#0288D1')
md-card(layout='column', ng-if='$ctrl.delegate.username')
md-card.forged-blocks(layout='column', ng-if='$ctrl.delegate.username')
md-card-title
md-card-title-text
span.md-title Forged Blocks
Expand Down
2 changes: 1 addition & 1 deletion src/test/components/forging/forging.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('Forging component', () => {

const FORGED_BLOCKS_TITLE = 'Forged Blocks';
it(`should contain a card with title ${FORGED_BLOCKS_TITLE}`, () => {
expect(element.find('md-card .md-title').text()).to.equal(FORGED_BLOCKS_TITLE);
expect(element.find('md-card.forged-blocks .md-title').text()).to.equal(FORGED_BLOCKS_TITLE);
});
});

Expand Down

0 comments on commit 665817b

Please sign in to comment.