scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
8168 commits 216 branches 1 tag 474 MiB
Commit graph

430 commits

Author SHA1 Message Date
picklesrus
90ed44d6a8 Fix lint 2020-12-14 20:07:03 -05:00
picklesrus
2f2e95f3e2 Fix merge conflict. 2020-12-14 16:16:09 -05:00
picklesrus
a39244ea6c
Merge branch 'develop' into timeout-mute 2020-12-14 13:27:12 -05:00
picklesrus
242fedbfe6 Add a test that the constructor properly sets muteExpriresAtMs by converting from seconds to ms. 2020-12-14 08:45:08 -05:00
Chris Garrity
57a094179c Fix tests again 2020-12-11 14:42:06 -05:00
Chris Garrity
015f036e93 Update tests 
Tests needed to be updated after wrapping the MuteModal component in the Intl HOC.
 2020-12-11 08:45:29 -05:00
picklesrus
110077e8e8 Rename state's muteExpiresAt to muteExpiresAtMs so units are explicit. 
Also, fix isMuted so it doesn't do an extra unit conversion.
 2020-12-11 08:14:15 -05:00
picklesrus
835a271be4 Show the comment status box on project page loads if the user is muted. 
Don't show the compose box if they're muted, but do show it, but greyed 
out, if they just posted a comment that resulted in a mute.
 2020-12-08 07:28:40 -05:00
picklesrus
f4f6b70f2e
Merge branch 'develop' into readable-time 2020-12-07 16:05:02 -05:00
picklesrus
b1d4c6d1b5 Add backup langauges and remove tests that aren't useful. 2020-12-07 15:38:58 -05:00
picklesrus
b450d36a64 Redo time based on new requirements. 2020-11-30 16:16:52 -05:00
picklesrus
aed0f024c0 Disable comment box functionality when you've just been muted. 
Also, keep showing the blue comment status box based on when the mute 
expires rather than basing it on the status of the commet box itself.

TODO: css for disabled state.  The grey is there as a placeholder/proof 
of concept.
 2020-11-17 17:04:54 -05:00
picklesrus
bfc4202d11 Use singular units so the library handles plurals. 2020-11-13 14:14:42 -05:00
picklesrus
13369c3809 add spaces 2020-11-13 08:37:18 -05:00
picklesrus
6eb7504442 Initial time formatting pass. Does integer minutes, hours, days. 
TODOS:
- set langauge appropriately
- do partial hours and days. e.g. 1 hour 5 minutes instead of just 1
hour.

Add a time formatting utility that formats a relative time in the future.
Use it in the mute modal & comment box.
 2020-11-13 08:26:54 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status. 
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
 2020-11-09 11:01:42 -05:00
BryceLTaylor
b4dfbc0ecf Move Project Rows tests from Tap to Jest 2020-10-20 10:11:23 -04:00
Bryce Taylor
9f6faee25b
Merge pull request #4479 from BryceLTaylor/move-footer-tests-to-jest 
Move footer integration tests to jest
 2020-10-16 09:46:13 -04:00
Bryce Taylor
c24dc24d28
Merge pull request #4496 from BryceLTaylor/skip-failing-project-page-test 
Skip failing project page test
 2020-10-13 11:06:25 -04:00
picklesrus
a567a593fe
Merge pull request #4495 from picklesrus/comment-status 
Commenting status component.
 2020-10-13 09:03:41 -04:00
picklesrus
966df020f2
Merge pull request #4482 from picklesrus/m-modal-draft 
Initial skeleton of mute modal.
 2020-10-13 09:02:47 -04:00
BryceLTaylor
d504fa3cb3 Skip project page copy link integration test 2020-10-09 11:45:01 -04:00
picklesrus
0e6e49759c Commenting status component. 2020-10-08 15:12:09 -04:00
Bryce Taylor
c3f59957d7
Merge pull request #4465 from BryceLTaylor/Move-project-page-tests 
Move project page tests
 2020-10-08 11:20:03 -04:00
Bryce Taylor
b5e2ae705b
Note logged out tests in test/integration/project-page.test.js 
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
 2020-10-06 16:52:07 -04:00
Bryce Taylor
60c6bb8d2c
Add default project id to test/integration/project-page.test.js 
Co-authored-by: Ray Schamp <rschamp@users.noreply.github.com>
 2020-10-06 16:51:31 -04:00
