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

Merge pull request #2027 from Human-Connection/new-terms-conditions-version-0.0.3

Browse Source 
🍰 New terms and conditions version 0.0.3
This commit is contained in:
Robert Schäfer 2019-10-24 13:52:29 +02:00 committed by GitHub
commit d3b3d9231e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/constants/terms-and-conditions-version.js Normal file
View File

@ -0,0 +1,2 @@
// please change also version in file "webapp/constants/terms-and-conditions-version.js"
export const VERSION = '0.0.3'

3
cypress/integration/common/report.js
View File

@ -1,4 +1,5 @@
import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps'
import { VERSION } from '../../constants/terms-and-conditions-version.js'
/* global cy */
@ -31,7 +32,7 @@ Given('I am logged in with a {string} role', role => {
cy.factory().create('User', {
email: `${role}@example.org`,
password: '1234',
termsAndConditionsAgreedVersion: "0.0.2",
termsAndConditionsAgreedVersion: VERSION,
role
})
cy.login({

3
cypress/integration/common/steps.js
View File

@ -4,6 +4,7 @@ import {
Then
} from "cypress-cucumber-preprocessor/steps";
import helpers from "../../support/helpers";
import { VERSION } from '../../constants/terms-and-conditions-version.js'
/* global cy */
@ -14,7 +15,7 @@ let loginCredentials = {
password: "1234"
};
const termsAndConditionsAgreedVersion = {
termsAndConditionsAgreedVersion: "0.0.2"
termsAndConditionsAgreedVersion: VERSION
};
const narratorParams = {
id: 'id-of-peter-pan',

3
webapp/components/Registration/CreateUserAccount.spec.js
View File

@ -1,4 +1,5 @@
import { config, mount, createLocalVue } from '@vue/test-utils'
import { VERSION } from '~/constants/terms-and-conditions-version.js'
import CreateUserAccount from './CreateUserAccount'
import { SignupVerificationMutation } from '~/graphql/Registration.js'
import Styleguide from '@human-connection/styleguide'
@ -81,7 +82,7 @@ describe('CreateUserAccount', () => {
email: 'sixseven@example.org',
nonce: '666777',
password: 'hellopassword',
termsAndConditionsAgreedVersion: '0.0.2',
termsAndConditionsAgreedVersion: VERSION,
locale: 'en',
},
})

3
webapp/constants/terms-and-conditions-version.js
View File

@ -1 +1,2 @@
export const VERSION = '0.0.2'
// please change also version in file "cypress/constants/terms-and-conditions-version.js"
export const VERSION = '0.0.3'

1
webapp/pages/terms-and-conditions.vue
View File

@ -26,6 +26,7 @@ export default {
},
data() {
return {
// if you change terms and conditions please change also version in file "webapp/constants/terms-and-conditions-version.js"
sections: [
'terms-of-service',
'use-and-license',