Skip to content

Commit

Permalink
Merge 8360e1c into 9dc7f42
Browse files Browse the repository at this point in the history
  • Loading branch information
JackNeto committed Jul 2, 2019
2 parents 9dc7f42 + 8360e1c commit c07ca1e
Show file tree
Hide file tree
Showing 54 changed files with 1,479 additions and 984 deletions.
21 changes: 10 additions & 11 deletions mocks/BlockstackMock.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export const blockstackUserSession = {
isUserSignedIn: jest.fn().mockImplementation(() => true),
isSignInPending: jest.fn(),
signUserOut: jest.fn(),
Expand All @@ -10,16 +10,15 @@ module.exports = {
}
},
redirectToSignIn: jest.fn(),
Person: jest.fn(() => {
return {
name: () => {
return 'mocked name'
},
avatarUrl: () => {
return 'mocked url'
}
}
}),
putFile: jest.fn(),
getFile: jest.fn().mockImplementation(() => Promise.resolve('{}'))
}

export const blockstackPerson = {
name: () => {
return 'mocked name'
},
avatarUrl: () => {
return 'mocked url'
}
}
169 changes: 74 additions & 95 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@
"@vx/shape": "0.0.184",
"@vx/tooltip": "0.0.184",
"big.js": "^5.2.2",
"blockstack": "^18.3.0",
"blockstack": "^19.2.1",
"classnames": "^2.2.6",
"d3-array": "^2.0.3",
"date-fns": "^1.30.1",
"formik": "^1.5.1",
"jsdom": "^13.2.0",
"lodash": "^4.17.11",
"papaparse": "^4.6.3",
"pluralize": "^8.0.0",
"prop-types": "^15.7.2",
"query-string": "^6.3.0",
"react": "^16.8.3",
Expand Down Expand Up @@ -93,4 +94,4 @@
"git add"
]
}
}
}
4 changes: 2 additions & 2 deletions src/__tests__/__snapshots__/routes.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ exports[`Routes snapshot matches with no accounts 1`] = `
Sign in with Blockstack
</span>
<span
className="MuiTouchRipple-root-214"
className="MuiTouchRipple-root-224"
/>
</button>
</div>
Expand Down Expand Up @@ -145,7 +145,7 @@ exports[`Routes snapshot matches with no accounts 1`] = `
Take it for a test drive
</span>
<span
className="MuiTouchRipple-root-214"
className="MuiTouchRipple-root-224"
/>
</button>
</div>
Expand Down
Loading

0 comments on commit c07ca1e

Please sign in to comment.