IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

first step of review, fix frotend and backend

Browse Source
This commit is contained in:
ogerly 2021-10-05 15:19:10 +02:00
parent 9a278a6869
commit dde7bb292f
6 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/config/index.ts
View File

@ -32,9 +32,8 @@ const klicktipp = {
const community = {
COMMUNITY_NAME: process.env.COMMUNITY_NAME || 'Gradido Entwicklung',
COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost:3000/vue/',
COMMUNITY_REGISTER_URL:
process.env.COMMUNITY_REGISTER_URL || 'http://localhost:3000/vue/register',
COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost/vue/',
COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/vue/register',
COMMUNITY_DESCRIPTION:
process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
}

6
backend/src/graphql/resolver/CommunityResolver.ts
View File

@ -26,13 +26,13 @@ export class CommunityResolver {
id: 1,
name: 'Gradido Entwicklung',
description: 'Die lokale Entwicklungsumgebung von Gradido.',
url: 'http://localhost:3000/vue/',
registerUrl: 'http://localhost:3000/vue/register-community',
url: 'http://localhost/vue/',
registerUrl: 'http://localhost/vue/register-community',
}),
new Community({
id: 2,
name: 'Gradido Staging',
description: 'Der Testserver der Gradido Akademie.',
description: 'Der Testserver der Gradido-Akademie.',
url: 'https://stage1.gradido.net/vue/',
registerUrl: 'https://stage1.gradido.net/vue/register-community',
}),

14
frontend/src/views/Pages/Login.spec.js
View File

@ -40,8 +40,8 @@ describe('Login', () => {
state: {
community: {
name: 'Gradido Entwicklung',
url: 'http://localhost:3000/vue/',
registerUrl: 'http://localhost:3000/vue/register',
url: 'http://localhost/vue/',
registerUrl: 'http://localhost/vue/register',
description: 'Die lokale Entwicklungsumgebung von Gradido.',
},
},
@ -77,7 +77,7 @@ describe('Login', () => {
expect(wrapper.find('div.login-form').exists()).toBeTruthy()
})
it('calls the communityInfo', () => {
it('commits the community info to the store', () => {
expect(mockStoreCommit).toBeCalledWith('community', {
name: 'test12',
description: 'test community 12',
@ -93,11 +93,11 @@ describe('Login', () => {
})
describe('Community Data', () => {
it('has a Community name?', () => {
it('has a Community name', () => {
expect(wrapper.find('.test-communitydata b').text()).toBe('Gradido Entwicklung')
})
it('has a Community description?', () => {
it('has a Community description', () => {
expect(wrapper.find('.test-communitydata p').text()).toBe(
'Die lokale Entwicklungsumgebung von Gradido.',
)
@ -105,13 +105,13 @@ describe('Login', () => {
})
describe('links', () => {
it('has a link "Forgot Password?"', () => {
it('has a link "Forgot Password"', () => {
expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual(
'settings.password.forgot_pwd',
)
})
it('links to /password when clicking "Forgot Password?"', () => {
it('links to /password when clicking "Forgot Password"', () => {
expect(wrapper.findAllComponents(RouterLinkStub).at(0).props().to).toBe('/password')
})

4
frontend/src/views/Pages/Register.spec.js
View File

@ -28,8 +28,8 @@ describe('Register', () => {
language: 'en',
community: {
name: 'Gradido Entwicklung',
url: 'http://localhost:3000/vue/',
registerUrl: 'http://localhost:3000/vue/register',
url: 'http://localhost/vue/',
registerUrl: 'http://localhost/vue/register',
description: 'Die lokale Entwicklungsumgebung von Gradido.',
},
},

8
frontend/src/views/Pages/RegisterCommunity.spec.js
View File

@ -15,8 +15,8 @@ describe('RegisterCommunity', () => {
state: {
community: {
name: 'Gradido Entwicklung',
url: 'http://localhost:3000/vue/',
registerUrl: 'http://localhost:3000/vue/register',
url: 'http://localhost/vue/',
registerUrl: 'http://localhost/vue/register',
description: 'Die lokale Entwicklungsumgebung von Gradido.',
},
},
@ -48,9 +48,7 @@ describe('RegisterCommunity', () => {
})
it('has a current community location', () => {
expect(wrapper.find('.header p.community-location').text()).toBe(
'http://localhost:3000/vue/',
)
expect(wrapper.find('.header p.community-location').text()).toBe('http://localhost/vue/')
})
})

5
frontend/src/views/Pages/RegisterSelectCommunity.spec.js
View File

@ -1,6 +1,5 @@
import { mount } from '@vue/test-utils'
import RegisterSelectCommunity from './RegisterSelectCommunity'
// const testObject = require('../../../public/json-example/communities.json')
const localVue = global.localVue
@ -16,8 +15,8 @@ describe('RegisterSelectCommunity', () => {
state: {
community: {
name: 'Gradido Entwicklung',
url: 'http://localhost:3000/vue/',
registerUrl: 'http://localhost:3000/vue/register',
url: 'http://localhost/vue/',
registerUrl: 'http://localhost/vue/register',
description: 'Die lokale Entwicklungsumgebung von Gradido.',
},
},