diff --git a/backend/package.json b/backend/package.json index 6e995407a..a3f03f1fb 100644 --- a/backend/package.json +++ b/backend/package.json @@ -10,7 +10,7 @@ "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js -e js,graphql", "lint": "eslint src --config .eslintrc.js", "test": "run-s test:jest test:cucumber", - "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 yarn run dev 2> /dev/null", + "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 yarn run dev", "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DISABLED_MIDDLEWARES=permissions,activityPub yarn run dev", "test:jest:cmd": "wait-on tcp:4001 tcp:4123 && jest --forceExit --detectOpenHandles --runInBand", "test:cucumber:cmd": "wait-on tcp:4001 tcp:4123 && cucumber-js --require-module @babel/register --exit test/", @@ -94,4 +94,4 @@ "nodemon": "~1.18.11", "supertest": "~4.0.2" } -} +} \ No newline at end of file diff --git a/cypress/integration/06.Search.feature b/cypress/integration/05.Search.feature similarity index 100% rename from cypress/integration/06.Search.feature rename to cypress/integration/05.Search.feature diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js index 8944b7c25..9478d8d4e 100644 --- a/cypress/integration/common/steps.js +++ b/cypress/integration/common/steps.js @@ -228,7 +228,7 @@ Then('I get redirected to {string}', route => { }) Then('the post was saved successfully', () => { - cy.get('.ds-card-header > .ds-heading').should('contain', lastPost.title) + cy.get('.ds-card-content > .ds-heading').should('contain', lastPost.title) cy.get('.content').should('contain', lastPost.content) }) diff --git a/package.json b/package.json index be1e4a90d..b22dd158c 100644 --- a/package.json +++ b/package.json @@ -25,4 +25,4 @@ "neo4j-driver": "^1.7.3", "npm-run-all": "^4.1.5" } -} +} \ No newline at end of file diff --git a/webapp/components/Category/Readme.md b/webapp/components/Category/Readme.md new file mode 100644 index 000000000..50e07f966 --- /dev/null +++ b/webapp/components/Category/Readme.md @@ -0,0 +1,7 @@ +### Example + +Category "IT, Internet & Data Privacy" with icon "mouse-cursor" + +``` + +``` \ No newline at end of file diff --git a/webapp/components/Category/index.spec.js b/webapp/components/Category/index.spec.js new file mode 100644 index 000000000..149f96189 --- /dev/null +++ b/webapp/components/Category/index.spec.js @@ -0,0 +1,35 @@ +import { shallowMount, createLocalVue } from '@vue/test-utils' +import Styleguide from '@human-connection/styleguide' +import Category from './index' + +const localVue = createLocalVue() +localVue.use(Styleguide) + +describe('Category', () => { + let icon + let name + + let Wrapper = () => { + return shallowMount(Category, { + localVue, + propsData: { + icon, + name + } + }) + } + + describe('given Strings for Icon and Name', () => { + beforeEach(() => { + icon = 'mouse-cursor' + name = 'Peter' + }) + + it('shows Name', () => { + expect(Wrapper().text()).toContain('Peter') + }) + it('shows Icon Svg', () => { + expect(Wrapper().contains('svg')) + }) + }) +}) diff --git a/webapp/components/Category/index.vue b/webapp/components/Category/index.vue new file mode 100644 index 000000000..af602d4d0 --- /dev/null +++ b/webapp/components/Category/index.vue @@ -0,0 +1,19 @@ + + + diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue index 71043e90d..13edc9c0d 100644 --- a/webapp/components/Comment.vue +++ b/webapp/components/Comment.vue @@ -4,16 +4,15 @@ style="padding-left: 40px; font-weight: bold;" color="soft" > - {{ this.$t('comment.content.unavailable-placeholder') }} + + {{ this.$t('comment.content.unavailable-placeholder') }}
- + @@ -32,13 +31,13 @@ style="padding-left: 40px;" v-html="comment.contentExcerpt" /> - +
diff --git a/webapp/components/Tag/Readme.md b/webapp/components/Tag/Readme.md new file mode 100644 index 000000000..359f2487d --- /dev/null +++ b/webapp/components/Tag/Readme.md @@ -0,0 +1,7 @@ +### Example + +Tag "Liebe" + +``` + +``` \ No newline at end of file diff --git a/webapp/components/Tag/index.spec.js b/webapp/components/Tag/index.spec.js new file mode 100644 index 000000000..20267e375 --- /dev/null +++ b/webapp/components/Tag/index.spec.js @@ -0,0 +1,29 @@ +import { shallowMount, createLocalVue } from '@vue/test-utils' +import Styleguide from '@human-connection/styleguide' +import Tag from './index' + +const localVue = createLocalVue() +localVue.use(Styleguide) + +describe('Tag', () => { + let name + + let Wrapper = () => { + return shallowMount(Tag, { + localVue, + propsData: { + name + } + }) + } + + describe('given a String for Name', () => { + beforeEach(() => { + name = 'Liebe' + }) + + it('shows Name', () => { + expect(Wrapper().text()).toContain('Liebe') + }) + }) +}) diff --git a/webapp/components/Tag/index.vue b/webapp/components/Tag/index.vue new file mode 100644 index 000000000..70e1cf2a2 --- /dev/null +++ b/webapp/components/Tag/index.vue @@ -0,0 +1,15 @@ + + + diff --git a/webapp/components/User.spec.js b/webapp/components/User/index.spec.js similarity index 97% rename from webapp/components/User.spec.js rename to webapp/components/User/index.spec.js index 0bbf13529..9f45ae83a 100644 --- a/webapp/components/User.spec.js +++ b/webapp/components/User/index.spec.js @@ -1,5 +1,5 @@ import { config, mount, createLocalVue, RouterLinkStub } from '@vue/test-utils' -import User from './User.vue' +import User from './index' import Vue from 'vue' import Vuex from 'vuex' import VTooltip from 'v-tooltip' @@ -15,7 +15,7 @@ localVue.use(Styleguide) localVue.filter('truncate', filter) -describe('User.vue', () => { +describe('User', () => { let wrapper let Wrapper let propsData diff --git a/webapp/components/User.vue b/webapp/components/User/index.vue similarity index 80% rename from webapp/components/User.vue rename to webapp/components/User/index.vue index dd176a67d..6b0731981 100644 --- a/webapp/components/User.vue +++ b/webapp/components/User/index.vue @@ -1,6 +1,8 @@ -