Skip to content

Commit

Permalink
Updated login (#272)
Browse files Browse the repository at this point in the history
* Updated login

* Updated tests

* small update

* Checking for uplicate transactions

* Small fix
  • Loading branch information
JackNeto authored Sep 18, 2019
1 parent eb56595 commit 41d7560
Show file tree
Hide file tree
Showing 37 changed files with 1,053 additions and 1,105 deletions.
10 changes: 5 additions & 5 deletions mocks/BlockstackMock.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
export const blockstackUserSession = {
isUserSignedIn: jest.fn().mockImplementation(() => true),
isSignInPending: jest.fn(),
isUserSignedIn: jest.fn(() => false),
isSignInPending: jest.fn(() => false),
signUserOut: jest.fn(),
handlePendingSignIn: jest.fn(),
handlePendingSignIn: jest.fn(() => Promise.resolve()),
loadUserData: () => {
return {
profile: {},
username: 'mocked username'
}
},
redirectToSignIn: jest.fn(),
putFile: jest.fn(),
getFile: jest.fn().mockImplementation(() => Promise.resolve('{}'))
putFile: jest.fn(() => Promise.resolve()),
getFile: jest.fn(() => Promise.resolve('{}'))
}

export const blockstackPerson = {
Expand Down
40 changes: 24 additions & 16 deletions package-lock.json

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

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"deploy:test": "npm run build && aws s3 sync build/ s3://entaxy-test --delete",
"deploy:staging": "npm run build && aws s3 sync build/ s3://entaxy-staging --delete",
"deploy:production": "npm run build && aws s3 sync build/ s3://entaxy-production --delete",
"postdeploy:production": "aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_ID --paths '/*' "
"postdeploy:production": "aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_ID --paths '/*' ",
"debug": "echo 'chrome://inspect' && npx react-scripts --inspect-brk test --env=jsdom --runInBand --watch"
},
"dependencies": {
"@material-ui/core": "^4.4.2",
Expand Down Expand Up @@ -97,6 +98,7 @@
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^2.0.1",
"history": "^4.10.1",
"http-proxy-middleware": "^0.20.0",
"husky": "^3.0.5",
"jest-enzyme": "^7.1.1",
Expand Down Expand Up @@ -135,4 +137,4 @@
}
}
}
}
}
242 changes: 0 additions & 242 deletions src/__tests__/__snapshots__/routes.test.jsx.snap

This file was deleted.

Loading

0 comments on commit 41d7560

Please sign in to comment.