398 commits

Author	SHA1	Message	Date
picklesrus	9a3fe8f222	Show the correct step of the modal based on whether the reply was just a click to try to reply while already muted or whether they replied and got muted.	2021-02-05 08:01:33 -05:00
picklesrus	92667c097d	Add tests and expose steps enum so it can be referenced from outside MuteModal	2021-02-04 11:13:30 -05:00
Sarah Otts	f60a8c71a0	Merge pull request #4901 from seotts/automod-feedback-modal ... Automod feedback modal steps	2021-02-02 08:58:47 -05:00
picklesrus	6d53018486	Merge pull request #4938 from picklesrus/zero-minutes-fix ... Change time library to default to 1 minute when the time remaining is less than 30 seconds.	2021-02-01 15:56:37 -05:00
seotts	ba99d49298	Fix FeedbackForm tests + other small fixes ... Add strings	2021-02-01 15:50:55 -05:00
picklesrus	b8cc0b2b83	Change time library to default to 1 minute when the time remaining is less than 30 seconds.	2021-02-01 09:53:46 -05:00
picklesrus	259446ed8e	Set buttons to be disabled (and not just look disabled) when the user was just muted. They were clickable before.	2021-01-28 15:07:20 -05:00
Chris Garrity	eac7552841	Revise messaging when scratchers are muted ... We want folks to use comments appropriately, not punish them. Reword the messaging to be more friendly and encourage positive uses of comments.	2021-01-26 08:42:41 -05:00
seotts	9df36b0fcf	add tests for feedback form, clean-up form	2021-01-25 17:52:59 -05:00
seotts	14c7a7eae0	temporarily remove failing test	2021-01-22 13:16:44 -05:00
picklesrus	1326f71abe	Merge branch 'develop' into timeout-mute	2021-01-14 07:47:47 -05:00
seotts	c8373ab888	Revert "Revert "Add new mute message types"" ... This reverts commit 1575ed06cf.	2021-01-07 14:04:48 -05:00
Sarah Otts	1575ed06cf	Revert "Add new mute message types"	2021-01-06 16:51:03 -05:00
Sarah Otts	b9892ff6d8	Merge branch 'develop' into automod-new-messaging	2021-01-04 11:09:29 -05:00
picklesrus	15a16e5b58	Merge branch 'develop' into timeout-mute	2020-12-21 08:38:37 -05:00
seotts	7e140b3832	add new mute messages ... Get correct mute message info for modal remove extra spapce	2020-12-18 10:24:43 -05:00
picklesrus	ad5dc31cc7	Have mute modal always show if you post a comment and showWarning is true.	2020-12-18 09:30:02 -05:00
picklesrus	d8ad0c38ea	Show warning message when user has been muted several times.	2020-12-17 15:43:07 -05:00
picklesrus	19b260a4a5	Add a timeout to stop displaying the mute status when a mute expires.	2020-12-15 14:49:35 -05:00
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
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