Commit Graph
11390 Commits
Author SHA1 Message Date
Paul Kaplan 1e26992f45 Fix enzyme tests 2017-10-13 12:57:19 -04:00
Ray Schamp a01c793081 Pin react-test-renderer to React version
These version together so track them together.
2017-10-13 12:56:45 -04:00
Ray Schamp c5404bffa7 Update enzyme usage for 3.1.0
Add a setup file that configures the React adapter. Fix one deprecated usage for ProjectLoaderHOC tests.

There are some tests still broken, but these weren't called out by Enzyme.
2017-10-13 12:56:44 -04:00
greenkeeper[bot] 3b386f950f chore(package): update enzyme to version 3.1.0
Closes #708
2017-10-13 12:56:43 -04:00
DD 0aaea4bb6b Add pauls code to hook into storage and fix comments on PR 2017-10-13 12:08:26 -04:00
DD 97811b9991 fix lint 2017-10-12 17:31:17 -04:00
DD b4bb1e6659 remove svg renderer package which doesnt exist yet 2017-10-12 14:53:21 -04:00
DD ef9f8a1f99 send down rotation center 2017-10-12 14:52:14 -04:00
DD 94a05bf340 Pass the handle update function to the paint editor 2017-10-12 14:52:14 -04:00
DD cc4f67126c pass svg to the paint editor 2017-10-12 14:52:14 -04:00
DD f91f328f2e Things we're trying to integrate paint into gui 2017-10-12 14:52:14 -04:00
Chris Willis-Ford 59f2697bb1 Merge pull request #691 from cwillisf/fix-tests-on-windows
Fix tests on Windows
2017-10-11 11:10:01 -07:00
Chris Willis-Ford f5289655a8 Merge branch 'develop' into fix-tests-on-windows 2017-10-11 09:51:53 -07:00
Paul Kaplan b49408e3fd Merge pull request #753 from paulkaplan/fix-travis-again
Fix travis again by pinning chromedriver and selenium versions
2017-10-11 11:18:28 -04:00
Paul Kaplan 0dca06de26 Pin chromedriver and selenium 2017-10-11 11:13:09 -04:00
Paul Kaplan 6a4d5a9462 Add duplicate method for sprite selector item 2017-10-11 10:46:24 -04:00
chrisgarrity c8b068b2f1 updating string ids to follow convention (#700)
Changed existing string ids to use the convention `<repo>.<component>.<identifier>`
2017-10-06 12:51:51 -04:00
Paul Kaplan 0c5810ee22 Merge pull request #717 from bartljak/issue-#701
Fixed issue causing right click to drag sprite.
2017-10-06 10:50:23 -04:00
Paul Kaplan 3dc4c7061e Merge pull request #741 from paulkaplan/say-think-blocks
Add say and think blocks to the toolbox XML
2017-10-06 10:47:53 -04:00
Ray Schamp b4e9c74436 Merge pull request #744 from paulkaplan/fix-selenium-tests
Fix selenium tests
2017-10-06 10:45:02 -04:00
Paul Kaplan 104cc12ce8 Add integration tests back to the default test command 2017-10-06 09:50:47 -04:00
Paul Kaplan 5ca2693b60 Scope clickText calls using tab ids 2017-10-06 09:48:10 -04:00
Josiah Neuberger 0d44f130f5 Merge remote-tracking branch 'upstream/develop' into add-full-screen-render-view 2017-10-05 19:45:29 -04:00
greenkeeper[bot] 1fbacaea32 chore(package): update postcss-import to version 11.0.0 2017-10-05 16:05:40 -04:00
greenkeeper[bot] 3d5f5c29f9 chore(package): update style-loader to version 0.19.0 2017-10-05 15:56:43 -04:00
Ray Schamp 9066350b84 Merge pull request #740 from LLK/greenkeeper/react-tabs-2.1.0
Update react-tabs to the latest version 🚀
2017-10-05 15:55:45 -04:00
Ray Schamp 3e7db02665 Merge pull request #742 from LLK/greenkeeper/eslint-config-scratch-5.0.0
Update eslint-config-scratch to the latest version 🚀
2017-10-05 15:54:30 -04:00
Jake Bartles 2437720093 changes event.which to event.button to adhere to MDN standards 2017-10-05 15:52:18 -04:00
Ray Schamp 6fa71e6162 Update babel-eslint peer dependency
Resolves #676
2017-10-05 10:37:53 -04:00
greenkeeper[bot] 645598e786 chore(package): update eslint-config-scratch to version 5.0.0 2017-10-05 14:05:20 +00:00
Paul Kaplan 6a03067594 Add say and think blocks 2017-10-05 09:57:23 -04:00
greenkeeper[bot] 6a593435a1 chore(package): update react-tabs to version 2.1.0 2017-10-05 12:31:31 +00:00
Ray Schamp ee54c35fd9 Merge pull request #739 from LLK/develop
Pull develop into master
2017-10-04 16:55:49 -04:00
Ray Schamp b8a6e051e8 Merge pull request #738 from LLK/npm-publish
Publish to NPM
2017-10-04 16:49:09 -04:00
Ray Schamp a4b43144a2 Publish to NPM 2017-10-04 16:47:24 -04:00
Paul Kaplan 933cfdd33f Merge pull request #734 from ericrosenbaum/feature/top-blocks
Add “top” category to toolbox xml
2017-10-04 14:06:50 -04:00
Paul Kaplan 0d37fdb391 Merge pull request #733 from ericrosenbaum/bugfix/sync-toolbox
Sync toolbox
2017-10-04 14:02:16 -04:00
Paul Kaplan 8b85829288 Merge pull request #737 from paulkaplan/fix-develop-deploy
Add npm run build to the test to cover for removed integration tests
2017-10-04 14:00:26 -04:00
Paul Kaplan c58316caf5 Add npm run build to the test to cover for removed integration tests 2017-10-04 13:53:27 -04:00
Jake Bartles e8f4f65d82 checking for right click instead of left click now 2017-10-04 13:28:26 -04:00
Jake Bartles a453cc9c20 all changes reverted, bugs should be gone 2017-10-04 13:12:08 -04:00
Jake Bartles 38179e175b reverted changes to see if bugs go away 2017-10-04 13:08:36 -04:00
Eric Rosenbaum 9a73ef6051 Add “top” category to toolbox xml 2017-10-03 12:49:34 -04:00
Eric Rosenbaum 611a4c2542 Add pen transparency blocks back into toolbox 2017-10-03 12:34:18 -04:00
Eric Rosenbaum 8470b080dd Use the existing value of the prop for the toolbox 2017-10-03 11:40:22 -04:00
Eric Rosenbaum 8f14d313df Add the “glide to” block back into toolbox xml 2017-10-03 11:33:07 -04:00
Eric Rosenbaum b24970f271 Re-order categories 2017-10-03 11:33:07 -04:00
Eric Rosenbaum e01adbaa37 Load the gui’s toolbox on mount
To prevent loading scratch-blocks default toolbox
2017-10-03 11:33:06 -04:00
Eric Rosenbaum 806eee3b77 Merge pull request #726 from ericrosenbaum/bugfix/remove-integration-test
Remove integration test
2017-10-02 18:16:19 -04:00
Eric Rosenbaum a5166dfd75 Remove integration test 2017-10-02 18:08:27 -04:00