ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,398 Commits 117 Branches 1,511 Tags
Commit Graph

261 Commits

Author SHA1 Message Date
Wolfgang Huß
7dbc833e22 Merge branch '2144-Add_Search_Results_Page' of https://github.com/Human-Connection/Human-Connection into HC-2144-Add_Search_Results_Page 
# Conflicts:
#	webapp/pages/profile/_id/_slug.vue
 2021-01-18 14:12:13 +01:00
Wolfgang Huß
11aabf0b16 Change maintenance svg 
- Add 'Readme.md' for maintenance mode.
- Refine other Readme's.
 2021-01-07 15:35:52 +01:00
Wolfgang Huß
ee7000c5b9 Replace https://github.com/Human-Connection/Human-Connection 2020-12-03 12:50:47 +01:00
Moriz Wahl
08aaf9c7a6 press enter shows search result page 2020-06-04 16:01:03 +02:00
Moriz Wahl
4a2d250854 cypress test data adjusted to new search mechanism 2020-03-18 20:38:18 +01:00
Moriz Wahl
8f1b3b9f6b cypress test data adjusted to new search mechanism 2020-03-18 20:38:18 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
Raphael Beer
8ffda5e908
Fix: linting, integration tests 2020-03-05 12:02:12 +01:00
ogerly
6472cec0c6 terms-and-condition: the point -no political use - added 2020-02-22 14:38:32 +01:00
mattwr18
a09a767fd1 Visit root path before reloading 2020-02-21 18:58:16 +01:00
mattwr18
e9c0d44055 Favor firefox as test runner in cypress 
- we have recommended our users to use firefox, so why should we test in
  Electron?
 2020-02-21 14:05:01 +01:00
Robert Schäfer
c81de16be0
Merge pull request #3115 from Human-Connection/avoid-async-await-in-cypress 
fix: Favor Cypress.Promise over async/await in e2e tests
 2020-02-21 13:43:36 +01:00
Robert Schäfer
e164104791
Merge pull request #3075 from Human-Connection/3074-don’t-expose-all-properties-of-report 
feat: 🍰 Expose sensitive report type to moderators only
 2020-02-21 12:43:28 +01:00
Robert Schäfer
fa32c5789b
Merge pull request #2870 from Human-Connection/migrate-styleguide-card 
refactor: migrate card component
 2020-02-21 11:59:52 +01:00
mattwr18
db2cc87dc1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into avoid-async-await-in-cypress 2020-02-21 11:30:24 +01:00
mattwr18
0df40386dd Upgrade cypress, remove log out step 
- possibly related to this issue, and removes duplication https://github.com/cypress-io/cypress/issues/5139
 2020-02-20 19:34:27 +01:00
mattwr18
f67a000c11 Stub Websockets, remove vue-loader 
- no reason we need websockets to try connect endlessly
- vue-loader was stopping the cypress tests in debugger at webpack:///./node_modules/vue-style-loader/lib/addStylesClient.js?499e
and we are not using anywhere.
 2020-02-20 18:24:31 +01:00
mattwr18
1fefc6e754 Take advantage of Cypress built-in promises 2020-02-20 12:38:09 +01:00
Wolfgang Huß
a65d94857d Fix filedReport query in Cypress test 2020-02-20 11:11:42 +01:00
mattwr18
447b19eea0 Use cy.exec() to talk to the database 
- Cypress says "To talk to your database or server you need to use the
  cy.exec(), cy.task(), or cy.request() commands. That means you will
need to expose a way to seed and setup your database." https://docs.cypress.io/guides/references/trade-offs.html#Inside-the-browser
 2020-02-20 10:52:36 +01:00
mattwr18
29e01fcd21 Merge branch 'master' of github.com:Human-Connection/Human-Connection into avoid-async-await-in-cypress 2020-02-20 10:50:09 +01:00
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