BryceLTaylor
530fb1b87c update match in footer integration tests 2020-10-06 16:42:57 -04:00
BryceLTaylor
8c4303a5b4 match the whole pathname instead of just the end 2020-10-06 15:42:59 -04:00
picklesrus
eccf6be8d2 Add test for mute modal. 2020-10-05 11:09:54 -04:00
picklesrus
6e72f6b4ee Add mute-step unit test. 2020-10-05 08:49:05 -04:00
BryceLTaylor
3d4f579e3a Move footer integration tests to jest 2020-10-02 16:53:52 -04:00
BryceLTaylor
7a50c04885 Move join integration tests to Jest, add some tests 2020-09-30 14:30:00 -04:00
BryceLTaylor
02e3657bca Remove legacy project page tests 2020-09-29 10:57:18 -04:00
BryceLTaylor
2e79da8a1c Use const instead of let when finding chrome version 2020-09-23 17:06:13 -04:00
BryceLTaylor
a2d2eca54c change chromedriver version to a const 2020-09-23 17:02:55 -04:00
BryceLTaylor
ebc54bb100 get chromedriver version from the package 2020-09-23 16:59:00 -04:00
BryceLTaylor
a5f0628751 Move project page tests to jest 2020-09-22 16:30:18 -04:00
BryceLTaylor
8d5b139595 Pin chrome version for saucelabs to chromedriver version 2020-09-14 15:25:01 -04:00
BryceLTaylor
e42ceaf78c Update My-Stuff tests to correctly use ‘expect’ and remove sleeps 2020-08-27 13:42:23 -04:00
BryceLTaylor
78c0720793 Add waits to my-stuff tests so they’ll pass on saucelabs 2020-08-21 10:12:12 -04:00
BryceLTaylor
1aa55ca5a2 Update Chrome version used by sauselabs in tests 2020-08-21 10:11:14 -04:00
Bryce Taylor
25dccfd9a6
Merge pull request #4261 from BryceLTaylor/move-my-stuff-tests-to-jest 
Move my stuff tests to jest
 2020-08-20 10:30:08 -04:00
BryceLTaylor
abd54491e9 Move My Stuff tests to Jest. Unskip some tests. 2020-08-18 16:53:10 -04:00
picklesrus
597216113b
Merge pull request #4293 from LLK/hotfix/messages 
[Develop] Hotfix/messages
 2020-08-10 12:25:45 -04:00
BryceLTaylor
4fcc223df1 Update sign-in-and-out tests 2020-08-07 16:06:01 -04:00
BryceLTaylor
10ed23f11a Revert "Update sign-in-and-out integration tests for new chromedriver" 
This reverts commit c5f83e86f5.
 2020-08-07 16:04:41 -04:00
picklesrus
05075712e8
Merge pull request #4292 from picklesrus/backoff-messages 
Exponentially back off the time between message polling.
 2020-08-07 14:45:56 -04:00
BryceLTaylor
c5f83e86f5 Update sign-in-and-out integration tests for new chromedriver 2020-08-07 12:03:16 -04:00
picklesrus
6078c3653b Puts back the original change but sets the default to Lax instead of Strict. Scratchr2 needs these cookies sent on top level navigations. 2020-08-05 10:50:06 -04:00
picklesrus
62629413a7
Revert "Make the cookie library set the SameSite cookie value to strict by default" 2020-08-03 14:45:34 -04:00
picklesrus
a67a34a06c remove stray debugger 2020-07-30 11:08:34 -04:00
picklesrus
0036550ae8 Move timeout id out of state to a member variable and add some unittests. 2020-07-30 10:55:18 -04:00
BryceLTaylor
ff9d15d24f Remove tap.plan() from footer links test 2020-07-29 14:45:42 -04:00
BryceLTaylor
b24fa33c8d Removed skipped footer integration tests 2020-07-28 16:59:41 -04:00
picklesrus
34c8652ffb Fix capitalization: cookie library we use requires sameSite in opts object to have a lowercase s. 2020-07-20 15:32:54 -04:00
picklesrus
10a4e92d21 Make the cookie library set the SamSite cookie value to strict by default. If callers want to set it to something else, they can pass it through the opts object like they can 'exprires'. 
Also added a test file for jar.js so I could test the set method. The 
other methods remain untested.
 2020-07-20 15:18:09 -04:00
picklesrus
fac3ccad57 Make all times be in ms. 2020-07-17 14:44:36 -04:00
picklesrus
7eeb63cb3f rename SetupMessagePolling to pollForMessages 2020-07-16 12:24:13 -04:00
Benjamin Wheeler
21ccd45f9b
Merge pull request #4121 from apple502j/wiki-link 
Set wiki link per user's selected language
 2020-07-09 14:20:28 -04:00
