Merge branch 'develop' into 'master'

Release 2.0: Develop To Master

See merge request noluckjustskill/hackathon_training!89

Author: noluckjustskill

.eslintrc.js

@@ -2,7 +2,8 @@ module.exports = {
   root: true,
   env: {
     browser: true,
-    node: true
+    node: true,
+    jest: true,
   },
   parserOptions: {
     ecmaVersion: 8
@@ -15,7 +16,11 @@ module.exports = {
     // 'plugin:nuxt/recommended'
     'plugin:vue/recommended'
   ],
+  globals: {
+    logger: 'readonly',
+  },
   rules: {
+    'eqeqeq': ["error"],
     'max-len': ['error', 160, {
       'ignoreUrls': true,
       'ignoreTemplateLiterals': true,
@@ -35,9 +40,10 @@ module.exports = {
     'keyword-spacing': 'error',
     'no-multi-spaces': 'error',
     'no-restricted-syntax': ['error', 'WithStatement'],
+    'no-undef': 'error',
     'no-unused-expressions': 'off',
     'no-unused-vars': ['error', { args: 'none', "ignoreRestSiblings": true }],
-    'no-use-before-define': 'off',
+    'no-use-before-define': ['error'],
     'nuxt/no-cjs-in-config': 'off',
     'prefer-const': ['error'],
     'no-var': ['error'],

.gitignore

@@ -1,4 +1,5 @@
-# Created by .ignore support plugin (hsz.mobi)
+.vscode
+
 ### Node template
 # Logs
 logs

Dockerfile

@@ -25,11 +25,13 @@ ARG base_url
 ARG browser_base_url
 ARG yandex_metrika
 ARG sentry_dsn
+ARG recaptcha_site_key
 
 ENV NODE_ENV $node_env
 ENV BASE_URL $base_url
 ENV BROWSER_BASE_URL $browser_base_url
 ENV YANDEX_METRIKA $yandex_metrika 
 ENV SENTRY_DSN $sentry_dsn
+ENV RECAPTCHA_SITE_KEY $recaptcha_site_key
 
 RUN npm run build

_tests_/smoke/api.test.js

@@ -9,7 +9,7 @@ const testUser = {
 };
 
 describe('Login Endpoint', () => {
-  it('shold return token', (done) => {
+  it('should return token', (done) => {
     request(app.callback())
       .post('/auth/login')
       .send(testUser)
@@ -54,15 +54,18 @@ describe('getGolland Endpoint', () => {
 });
 
 describe('gollandResults Endpoint', () => {
-  it('should return dictionary with number for every type', (done) => {
+  it('should return name, result and description in object for every type', (done) => {
     request(app.callback())
       .get('/api/gollandResults')
       .set('Authorization', token)
       .expect(200)
       .end((err, res) => {
         if (err) done(err);
 
-        expect(Object.values(res.body).every(val => isNumber(val))).toBe(true);
+        expect(Object.values(res.body).every(val => isObject(val))).toBe(true);
+        expect(Object.values(res.body).every(val => isString(val.name))).toBe(true);
+        expect(Object.values(res.body).every(val => isString(val.descr))).toBe(true);
+        expect(Object.values(res.body).every(val => isNumber(val.result))).toBe(true);
 
         done();
       });
@@ -83,11 +86,6 @@ describe('gollandProfile Endpoint', () => {
         expect(isString(res.body.name)).toBe(true);
         expect(res.body).toHaveProperty('description');
         expect(isString(res.body.description)).toBe(true);
-        expect(res.body).toHaveProperty('recommendations');
-        expect(isObject(res.body.recommendations)).toBe(true);
-        expect(res.body.recommendations.every(cur => {
-          return Object.values(cur).every(val => !isObject(val));
-        })).toBe(true);
 
         done();
       });
@@ -194,7 +192,7 @@ describe('belbinResults Endpoint', () => {
 //=================DISK=============================
 
 describe('getDisk Endpoint', () => {
-  it('should return question and dictionary with variants of anwer for Belbin test', (done) => {
+  it('should return question and dictionary with variants of answer for Belbin test', (done) => {
     request(app.callback())
       .get('/api/getDisk')
       .set('Authorization', token)
@@ -245,7 +243,7 @@ describe('diskResults Endpoint', () => {
 //=================Others=============================
 
 describe('getProfession Endpoint', () => {
-  const id = Math.floor(Math.random() * 80) + 1; // Random [1, 80]
+  const id = Math.floor(Math.random() * 92) + 1; // Random [1, 80]
 
   it(`should return dictionary with description of profession with id = ${id}`, (done) => {
     request(app.callback())
@@ -264,6 +262,7 @@ describe('getProfession Endpoint', () => {
   });
 });
 
+
 describe('recommendations Endpoint', () => {
   it('should return array of dictionaries with recommended professions', (done) => {
     request(app.callback())
@@ -277,9 +276,6 @@ describe('recommendations Endpoint', () => {
         expect(res.body.every(cur => {
           return Object.values(cur).every(val => !isObject(val));
         })).toBe(true);
-        expect(res.body.every(cur => {
-          return (difference(Object.keys(cur), ['id', 'name', 'image', 'smallDescr']).length === 0);
-        })).toBe(true);
 
         done();
       });