Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

automatic release created for v1.0.0-beta.10 #2132

Merged
merged 54 commits into from
Mar 1, 2019
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
99f04f7
Merge remote-tracking branch 'origin/develop' into fedekunze/show-rew…
Feb 22, 2019
1cdcaa9
Merge branch 'fabo/sign-in-bug' into fedekunze/show-rewards
Feb 22, 2019
8face0f
displaying rewards
Feb 22, 2019
fa65c6c
li proposal test refactor
jbibla Feb 23, 2019
80002e9
added test for rewards on livalidator
Feb 25, 2019
05c73b0
test for rewards on tmbalance
Feb 25, 2019
f0667de
remover obsolete prop
Feb 25, 2019
82a971d
removed dev flag for rewards from pageval
Feb 25, 2019
347ea4d
updated snapshots
Feb 25, 2019
43a8bbb
Merge remote-tracking branch 'origin/develop' into fedekunze/show-rew…
Feb 25, 2019
75b8995
changelog
Feb 25, 2019
f7d6964
Merge branch 'develop' into jordan/1337-li-proposal-tests
jbibla Feb 26, 2019
1eaa696
cleaned up LiProposal test
jbibla Feb 26, 2019
ece846e
lint
jbibla Feb 26, 2019
7fa5491
cha cha cha
jbibla Feb 26, 2019
d7b6acf
pull develop changes
Feb 26, 2019
7465c17
lint
Feb 26, 2019
87438be
update rewards on every block
Feb 27, 2019
7e934c3
lint
Feb 27, 2019
0a85088
snaps
Feb 27, 2019
854453e
Merge branch 'develop' into jordan/1337-li-proposal-tests
jbibla Feb 27, 2019
27dd92d
fixed tests and eslint was complaining
jbibla Feb 27, 2019
d4b5cbe
outstanding rewards on page network
Feb 27, 2019
c07ba6c
minor UI changes and tests
Feb 27, 2019
20cb03e
fix tests
Feb 27, 2019
1a3ef00
DRYed out tests (danke karoly)
jbibla Feb 27, 2019
c89bddc
cov and fixes
Feb 27, 2019
4ebf217
remove jsdoc and jsdoc vue comment blocks
sabau Feb 27, 2019
1ddca38
changeloggit
sabau Feb 27, 2019
f2a23f0
Update CHANGELOG.md
jbibla Feb 27, 2019
bbc8c5a
Merge branch 'develop' into sabau/2023-kill-jsdoc
sabau Feb 27, 2019
3d17042
fix webpack environment variables
sabau Feb 27, 2019
f2eaf73
tests and more coverage
Feb 27, 2019
70534a9
fix conflicts
Feb 27, 2019
489946f
Update CHANGELOG.md
fedekunze Feb 27, 2019
edbfeb0
Update CHANGELOG.md
fedekunze Feb 27, 2019
bc88596
coverage 3
Feb 27, 2019
725ff1e
Merge branch 'fedekunze/show-rewards' of https://github.com/cosmos/vo…
Feb 27, 2019
dc2c851
Merge pull request #2119 from cosmos/sabau/2023-kill-jsdoc
faboweb Feb 28, 2019
f7f1420
Merge pull request #2124 from cosmos/release-candidate/v1.0.0-beta.9
faboweb Feb 28, 2019
eaff574
faucet deserve his places in the olympus of the env variables
sabau Feb 28, 2019
5fc87df
Merge branch 'develop' into jordan/1337-li-proposal-tests
faboweb Feb 28, 2019
f8fc804
Merge pull request #2074 from cosmos/jordan/1337-li-proposal-tests
faboweb Feb 28, 2019
0dda8c5
revert to DefinePlugin, we have more control
sabau Feb 28, 2019
fe54055
Update webpack.renderer.config.js
sabau Feb 28, 2019
62656e7
Merge pull request #2120 from cosmos/saabu/fix-webpack-env-variables
faboweb Feb 28, 2019
63efced
Fabo/2044 uatoms (#2105)
faboweb Feb 28, 2019
50c038b
merge atoms/uatoms; fix tests and conflicts
Feb 28, 2019
419e90e
linted
Feb 28, 2019
f08ba48
defense ! defense !
Feb 28, 2019
3b53c3b
Merge pull request #2049 from cosmos/fedekunze/show-rewards
faboweb Feb 28, 2019
c34fe78
Fabo/1337 refactored table validators tests + my delegations (#2081)
faboweb Feb 28, 2019
81b09db
Bump version for release.
Mar 1, 2019
9364ddd
Merge branch 'master' into release-candidate/v1.0.0-beta.10
faboweb Mar 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
coverage 3
Federico Kunze committed Feb 27, 2019
commit bc885962ad19cf7b12cfec0dc980a1efcb381618
9 changes: 2 additions & 7 deletions app/src/renderer/components/staking/TableValidators.vue
Original file line number Diff line number Diff line change
@@ -138,8 +138,8 @@ export default {
}
},
watch: {
address: function(address) {
address && this.updateDelegates()
address: function() {
this.session.address && this.$store.dispatch(`updateDelegates`)
},
validators: function(validators) {
if (
@@ -152,11 +152,6 @@ export default {

this.$store.dispatch(`getRewardsFromAllValidators`, validators)
}
},
methods: {
updateDelegates() {
this.$store.dispatch(`updateDelegates`)
}
}
}
</script>
22 changes: 22 additions & 0 deletions test/unit/specs/components/staking/PageValidator.spec.js
Original file line number Diff line number Diff line change
@@ -257,6 +257,28 @@ describe(`PageValidator`, () => {
expect(rewardsString).toBeNull()
})
})

it(`doesn't call user rewards if not signed in`, () => {
const session = { signedIn: false }
const $store = { dispatch: jest.fn() }
const $route = { params: { validator: `cosmos1address` } }
PageValidator.mounted.call({ session, $store, $route })
expect($store.dispatch).not.toHaveBeenCalledWith(
`getRewardsFromValidator`,
$route.params.validator
)
})

it(`updates rewards if block hasn't updated`, () => {
const $store = { dispatch: jest.fn() }
const session = { signedIn: false }
const $route = { params: { validator: `cosmos1address` } }
PageValidator.watch.lastHeader.handler.call({ session, $store, $route })
expect($store.dispatch).not.toHaveBeenCalledWith(
`getRewardsFromValidator`,
$route.params.validator
)
})
})