picklesrus
5de96c373d Exponentially back off the time between message polling instead of doing it every two minutes. 2020-07-06 17:44:28 -04:00
Benjamin Wheeler
dc79eb54c3
Merge pull request #3974 from benjiwheeler/move-to-country-data-lib 
move country name lookup to library
 2020-06-19 10:44:26 -04:00
Ben Wheeler
d388eef59f renamed lookupCountryInfo and lookupCountryName functions 2020-06-19 10:42:34 -04:00
apple502j
a903e3e9b2 Set wiki link per user's selected language 2020-06-18 20:22:22 +09:00
Ben Wheeler
924c862b9e remove email opt-in from join flow 2020-06-12 12:35:34 -04:00
Chris Garrity
d4d40405bf Remove obsolete test 
Check duplicates was added to prevent errors in the conversion to/from PO files back before we switched to Transifex. See https://github.com/LLK/scratch-www/pull/1150
 2020-05-04 08:36:59 -04:00
Ben Wheeler
d1366360f1 removed lodash.debounce, use onmouseleave instead 2020-04-14 10:33:59 -04:00
Ben Wheeler
5805d8a0fe first take on toggleable open close state for info messages 
make info button have large, invisible boundary

fix info button ref setting

WIP: experiment with more sophisticated mouseout handling

add lodash debounce

use lodash debounce to reduce info message flickering

tweak info message position per added padding

remove leftover function

update info button tests, add a bunch more
 2020-04-13 17:06:33 -04:00
Ben Wheeler
05e61cc842 changed student signup route from /join/TOKEN to /signup/TOKEN 2020-04-13 13:11:11 -04:00
Ben Wheeler
81678b70a7 refactored uri pathname parsing to library 2020-04-03 16:11:45 -04:00
picklesrus
f9e48973bc Move reCaptcha codeto a component so it can be used in another spot later. 2020-03-24 17:41:22 -04:00
Ben Wheeler
7b46ddf243 Revert "Merge pull request #3628 from LLK/revert-3618-hotfix/join-retry-session" 
This reverts commit 7c9a098598, reversing
changes made to 2c68f2041e.
 2020-01-14 21:58:38 -05:00
Benjamin Wheeler
1dbe89f2bc
Revert "[Develop] Hotfix/join retry session" 2020-01-09 08:44:27 -05:00
Benjamin Wheeler
ae96ac7eed
Merge pull request #3618 from LLK/hotfix/join-retry-session 
[Develop] Hotfix/join retry session
 2020-01-07 14:36:38 -05:00
Benjamin Wheeler
e0c562bfa6
Merge pull request #3484 from benjiwheeler/join-flow-count-unicode 
count unicode characters as single characters
 2020-01-02 15:15:29 -05:00
Ben Wheeler
d53fe43241 fix bug, updating session request retry code per rschamp's feedback 2019-12-16 17:53:30 -05:00
Ben Wheeler
69e519286d session tests mock api response various ways 2019-12-16 13:35:24 -05:00
Ben Wheeler
0c71121540 session testing WIP 2019-12-14 22:44:38 -05:00
Benjamin Wheeler
6a97d44978
Merge pull request #3576 from benjiwheeler/join-flow-retry-session 
Retry fetching session until it succeeds, when registering using join flow
 2019-12-13 15:03:43 -05:00
Ben Wheeler
8635f3b152 revise join flow tests to use refreshSessionWithRetry 2019-12-05 23:27:13 -05:00
picklesrus
52ae6f791e
Merge pull request #3583 from picklesrus/footer-stuff 
Add recognition text and links to the bottom of the page.
 2019-12-04 17:23:34 -05:00
picklesrus
b89fe1a985 Add recognition text and links to the bottom of the page. 
Adds a prop to the Page component so each page can say whether or not it 
wants them to appear.
 2019-12-04 16:28:23 -05:00
Ray Schamp
f6de9721a1
Merge pull request #3573 from LLK/hotfix/hoc-2019 
[Develop] CSEdWeek 2019 homepage banners
 2019-11-27 16:23:43 -05:00
rschamp
b9e7c10866 Skip tests that fail when hoc banners are active 2019-11-27 15:56:31 -05:00
Paul Kaplan
7129cb2054
Merge pull request #3545 from apple502j/goodbye-jobs-page 
Goodbye jobs page
 2019-11-21 13:13:02 -05:00
