Skip to content

React testing added #122

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

Merged
merged 6 commits into from
Mar 24, 2016
Merged

React testing added #122

merged 6 commits into from
Mar 24, 2016

Conversation

jay-meister
Copy link
Member

Not finished but started on shopping basket

working on #73

@katbow
Copy link
Collaborator

katbow commented Mar 23, 2016

Thanks so much for going through this @JMurphyWeb & @RobStallion !

@jay-meister
Copy link
Member Author

Don't merge just yet - adding new tests this morning

# Conflicts:
#	frontend/package.json
#	frontend/src/css/main.css
#	frontend/src/js/BasketEntry/BasketContainer/ItemContainer/ItemName.jsx
#	frontend/src/js/BasketEntry/BasketContainer/ItemContainer/Price.jsx
@franzmoro franzmoro merged commit 0a76088 into master Mar 24, 2016
@franzmoro franzmoro deleted the react-testing branch March 24, 2016 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants