Merge branch 'master' into vue_with_nginx

CHANGELOG.md

@@ -4,8 +4,39 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [0.9.3](https://github.com/gradido/gradido/compare/0.9.2...0.9.3)
+
+- feat: Frontend tests for Content Footer [`#102`](https://github.com/gradido/gradido/pull/102)
+- add check session state json function and doc [`#96`](https://github.com/gradido/gradido/pull/96)
+- activity page stap 2 [`#86`](https://github.com/gradido/gradido/pull/86)
+- qrcode scanner fixed, datum in activitäten fixed, sprache not null fixed [`#88`](https://github.com/gradido/gradido/pull/88)
+- add additional docker container which is running skeema on startup to… [`#83`](https://github.com/gradido/gradido/pull/83)
+- New fix up frontend for presentation [`#85`](https://github.com/gradido/gradido/pull/85)
+- feat: Tougher eslint rules [`#77`](https://github.com/gradido/gradido/pull/77)
+- feat: improve translations [`#81`](https://github.com/gradido/gradido/pull/81)
+- use_correct_send_api [`#80`](https://github.com/gradido/gradido/pull/80)
+- fix bug with access rights [`#78`](https://github.com/gradido/gradido/pull/78)
+- make response.html better accessible [`#75`](https://github.com/gradido/gradido/pull/75)
+- feat: Lokalize Validation Messages [`#67`](https://github.com/gradido/gradido/pull/67)
+- feat: Localize links to gradito.net [`#74`](https://github.com/gradido/gradido/pull/74)
+- fix-padding [`#73`](https://github.com/gradido/gradido/pull/73)
+- Correctly use transactions API in frontend [`#69`](https://github.com/gradido/gradido/pull/69)
+- Qr code scanner [`#72`](https://github.com/gradido/gradido/pull/72)
+- Login fail message [`#71`](https://github.com/gradido/gradido/pull/71)
+- Setup unit tests for frontend [`#55`](https://github.com/gradido/gradido/pull/55)
+- Update doc [`#63`](https://github.com/gradido/gradido/pull/63)
+- Add Feature in user search old frontend because Support has requested the feature long ago [`#56`](https://github.com/gradido/gradido/pull/56)
+- sprache angepasst, for login, pwd, sigin [`#54`](https://github.com/gradido/gradido/pull/54)
+- Improve workflows [`#53`](https://github.com/gradido/gradido/pull/53)
+- setup eslint with tougher rules [`1f13507`](https://github.com/gradido/gradido/commit/1f13507eacfd93c2248fb841de5f481c9eb1e6bd)
+- semicolon rule implemented [`6762a02`](https://github.com/gradido/gradido/commit/6762a028f2a3e4f2713b26bed81029defe686ad7)
+- dev meeting, bernd [`a99de7f`](https://github.com/gradido/gradido/commit/a99de7f5d1f7557c0877eae565aa4263d65aaaf3)
+
 #### [0.9.2](https://github.com/gradido/gradido/compare/0.9.1...0.9.2)
 
+> 18 March 2021
+
+- v0.9.2 [`#51`](https://github.com/gradido/gradido/pull/51)
 - Reload after login fixed [`#50`](https://github.com/gradido/gradido/pull/50)
 - Monorepo login server [`#48`](https://github.com/gradido/gradido/pull/48)
 - Stage0 [`#3`](https://github.com/gradido/gradido/pull/3)

frontend/.babelrc

@@ -1,22 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env"
-    ]
-  ],
-  "env": {
-    "test": {
-      "plugins": ["require-context-hook"],
-      "presets": [
-        [
-          "@babel/preset-env",
-          {
-            "targets": {
-              "node": "10"
-            }
-          }
-        ]
-      ]
-    }
-  }
-}

frontend/babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: ['@vue/app'],
+  presets: ['@babel/preset-env'],
   plugins: [
     [
       'component',

frontend/jest.config.js

@@ -10,16 +10,15 @@ module.exports = {
   coverageReporters: ['lcov'],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1',
+    '\\.(css|less)$': 'identity-obj-proxy',
   },
   transform: {
-    '^.+\\.vue$': 'vue-jest',
-    // '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
-    '^.+\\.(js|jsx)?$': 'babel-jest',
+    '^.+\\.vue$': '<rootDir>/node_modules/vue-jest',
+    '^.+\\.(js|jsx)?$': '<rootDir>/node_modules/babel-jest',
   },
-  //setupFiles: [
-  //  "<rootDir>/test/registerContext.js"
-  //],
+  setupFiles: ['<rootDir>/test/testSetup.js'],
   testMatch: ['**/?(*.)+(spec|test).js?(x)'],
   // snapshotSerializers: ['jest-serializer-vue'],
   transformIgnorePatterns: ['<rootDir>/node_modules/'],
+  preset: '@vue/cli-plugin-unit-jest',
 }

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "private": true,
   "scripts": {
     "start": "node server.js",
@@ -12,11 +12,16 @@
     "test": "jest"
   },
   "dependencies": {
+    "@babel/core": "^7.13.13",
+    "@babel/node": "^7.13.13",
+    "@babel/preset-env": "^7.13.12",
+    "@vue/cli-plugin-unit-jest": "^4.5.12",
     "@vue/test-utils": "^1.1.3",
     "axios": "^0.21.1",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^26.6.3",
     "babel-plugin-require-context-hook": "^1.0.0",
+    "babel-preset-vue": "^2.0.2",
     "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.5.0",
     "chart.js": "^2.9.3",
@@ -41,6 +46,7 @@
     "flatpickr": "^4.5.7",
     "fuse.js": "^3.2.0",
     "google-maps": "^3.2.1",
+    "identity-obj-proxy": "^3.0.0",
     "jest": "^26.6.3",
     "nouislider": "^12.1.0",
     "particles-bg-vue": "1.2.3",

frontend/src/views/Layout/ContentFooter.spec.js

@@ -0,0 +1,104 @@
+import { mount } from '@vue/test-utils'
+
+import ContentFooter from './ContentFooter'
+
+const localVue = global.localVue
+
+describe('ContentFooter', () => {
+  let wrapper
+
+  let mocks = {
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+  }
+
+  const Wrapper = () => {
+    return mount(ContentFooter, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the content footer', () => {
+      expect(wrapper.find('footer.footer').exists()).toBeTruthy()
+    })
+
+    describe('copyright', () => {
+      it('shows the copyright', () => {
+        expect(wrapper.find('div.copyright').exists()).toBeTruthy()
+      })
+
+      it('renders the copyright year', () => {
+        expect(wrapper.find('div.copyright').text()).toMatch(/©\s*2[0-9]{3,3}\s+/)
+      })
+
+      it('renders a link to Gradido-Akademie', () => {
+        expect(wrapper.find('div.copyright').find('a').text()).toEqual('Gradido-Akademie')
+      })
+
+      it('links to the login page when clicked on copyright', () => {
+        expect(wrapper.find('div.copyright').find('a').attributes('href')).toEqual('#/Login')
+      })
+    })
+
+    describe('links to gradido.net', () => {
+      it('has a link to the gradido.net', () => {
+        expect(wrapper.findAll('a.nav-link').at(0).text()).toEqual('Gradido')
+      })
+
+      it('links to the https://gradido.net/en when locale is en', () => {
+        expect(wrapper.findAll('a.nav-link').at(0).attributes('href')).toEqual(
+          'https://gradido.net/en',
+        )
+      })
+
+      it('has a link to the legal notice', () => {
+        expect(wrapper.findAll('a.nav-link').at(1).text()).toEqual('imprint')
+      })
+
+      it('links to the https://gradido.net/en/impressum when locale is en', () => {
+        expect(wrapper.findAll('a.nav-link').at(1).attributes('href')).toEqual(
+          'https://gradido.net/en/impressum/',
+        )
+      })
+
+      it('has a link to the privacy policy', () => {
+        expect(wrapper.findAll('a.nav-link').at(2).text()).toEqual('privacy_policy')
+      })
+
+      it('links to the https://gradido.net/en/datenschutz when locale is en', () => {
+        expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
+          'https://gradido.net/en/datenschutz/',
+        )
+      })
+
+      describe('links are localized', () => {
+        beforeEach(() => {
+          mocks.$i18n.locale = 'de'
+        })
+
+        it('links to the https://gradido.net/de when locale is de', () => {
+          expect(wrapper.findAll('a.nav-link').at(0).attributes('href')).toEqual(
+            'https://gradido.net/de',
+          )
+        })
+
+        it('links to the https://gradido.net/de/impressum when locale is de', () => {
+          expect(wrapper.findAll('a.nav-link').at(1).attributes('href')).toEqual(
+            'https://gradido.net/de/impressum/',
+          )
+        })
+
+        it('links to the https://gradido.net/de/datenschutz when locale is de', () => {
+          expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
+            'https://gradido.net/de/datenschutz/',
+          )
+        })
+      })
+    })
+  })
+})

frontend/src/views/Layout/ContentFooter.vue

@@ -4,7 +4,7 @@
       <b-col>
         <div class="copyright text-center text-lg-center text-muted">
           © {{ year }}
-          <a href="#!" to="/login" class="font-weight-bold ml-1">Gradido-Akademie</a>
+          <a href="#/Login" class="font-weight-bold ml-1">Gradido-Akademie</a>
         </div>
       </b-col>
     </b-row>

frontend/test/testSetup.js

@@ -0,0 +1,8 @@
+import { createLocalVue } from '@vue/test-utils'
+import ElementUI from 'element-ui'
+import BootstrapVue from 'bootstrap-vue'
+
+global.localVue = createLocalVue()
+
+global.localVue.use(ElementUI)
+global.localVue.use(BootstrapVue)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",