Ben Wheeler
419f996f75 revise username spaces test 2019-11-19 16:25:21 -05:00
apple502j
6d9a7d20da Links and test changes 2019-11-19 01:34:19 +09:00
picklesrus
7fa103e344 Skip the join flow smoke test since it was put in place to make sure we didn't launch the new join flow by mistake. 2019-11-18 10:20:02 -05:00
picklesrus
5b351b6515 Roll out new Join Flow. 2019-11-15 11:28:10 -05:00
picklesrus
b845010025
Merge pull request #3503 from picklesrus/join-ga 
Add analytics logging to join flow.
 2019-11-06 11:01:40 -05:00
Benjamin Wheeler
7cea138c46
Merge pull request #3505 from LLK/revert-3495-revert-3468-country-data-name-fix 
Revert "Revert "fixed country options to use full country name string as option value""
 2019-11-06 10:22:31 -05:00
picklesrus
68fc4fe45b Fix merge conflicts :( 2019-11-05 20:01:35 -05:00
picklesrus
c77db39062 Guard calls to componentDidMount with a check for existence. 
Fix tag on username step.
 2019-11-05 19:50:42 -05:00
picklesrus
30967a3056 Set sendAnalytics to be required and send the right props to the error step. Also add a test for the error step. 2019-11-05 19:50:42 -05:00
picklesrus
e4b79c1bd2 Add analytics logging to join flow. Adding page views for each step in the flow. 2019-11-05 19:48:44 -05:00
Ben Wheeler
dd3e1c9f28 update country data test 2019-11-05 18:31:13 -05:00
Benjamin Wheeler
2182853dc6
Revert "Revert "fixed country options to use full country name string as option value"" 2019-11-05 18:07:31 -05:00
Benjamin Wheeler
77fca39bbf
Merge pull request #3485 from benjiwheeler/join-flow-cache-ignores-api-failures 
username step and email step caches ignore api failures
 2019-11-05 12:51:33 -05:00
Ben Wheeler
b2e7a0c9eb revised join flow and registration error tests 2019-11-05 12:12:03 -05:00
Ben Wheeler
0305fff670 added test for error string with no message 2019-11-05 12:12:03 -05:00
Ben Wheeler
b1d71f2a4d revised join flow tests 2019-11-05 12:12:03 -05:00
Ben Wheeler
510906e538 removed stray onCaptchaError from bind list 2019-11-05 12:12:03 -05:00
Ben Wheeler
f713298d37 use class instead of id for identifying errorMsg in test 2019-11-05 12:11:04 -05:00
Ben Wheeler
6e83c496c8 revise and add registration error step tests 2019-11-05 12:11:04 -05:00
Ben Wheeler
2a318af246 revise, add join flow tests 2019-11-05 12:11:03 -05:00
Ben Wheeler
7ec4af6c10 test registration response validation function 2019-11-05 12:11:03 -05:00
Benjamin Wheeler
0d95ad531f
Merge pull request #3483 from benjiwheeler/join-flow-usernames-can-have-underscores 
revise join flow username validation tests
 2019-11-04 18:45:06 -05:00
Ben Wheeler
cb1332fb90 revised and expanded email step tests 2019-11-04 15:34:17 -05:00
Ben Wheeler
b6fcffd6f3 correct misspelled join flow intl id 2019-10-31 23:21:21 -04:00
Benjamin Wheeler
20d9ab64ac
Revert "fixed country options to use full country name string as option value" 2019-10-31 10:56:46 -04:00
Ben Wheeler
53f6b13399 revised tests to distinguish between erroneous remote requests 2019-10-30 17:45:15 -04:00
Ben Wheeler
420e7dfa3e WIP trying to fix tests 2019-10-30 15:34:52 -04:00
Ben Wheeler
a9810b6a1f revised username tests to separate them, make them clearer 2019-10-30 15:16:15 -04:00
Ben Wheeler
7dff707782 split password tests up 2019-10-30 15:09:25 -04:00
Ben Wheeler
6bf27b7e8a count unicode characters as single characters 2019-10-30 15:06:22 -04:00
Benjamin Wheeler
a85c1c3f78
Merge pull request #3468 from benjiwheeler/country-data-name-fix 
fixed country options to use full country name string as option value
 2019-10-21 16:12:25 -04:00
Ben Wheeler
f8986c437c added test for country option value being string 2019-10-21 13:47:57 -04:00
Benjamin Wheeler
d9bd2baf15
Merge pull request #3424 from benjiwheeler/join-flow-splash-join-button 
splash page join button works with new join flow
 2019-10-21 12:18:01 -04:00
Ben Wheeler
0ac6aee937 mock window.location.assign 2019-10-18 11:54:34 -04:00
Ben Wheeler
6d3a379d57 revise registration error tests 2019-10-18 11:40:31 -04:00
Ben Wheeler
80ab13d32f added tests for whether registration modal shows up 2019-10-17 23:38:55 -04:00
Ben Wheeler
c1b3efe572 corrected mocked function name 2019-10-17 23:38:55 -04:00
Ben Wheeler
8c30051bdc mocked event in simulated click 2019-10-17 23:38:54 -04:00
Ben Wheeler
a6cca54647 revise navigation.jsx test 2019-10-17 23:38:54 -04:00
Ben Wheeler
4474b4bc8c add navigation reducer test 2019-10-17 23:38:54 -04:00
Ben Wheeler
16a1fccc27 several tests of join-flow changes 2019-10-17 23:32:26 -04:00
Benjamin Wheeler
3e6e87c3a4
Merge pull request #3417 from benjiwheeler/join-flow-cache-remote 
Join flow cache remote
 2019-10-17 08:23:47 -04:00
Ben Wheeler
226134bc81 renamed ErrorBoundary prop name to componentName 2019-10-11 17:17:50 -04:00
Ben Wheeler
46660a2ff9 revised errorboundary tests 2019-10-10 13:31:25 -04:00
Ben Wheeler
487ca236be Add errorboundary tests 2019-10-10 06:59:09 -04:00
Benjamin Wheeler
b7cb82f1f5
Merge pull request #3374 from benjiwheeler/fastly-latest-active-vcl 
when looking for latest fastly VCL to clone, use only active VCLs
 2019-10-07 19:33:41 -04:00
Ben Wheeler
319c217e62 updated username test to reflect showPassword default 2019-10-01 18:26:56 -04:00
Ben Wheeler
495879d4a9 added tests for caching of username, email remote responses 2019-09-30 22:53:17 -04:00
Benjamin Wheeler
fdeb87fce9
Merge pull request #3383 from benjiwheeler/join-flow-navigate-to-join-page 
scratch3 join flow redirects to /join, outside editor
 2019-09-30 16:44:24 -04:00
Ben Wheeler
bc77322526 clear store between tests 2019-09-30 11:29:47 -04:00
Ben Wheeler
88abed34e9 revised fastly tests, added more 2019-09-26 10:59:55 -04:00
Ben Wheeler
6ff1a1c4f1 add navigation test 2019-09-26 09:29:02 -04:00
picklesrus
0d60b64c39 Add a prop to Modal that allows you to hide the close button. Set it to show by default and have the standalone join flow page set it to hidden. 2019-09-24 13:43:34 -04:00
Ben Wheeler
de5e712305 when looking for latest fastly VCL to clone, use only active VCLs 2019-09-19 14:27:42 -04:00
picklesrus
cdd90da423 Rename error function. 2019-09-19 13:40:09 -04:00
picklesrus
6a45907ded Handle errors of captcha loading by setting error state on JoinFlow. 2019-09-18 10:26:37 -04:00
Ben Wheeler
de4077773a updated email-step test 2019-09-16 20:12:42 -04:00
Ben Wheeler
2c2de08ed3 added tests for RegistrationErrorStep vs Progression 2019-09-10 16:37:10 -04:00
Ben Wheeler
74dbec2d66 registration error test 2019-09-10 16:34:23 -04:00
Ben Wheeler
aec4d90201 join flow test 2019-09-10 16:34:23 -04:00
Ben Wheeler
ee8cdac748 add tests for local email validation 2019-09-05 11:53:47 -04:00
picklesrus
56063ffc7e
Merge pull request #3322 from picklesrus/test-email-step 
Add a unittest for the EmailStep.
 2019-09-04 10:21:51 -04:00
picklesrus
3d58fc4d12 Standardize on using require instead of import. 
Also fix a silly mistaake aand change the way I'm matching the contents 
of formData to be more specific.
 2019-09-03 17:32:31 -04:00
Bryce Taylor
e8a8d6ab94
Merge pull request #3247 from BryceLTaylor/move-integration-tests-to-jest-2 
Move sign in and out integration tests to jest
 2019-08-30 15:31:06 -04:00
picklesrus
c9d7293119 use global.recaptcha instead of global.window.grecaptcha. 2019-08-30 13:42:49 -04:00
picklesrus
bd33b166f7 Add a unittest for the EmailStep. 2019-08-29 18:34:07 -04:00