440 Commits

Author SHA1 Message Date
mattwr18
6c32104330 Clean database with neode and Cypress.Promise 2020-02-20 09:55:35 +01:00
Alina Beck
701564c708 Merge branch 'master' into migrate-styleguide-card 2020-02-20 00:37:07 +01:00
Alina Beck
46616f5e6b update cypress tests 2020-02-19 20:50:40 +01:00
roschaefer
1a0dd36edd chore(cypress): Remove debug statements 2020-02-19 16:51:49 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
mattwr18
44652a34a7 Merge in master/refactor
- Add cypress test for DeleteImage
- remove unnecessary ref and function call
- use tokens
- simplify logic to showDeleteImageButton
- emit event when cropInProgress
2020-02-18 18:50:02 +01:00
mattwr18
6f6b1534df Reload page to add Category button
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
2020-02-18 13:33:34 +01:00
mattwr18
0f74273b5b Let post factory create default category
- since we have factories that ensure a post has a category created, we
  don't need extra code to create a category before the post
2020-02-18 10:36:34 +01:00
mattwr18
ee3a85f70f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-18 09:38:56 +01:00
roschaefer
2ca4939ef0 Refactor: Don't use async/await in cypress 2020-02-18 00:30:53 +01:00
mattwr18
1ca8a7fc86 Fix other syntax error :doh: 2020-02-17 21:23:49 +01:00
mattwr18
119e542e86 Fix syntax error 2020-02-17 20:51:13 +01:00
mattwr18
a2f78462d2 Use promise for creating category 2020-02-17 20:23:09 +01:00
mattwr18
54af884e50 Log out before logging in as other user 2020-02-17 18:38:51 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
mattwr18
6d635bac1d Wait for category to be created 2020-02-17 12:41:46 +01:00
mattwr18
7ce40b3b37 Fix cypress test 2020-02-14 20:44:39 +01:00
mattwr18
d8d1db389a Follow @roschaefer PR review suggestions
- create mapping for expectedValues in post.js
- check from image/jpeg and compress, if not just pass to backend as is
2020-02-14 19:49:00 +01:00
mattwr18
fa02a4dd33 Write cypress tests for ImageUploader
- have I missed any important features? too many tests?
2020-02-12 17:53:38 +01:00
Alina Beck
f1efdbad7d fix final failing cypress test 2020-02-12 00:27:40 +01:00
mattwr18
fb429f6ef3 Fix BlockUser/MuteUser.feature 2020-02-11 21:57:20 +01:00
mattwr18
2adfe1665b Implement direct login in cypress tests
- there is a manualLogin for tests which test the manual logging in, all
  others just set the cookie in the frontend
2020-02-11 21:44:19 +01:00
Alina Beck
53931a38e5 fix cypress tests 2020-02-11 19:47:05 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2020-02-10 16:25:00 +01:00
mattwr18
c2802aa4f2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3033-fix-block-users-bug 2020-02-10 14:24:32 +01:00
mattwr18
3b29d480e3 Display unblock feature only for blocking user
- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
2020-02-10 12:34:40 +01:00
roschaefer
3c50255da2 Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie 2020-02-07 14:07:19 +01:00
Robert Schäfer
a9b7318874
Merge pull request #2826 from Human-Connection/error-pages
fix: Error pages can be translated
2020-02-07 11:59:33 +01:00
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
ce42b2b8e9 Update cypress test casing 2020-01-31 14:45:27 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +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
Moriz Wahl
04ff82f880 Cypress test fixed 2020-01-28 10:18:15 +01:00
mattwr18
35395d15a2 Add missing . for chain method 2020-01-27 20:37:54 +01:00
mattwr18
d6a2f2d9e3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-27 20:08:37 +01:00
mattwr18
b48b93dd0d Set up cypress test for direct reply to comment 2020-01-27 15:07:32 +01:00
mattwr18
f8f62cc71f Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-23 20:42:44 +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
8accc62f18 Merge branch 'master' of github.com:Human-Connection/Human-Connection into neo4j_data_migrations 2020-01-22 15:23:11 +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
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content
feat: Convert block/unblock to mute/unmute
2020-01-21 17:05:09 +01:00
mattwr18
46343c923c Fix cypress tests after renamed variables 2020-01-21 17:03:50 +01:00
roschaefer
b063847849 refactor: Make db:setup init stage of migrate 2020-01-20 11:00:52 +01:00
mattwr18
7b73c990ec Remove unintended changes to class name/comment 2020-01-20 10:19:39 +01:00
mattwr18
74a7db5388 Convert missed ds-avatar, fix cypress test 2020-01-20 10:08:27 +01:00