119 Commits

Author SHA1 Message Date
ogerly
c09e9a0149 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-08-29 13:45:12 +02:00
roschaefer
d2ce92f2ec Update docs 2019-08-28 14:09:23 +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
c43ed33b7d Add categories for post creation Content.feature 2019-08-20 22:22:27 +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
mattwr18
ab6cd501fe
Merge pull request #1209 from Human-Connection/1054-blocked-users
🍰 1054 blocked users
2019-08-14 16:36:41 +02:00
Matt Rider
a21cf5aef6 Fix cypress test 2019-08-14 15:19:27 +02:00
Matt Rider
6099a986c9 Improve English, update case for English translations 2019-08-14 14:29:35 +02:00
Wolfgang Huß
25981e0f35 Corrected Cypress test 2019-08-14 08:55:44 +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
Robert Schäfer
72edf78889 Meld a chaotic commit history into one commit
Some important commit messages:

```
    Fix youtu.be not being embedded

    And also try to maintain the old behaviour matching
    `provider.provider_url`.
```

```
    Remove confusing code comments and obsolete code

    I discovered that the behaviour of no duplicate notifications being send
    out is caused by the frontend: When the editor reads html from the
    backend, it will parse hashtags and mentions as ordinary links, not as
    their respective nodes during editing. Also, we don't have to worry
    about duplicate ids being found: The cypher statement will implicitly
    suppress duplicate notification nodes for the same user.

    So let's remove the code to avoid confusing the next developer.
```

```
    Test editor.getHTML()

    I do this because I'm not able to test the content of `this.editor` from
    a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
    and use it as a computed property `renderedContent` to populate a `<div
    v-html="renderedContent" />` this will not work for the embeds. So, my
    current best bet is to test the editor object isolated from a real
    component. ;(
```

```
    Add core-js as explicit dependency

    Because of build errors on Travis.

    See: https://stackoverflow.com/a/55313456

    Remove as soon as this issue is resolved:
    https://github.com/storybookjs/storybook/issues/7591

```

```
    Refactor: Keep Runtime-only builds

    See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
2019-08-01 00:28:22 +02:00
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II
375 sorting (II)
2019-07-31 14:49:37 +02:00
Matt Rider
c8a6792627 Add parent class for css selector on cypress/component 2019-07-22 06:50:58 -03:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
Alina Beck
c2887c7b90 add integration test for editing social media 2019-07-16 13:06:34 +02:00
Matt Rider
cf6ace59aa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-15 11:34:42 -03:00
Robert Schäfer
3447cdffeb Chainable factories for cypress 2019-07-10 17:56:36 +02:00
Matt Rider
0113751003 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-10 07:09:58 -03:00
Robert Schäfer
6f4e1b6f30 Fix cypress 2019-07-10 09:01:57 +02:00
Robert Schäfer
4207aee09d DRY up password validations 2019-07-09 22:12:40 +02:00
Matt Rider
fdde050f17 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 967-filter-post-by-category 2019-07-09 13:29:23 -03:00
Matt Rider
e541d88e72 Add force true to userprofile upload
- It was being covered by another element:
<div class="v-popover avatar-menu">...</div>
2019-07-09 10:52:39 -03:00
Matt Rider
014de3b97b Destructure category from result 2019-07-09 07:58:15 -03:00
Alina Beck
4479431486 replace internal links in features doc 2019-07-08 19:27:30 +02:00
Robert Schäfer
10ae4abaae Use neode to bring User mutations under control
This commit takes all backend changes for signup and invite feature. I
was working on these features and removed the generated mutations for
type user along the way.
2019-07-03 15:58:42 +02:00
Matt Rider
f551e9a637 Fix failing build due to lorempixel.com being down 2019-06-22 12:01:00 -03:00
Robert Schäfer
ab719eca3e
Merge pull request #732 from Human-Connection/688-hover-effect-user-image-upload
Hover effect user image upload
2019-06-06 15:54:50 +02:00
Robert Schäfer
3942f03ea1 Fix cypress test 2019-06-05 23:32:28 +02:00
aonomike
21131a1e45 Add cypress test to check date comment posted is displayed 2019-06-04 15:16:01 +03:00
Matt Rider
c6cadc60c3 Remove semicolons added with .vscode linting, unused library 2019-06-03 21:23:11 -03:00
Matt Rider
b5b6c3ef51 Fix cypress test 2019-06-03 20:10:49 -03:00
Matt Rider
cebd1046c7 Write cypress tests, show dropzone conditionally
- If it's the user's profile, show vueDropzone, if not show just the user's avatar
- apollo mutation is being called twice for drag and drop events
2019-05-24 01:26:37 -03:00
Robert Schäfer
a819d6353a Fix probably randomly failing cypress test
@mattwr18 @ulfgebhardt @tirokk @appinteractive @ogerly

I think I just fixed a randomly failing test (so-called "flaky" test).
After an update of `neo4j-graphql-js` I wondered why the
`TagsAndCategories.feature` test failed consistently. It turns out the
table that you can see in the test is ordered by the "Users" column:

|   | Name      | Users  | Posts    |
| 1 | Democracy | 2      | 3        |
| 2 | Ecology   | 1      | 1        |
| 3 | Nature    | 1      | 2        |

So there is a tie between row 2 and row 3. It seems that on version
2.4.0 the backend would return those rows in arbitrary order and now it
returns them in a deterministic order, thus failing the test every time.

Therefore I changed the test setup and I believe this should also make
the build more robust now.
2019-05-17 00:09:54 +02:00
Wolfgang Huß
c4a4d3d1f0 Wrote an additional frontend unit test
Skipped writing of a modal dialog before deletion, because many code parts are on the way in the delete post PR.
So makes no sense to write them twice.
I make a new issue …
2019-05-08 16:04:09 +02:00
Wolfgang Huß
0ffbe567c7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 463-delete-socialMedia 2019-05-08 08:54:11 +02:00
Robert Schäfer
473a7ec95a
Merge pull request #512 from Human-Connection/test-out-cypress-plugin-retries
[WIP] Rerun moderation/report tests on failure
2019-05-07 12:44:26 +02:00
Robert Schäfer
a1b74bef00 Configure 1 retry on Travis 2019-05-07 00:51:18 +02:00
Robert Schäfer
d255a165b4 Delete unused folder cypres/cypress/
Where did that come from? @mattwr18
2019-05-07 00:49:48 +02:00
Robert Schäfer
e23c838aaa Merge remote-tracking branch 'origin/master' into test-out-cypress-plugin-retries 2019-05-07 00:25:52 +02:00