Commit graph

590 commits

Author SHA1 Message Date
BryceLTaylor
bf9b14633f Add studio comment reply integration test 2021-10-29 16:18:18 -04:00
BryceLTaylor
aa594a48fc look for comments actually left in integration tests 2021-10-27 14:47:35 -04:00
BryceLTaylor
aa27e2c809 add project comment reply integration test 2021-10-26 12:02:25 -04:00
BryceLTaylor
45b25c809c update selenium-helper function containsClass 2021-10-22 16:22:11 -04:00
BryceLTaylor
e7b200d472 Add integration tests to check notifications for comments 2021-10-20 10:13:36 -04:00
BryceLTaylor
6de944036c Reconfigure comment integration tests to not sign out as much 2021-10-20 10:13:36 -04:00
BryceLTaylor
e473e9f402 Fix datestring in comment inegration tests to avoid phone number filter 2021-10-20 10:13:36 -04:00
Sarah Otts
c30252a4ed
Merge pull request #5882 from apple502j/move-faq-url
Move FAQ page to /faq
2021-10-12 16:34:41 -04:00
Bryce Taylor
a83c3e5571
Merge pull request #6126 from BryceLTaylor/add-comment-tests
Add comment and notification integration tests
2021-10-04 09:47:34 -04:00
BryceLTaylor
2ada55b590 remove commented out lines in comments test 2021-10-04 09:32:46 -04:00
BryceLTaylor
6571ddb34d Add tests for comment notifications 2021-10-01 14:43:36 -04:00
BryceLTaylor
53b79f64fe Use unique comment for each silo using silo name 2021-10-01 14:42:25 -04:00
seotts
ef3e861fc3 Allow admins to promote curators 2021-09-24 16:12:09 -04:00
Sarah Otts
be0144618d
Merge pull request #6078 from seotts/use-host-in-api-response
Use studio "host" in state, and accept "host" from api
2021-09-21 10:10:59 -04:00
seotts
dc241e1c6f Accept studio "host" from api; use "host" in state 2021-09-17 15:50:16 -04:00
BryceLTaylor
f011258c0a Add integration tests leaving comments on projects, studios, and profiles 2021-09-17 14:41:22 -04:00
Eric Rosenbaum
472a5fa6cd
Merge pull request #6007 from BryceLTaylor/studio-transfer-tests
Add studio transfer test
2021-09-08 09:41:05 -04:00
seotts
9e390d3404 Unit tests for transfer error states 2021-09-07 13:28:20 -04:00
Eric Rosenbaum
1d6c47d2a4
Revert "Revert "Transfer host modal updates"" 2021-09-02 14:43:31 -04:00
Eric Rosenbaum
ad2536e2c6
Revert "Transfer host modal updates" 2021-09-01 10:08:11 -04:00
BryceLTaylor
e077842426 Add studio transfer test 2021-08-30 10:37:19 -04:00
Eric Rosenbaum
ffe1475401 Reload the managers list after transfer 2021-08-26 13:32:34 -04:00
Eric Rosenbaum
5d838ef659 Muted users cannot transfer studio host 2021-08-24 14:36:06 -04:00
Eric Rosenbaum
b00a2d34f7 Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal3 2021-08-20 13:02:08 -04:00
BryceLTaylor
6ec730887c Clean up studio integration tests 2021-08-20 11:26:00 -04:00
BryceLTaylor
f67fcdc495 Check text of curator invite in studio integration test 2021-08-20 11:24:31 -04:00
Eric Rosenbaum
5fd180b558 update test 2021-08-19 21:41:55 -04:00
Eric Rosenbaum
ccb31f2fb5 add unit test for transfer host action 2021-08-19 13:56:37 -04:00
Eric Rosenbaum
dbf9b18d5b add unit test for permissions 2021-08-19 11:59:08 -04:00
BryceLTaylor
63e43abbc8 Look for studio tabs in studio management integration tests 2021-08-18 14:03:48 -04:00
BryceLTaylor
b834569aef Add expect lines to studio management integration tests 2021-08-18 13:46:50 -04:00
BryceLTaylor
a4f71b44fb split promote to studio manager integration tests into subtests 2021-08-18 13:46:50 -04:00
BryceLTaylor
1ec30589f7 move studio creation for management integration tests to beforeAll 2021-08-18 13:46:50 -04:00
BryceLTaylor
2e5055e05a Create sign in function in selenium helpers for integration tests 2021-08-18 13:46:50 -04:00
BryceLTaylor
a060311711 Add comments to jest integration tests about users used in tests 2021-08-18 13:46:50 -04:00
BryceLTaylor
b3226b13f6 Add promote to studio manager integration test 2021-08-18 13:46:50 -04:00
apple502j
9a390eafeb
Move FAQ page to /faq 2021-08-06 02:55:11 +09:00
BryceLTaylor
00154fdde9 Add studio rate limit integration test 2021-07-19 12:01:23 -04:00
Paul Kaplan
d5d3107dc4
Merge pull request #5722 from paulkaplan/fix-failing-permissions-test
test(studios): fix failing permissions tests for studios
2021-07-14 09:04:53 -04:00
Paul Kaplan
51268695f2 test(studios): fix failing permissions tests for studios
there was a test that mutated global fixture data, causing future tests to fail
2021-07-13 14:01:30 -04:00
BryceLTaylor
9f7fa72e9e check rate limit for studio creation integration test 2021-07-09 09:40:25 -04:00
Paul Kaplan
dcf2682f09
Merge pull request #5662 from paulkaplan/test-studio-member-actions
Create detailed unit tests for studio-member-actions
2021-07-07 15:28:55 -04:00
Paul Kaplan
e719d25e3d fix(studio): do not show mute error as if manager can edit info 2021-07-06 10:42:02 -04:00
Karishma Chadha
6dbf8d1bd5
Merge pull request #5692 from kchadha/manager-permissions
Update manager permissions for studios.
2021-07-06 09:22:59 -04:00
Paul Kaplan
0ca3431ec3 test: fix the new test for studio removeManager edge case 2021-06-30 11:26:54 -04:00
Paul Kaplan
e66a31abd8 test(studios): add missing test situations for studio-member-actions 2021-06-30 11:15:11 -04:00
Bryce Taylor
be38360443
Merge pull request #5671 from BryceLTaylor/studio-page-integration-tests
Studio page integration tests
2021-06-28 13:28:43 -04:00
BryceLTaylor
20b74ada3c update integration test for studio page to pass linting 2021-06-28 10:50:07 -04:00
Paul Kaplan
caeb6e476c Fixup incorrectly added code to test files 2021-06-28 09:54:53 -04:00
BryceLTaylor
e485cf29de add studios page integration tests 2021-06-25 17:33:46 -04:00
BryceLTaylor
bf91904a33 update homepage-rows and my-stuff integrationt ests for new studio page 2021-06-25 17:32:57 -04:00
Karishma Chadha
d0ad0a45d4 Update manager permissions for studios. 2021-06-25 12:41:36 -04:00
Paul Kaplan
1027b82f66 Include unit tests for more of the action creators 2021-06-25 10:43:33 -04:00
Paul Kaplan
a9d0ca47d7 Remove unused args 2021-06-24 08:47:52 -04:00
Paul Kaplan
c9ba9d443c Add tests for all studio-member-actions 2021-06-23 21:28:33 -04:00
Paul Kaplan
b5a68924c9
Merge pull request #5651 from paulkaplan/update-reply-count-for-new-replies
Update the reply_count when you leave a reply
2021-06-23 12:38:33 -04:00
Paul Kaplan
810465bfcf
Merge branch 'develop' into no-report-own-comments 2021-06-23 09:49:38 -04:00
Paul Kaplan
581f4d0cac Update the reply_count when you leave a reply 2021-06-22 12:03:13 -04:00
Paul Kaplan
cfd52d9369 Pass a customized comment component for studios 2021-06-21 16:06:40 -04:00
Paul Kaplan
d35cee93f1 Fix unneeded variables 2021-06-21 12:34:49 -04:00
Paul Kaplan
1cace60ebd Fix admin panel space remaining after logging out 2021-06-21 12:25:19 -04:00
picklesrus
740e8c19b6 Add tests for single comment mode. 2021-06-17 16:27:50 -04:00
picklesrus
d3e368bce2
Merge branch 'develop' into studio-comments-off 2021-06-17 13:47:03 -04:00
Karishma Chadha
8821e0e865 Studio creators and managers can delete their own comments 2021-06-16 11:17:43 -04:00
picklesrus
cda92f329d Fix lint 2021-06-15 17:34:05 -04:00
picklesrus
91f1c7ccf9 Merge branch 'studio-comments-off' of https://github.com/picklesrus/scratch-www into studio-comments-off
resolve conflicts
2021-06-15 17:25:22 -04:00
picklesrus
64f9d80c2a
Merge branch 'develop' into studio-comments-off 2021-06-15 17:24:43 -04:00
picklesrus
36516447cc Fix up tests from refactor and fix bug from refactor. 2021-06-15 17:22:32 -04:00
Ray Schamp
a17919e561
Merge pull request #5496 from rschamp/rearrange-conference-2021
Bump Conference 2020 to 2021 (Take 2)
2021-06-14 09:01:51 -04:00
picklesrus
17307cacd3 Add tests 2021-06-10 16:51:41 -04:00
Paul Kaplan
60b154126d
Merge pull request #5467 from seotts/muted-users-cant-edit-studios
Prototype: muted users can't edit studios
2021-05-26 11:01:47 -04:00
Paul Kaplan
cb8a869e4f Merge branch 'develop' into muted-users-cant-edit-studios 2021-05-26 10:58:12 -04:00
rschamp
65f8cc732c Revert "Merge pull request #5493 from LLK/revert-5478-rearrange-conference-2021"
This reverts commit 8cdd89586a, reversing
changes made to 4edab6927e.
2021-05-26 09:40:34 -04:00
Ray Schamp
4c73bdb87c
Revert "Fix integration test broken in #5476" 2021-05-26 09:34:53 -04:00
Bryce Taylor
1a76ecf90c
Merge pull request #4545 from BryceLTaylor/moce-project-rows-tests
Move Project Rows tests from Tap to Jest
2021-05-25 15:57:24 -04:00
BryceLTaylor
a9239985d5 rename project-rows tests to homepage-rows 2021-05-24 17:12:02 -04:00
BryceLTaylor
2c241ce953 increase timeouts for local tests 2021-05-24 17:09:18 -04:00
BryceLTaylor
38c2af740e look for guiPlayer on project page in project rows test 2021-05-24 17:08:45 -04:00
Paul Kaplan
2c53c70307
Merge pull request #5436 from paulkaplan/fix-admin-studio-comments
Wait for session to be fetched before loading comments
2021-05-24 15:32:24 -04:00
Ray Schamp
e012c8065c
Merge pull request #5478 from rschamp/rearrange-conference-2021
Fix integration test broken in #5476
2021-05-24 14:34:01 -04:00
rschamp
59a4146d3b Fix integration test broken in #5476 2021-05-24 14:23:06 -04:00
Bryce Taylor
bfe64aa313
Merge pull request #4540 from BryceLTaylor/move-navbar-tests
Move Navbar integration tests from Tap to Jest
2021-05-24 10:57:21 -04:00
seotts
dbb258cf8b Work on tests
remove failing tests
2021-05-21 10:00:15 -04:00
seotts
4f556785d3 Move whether to show mute both into selectors 2021-05-21 10:00:15 -04:00
seotts
19a9997e0f Muted users can’t edit studios
linting fixes
2021-05-21 09:46:19 -04:00
Paul Kaplan
8832d31fd9
Merge pull request #5444 from paulkaplan/studio-admin-panel
Studio admin panel
2021-05-20 09:37:59 -04:00
BryceLTaylor
511933cde8 use Circle’s BUILD_NUM instead of WORKFLOW_ID in saucelabs tests 2021-05-18 14:36:59 -04:00
Paul Kaplan
b38a97adf3 Studio admin panel 2021-05-18 11:41:32 -04:00
BryceLTaylor
c13f2ef598 Check if using circle and add default workflow id to tests and check 2021-05-18 11:32:38 -04:00
BryceLTaylor
7ea74eb431 Use circleCI build ID for saucelabs test names 2021-05-18 09:43:16 -04:00
Paul Kaplan
53414e11a9 Update tests 2021-05-17 15:31:08 -04:00
Paul Kaplan
acc88069e9 Allow curators to remove themselves 2021-05-14 12:37:05 -04:00
Paul Kaplan
f61047dda0
Merge branch 'develop' into add-studio-activity-pagination 2021-05-11 13:38:15 -04:00
Paul Kaplan
0fdf54339a Merge branch 'develop' into add-studio-activity-pagination 2021-05-11 12:09:10 -04:00
Paul Kaplan
443dcc28e2 Merge branch 'develop' into feature/studio-project-modal 2021-05-11 12:04:05 -04:00
Paul Kaplan
fbd8908a83 Fix lint 2021-05-10 21:06:31 -04:00
Paul Kaplan
f474525398 Remove unused loadMore functionality from infinite list because it was overly specific, now it is no longer being used by any component 2021-05-10 14:14:46 -04:00
Paul Kaplan
95766fd68a Add clear to infinite list, fixup tests 2021-05-10 10:22:18 -04:00
Paul Kaplan
3785108348 Promoted and added curators should go at the end of the list 2021-05-06 09:14:15 -04:00
Paul Kaplan
699e30dedd Fix curator permissions for removing projects 2021-05-03 13:26:50 -04:00
Paul Kaplan
c3d266f3ba Add in pending tests for missing project removal functionality 2021-05-03 10:59:52 -04:00
Paul Kaplan
0f8baaaa45 Add tests for new studio permissions 2021-05-03 10:52:04 -04:00
Paul Kaplan
ef9318463e Reset comments when admin logs in 2021-04-29 09:00:50 -04:00
Paul Kaplan
5827aaab8f Update permissions for editing open_to_all to match current backend 2021-04-27 09:06:40 -04:00
Paul Kaplan
f9419ac8fc Fix comment toggling and add permissions test 2021-04-26 15:11:06 -04:00
Paul Kaplan
647575e4a8 Move permissions into its own reducer 2021-04-21 14:52:56 -04:00
Paul Kaplan
82da633e61 Add title, description and following editors 2021-04-21 14:52:56 -04:00
Paul Kaplan
c789a27018 Fix logged in selector with test 2021-04-21 14:52:53 -04:00
Paul Kaplan
11794d885a Add permissions selectors and tests for studio comments 2021-04-08 10:36:56 -04:00
BryceLTaylor
7a5bdc0400 Change class for search input wrapper to search-wrapper 2021-04-06 14:19:05 -04:00
BryceLTaylor
0cd1f6e6be Add class to searchbar for automated tests 2021-04-06 14:19:05 -04:00
BryceLTaylor
37d279f6e5 Search for the gui component in navbar create test 2021-04-06 14:19:05 -04:00
BryceLTaylor
6bea2b3a2c Remove leftover comment in navbar test 2021-04-06 14:19:05 -04:00
BryceLTaylor
7edb0b2cb8 Move Navbar integration tests from Tap to Jest 2021-04-06 14:19:05 -04:00
Paul Kaplan
8267dcf16a Fix TODO and add selector for studio comment capability 2021-04-02 12:43:32 -04:00
Paul Kaplan
dc460fffde Merge branch 'develop' into studio-selectors 2021-04-02 12:36:44 -04:00
Paul Kaplan
cd8ae4b197 Use lodash.get to simplify permissions, move test data into fixtures for better testing 2021-04-02 12:33:18 -04:00
Paul Kaplan
9252d56376 Merge branch 'develop' into comments-reducer 2021-03-24 14:35:12 -04:00
seotts
f6f1095d93 add justMuted variable, fix linting 2021-03-23 16:33:24 -04:00
seotts
60bf05fbbf Reuse l10n strings instead of duplicating them 2021-03-23 15:45:16 -04:00
Paul Kaplan
99195d6df3 Add studio selector and tests 2021-03-23 15:19:01 -04:00
Paul Kaplan
f03fbb503b Add session selector and tests 2021-03-23 15:18:36 -04:00
Paul Kaplan
2265cd0d90 Add permissions selector and tests 2021-03-23 15:18:17 -04:00
seotts
ccab9566b8 Show different modal message when muted in the past 2021-03-23 11:00:01 -04:00
Sarah Otts
059b6bf2c5
Merge pull request #5166 from seotts/message-already-muted
When a user is already muted, show a different message in the blue box
2021-03-22 10:20:15 -04:00
seotts
d8a802fca2 Test that status gets correctly set in constructor 2021-03-19 15:42:54 -04:00
seotts
1744108570 Add test of shoudShowMuteModal when isReply 2021-03-19 15:29:29 -04:00
seotts
94eb3dc6de Continued work 2021-03-18 16:15:11 -04:00
Paul Kaplan
296c04ff99 Merge branch 'develop' into comments-reducer 2021-03-18 11:20:47 -04:00
seotts
23da1e2781 Continued work 2021-03-17 16:07:30 -04:00
Paul Kaplan
6b87429e65 Create a redux module for infinitely loading editable lists 2021-03-16 14:17:52 -04:00
chrisgarrity
8271bb62bb
Merge pull request #5141 from seotts/prevent-feedback-when-not-just-muted
Prevent feedback when not just muted
2021-03-15 09:10:48 -04:00
seotts
50f49c28a2 remove commented-out test 2021-03-11 16:31:59 -05:00
seotts
936172d70b only show feedback link for new mute
Add variable for isBad string
2021-03-11 13:06:51 -05:00
picklesrus
3dfcfa1e9d Remove unused tests 2021-03-08 17:22:05 -05:00
Ben Wheeler
466684cea3 updated chromedriver using npm install --save 2021-03-08 15:44:55 -05:00
Benjamin Wheeler
4c880895fa
Revert "Bump chromedriver version to 88, increase jest integration timeouts" 2021-03-08 15:22:39 -05:00
Paul Kaplan
27dafac7f0 Move comments out of project reducer 2021-03-08 12:01:22 -05:00
BryceLTaylor
2933fbce94 Bump chromedriver version to 88, increase jest integration timeouts 2021-03-08 10:23:03 -05:00
seotts
0a8d8ad6c5 Fix and add tests for feedback link 2021-02-11 15:44:25 -05:00
picklesrus
de5a8026c1 Show the blue box on replies that got the user muted. 2021-02-05 08:16:00 -05:00
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