describe(`delegationTargetOptions`, () => {
14 changes: 11 additions & 3 deletions test/unit/specs/components/staking/TableValidators.spec.js
Original file line number Diff line number Diff line change
@@ -89,9 +89,17 @@ describe(`TableValidators`, () => {
})

it(`queries delegations on signin`, () => {
const updateDelegates = jest.fn()
TableValidators.watch.address.call({ updateDelegates }, `cosmos1address`)
expect(updateDelegates).toHaveBeenCalled()
const session = { address: `cosmos1address` }
const $store = { dispatch: jest.fn() }
TableValidators.watch.address.call({ $store, session })
expect($store.dispatch).toHaveBeenCalledWith(`updateDelegates`)
})

it(`doesn't query delegations if not signed in`, () => {
const session = { address: undefined }
const $store = { dispatch: jest.fn() }
TableValidators.watch.address.call({ $store, session })
expect($store.dispatch).not.toHaveBeenCalledWith(`updateDelegates`)
})

describe(`update validators rewards every block`, () => {
8 changes: 8 additions & 0 deletions test/unit/specs/store/distribution.spec.js
Original file line number Diff line number Diff line change
@@ -96,6 +96,14 @@ describe(`Module: Fee Distribution`, () => {
})
})

describe(`resetSessionData`, () => {
it(`should clear all distribution data`, () => {
state.totalRewards = { stake: 10 }
actions.resetSessionData({ rootState })
expect(rootState.distribution.totalRewards).toEqual({})
})
})

describe(`getTotalRewards`, () => {
it(`success`, async () => {
await actions.getTotalRewards({ state, rootState, commit })