71 Commits

Author SHA1 Message Date
roschaefer
fa0e64b7cb Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie
There was a single step definition that created a post and a comment. I
would say let's put that in two different steps.
2020-02-01 13:33:07 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
roschaefer
910f122087 Fix lint and cypress 2020-01-29 02:02:58 +01:00
roschaefer
fc367297e3 Get rid of different factory files
..and fix some cypress tests
2020-01-28 23:12:50 +01:00
roschaefer
094fa196e6 Fix factories for cypress tests 2020-01-28 22:43:26 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
2020-01-23 20:30:12 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
2020-01-23 19:18:12 +01:00
mattwr18
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
mattwr18
7b73c990ec Remove unintended changes to class name/comment 2020-01-20 10:19:39 +01:00
mattwr18
e31b9ff015 Fix failing cypress test
- the click trigger event lives on avatar-menu-trigger
2020-01-20 10:08:27 +01:00
mattwr18
b7c26f5a3e Revert missed class name to be renamed
- I would like to rename HcPostCard to PostCard, but I decided to do it
in another PR as it's not relevant to the issue this PR addresses
2020-01-20 10:07:27 +01:00
mattwr18
177121d64d Rename class back to open separate PR 2020-01-20 10:07:27 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
Alina Beck
1b127f1efb fix cypress tests (wip) 2020-01-14 15:20:30 +03:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
mattwr18
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00
roschaefer
c20a656405 Follow @mattwr18 suggestions 2019-11-15 12:04:43 +01:00
roschaefer
edbb0c3d1f Fix cypress tests 2019-11-15 11:55:15 +01:00
Wolfgang Huß
d2fd33b102 Fix tests 2019-10-24 12:54:51 +02:00
mattwr18
3dee2137d4 Find annoying user by id 2019-10-01 20:05:34 +02:00
mattwr18
8aa7f376b6 Update Post query for blockedByUsers
- Admin/Moderators see Posts even if they are blocked
2019-10-01 17:45:09 +02:00
Wolfgang Huß
cee0a27b14 Try to fix intermitent failing Cypress test for notification 2019-09-27 16:11:25 +02:00
Wolfgang Huß
7bdc6b52d2 Fixed Cypress tests
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: ogerly <fridolin@tutanota.com>
2019-09-04 20:19:45 +02:00
ogerly
643b931167 Merge branch 'C-1187-terms-and-conditions-confirmed-function' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-09-04 07:04:17 +02:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
e618ff005d
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-04 06:42:40 +02:00
roschaefer
784e1fd911 Fix one more cypress test, implement a factory 2019-09-03 21:28:29 +02:00
roschaefer
4d5769fbc6 Fix cypress tests and factories 2019-09-03 21:28:29 +02:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
roschaefer
66b12090a7 Fix cypress tests 2019-08-30 16:00:32 +02:00
ogerly
27e7bf6279 Cypress tests ok ,terms and conditions after hard work ready to merge 2019-08-30 09:51:00 +02:00
Matt Rider
cf60397477 Fix failing cypress test, add steps
- Added step to expose the search feature was completely broken after my latest commit.
- when a user blocks another user, the search functionality just stopped working.
- reverted changes to @roschaefer hacky fix of the search functionality
2019-08-30 07:47:57 +02:00
ogerly
f28ff69f3a Adaptation of Cypress tests, first attempt 2019-08-30 06:54:25 +02:00
roschaefer
e10629a0fe Fix imports 2019-08-29 11:45:17 +02:00
ogerly
4a4f1b4475 Tests of Cypress changes 2019-08-28 09:25:21 +02:00
Matt Rider
c2d6723837 Fix cypress test, unique category ids/slugs 2019-08-21 10:50:56 +02:00
Matt Rider
e8871f51d4 Refactor cypress tests
- add cypress command to createCategories to DRY out the steps
- remove step from background when isn't directly related to the setup
2019-08-21 10:00:44 +02:00
Matt Rider
512bf32b0c Update cypress tests, fix broken comment reactivity 2019-08-20 21:27:00 +02:00
Matt Rider
8735045d11 Update cypress tests, post query 2019-08-20 20:13:29 +02:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries
Refactor graphql queries
2019-08-19 09:58:38 +02:00
Wolfgang Huß
f653bac9e1 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.spec.js
2019-08-16 18:22:36 +02:00
roschaefer
b27a01438e Damn you're right @mattwr18
You are right with this statement: https://github.com/Human-Connection/Human-Connection/pull/1280#discussion_r314675882
2019-08-16 16:53:38 +02:00
roschaefer
51b734275a The name of the hashtag is now it's ID
`name` was just a redundant attribute
2019-08-16 01:49:29 +02:00
Matt Rider
f12e2a6e16 Add force true to click on Report User 2019-08-15 12:12:00 +02:00
roschaefer
073185d424 All cucumbers implemented 2019-08-13 19:46:01 +02:00
roschaefer
b017203c64 Implement next cucumber scenario 2019-08-13 19:09:56 +02:00
roschaefer
fffd29e867 Sketch cucumber scenarios for blocked user feature
.. first scenario already passing
2019-08-13 18:20:32 +02:00