Merge pull request #41 from ProteGO-Safe/release/4.7.1

Release/4.7.1

Author: qLb

.eslintrc

@@ -24,7 +24,7 @@
     }
   },
   "plugins": [
-    "react", "react-hooks", "jsx-a11y", "prettier"
+    "react", "react-hooks", "jsx-a11y", "prettier", "cypress"
   ],
   "rules": {
     "jsx-a11y/interactive-supports-focus": 0,
@@ -39,7 +39,12 @@
     "react-hooks/rules-of-hooks": "error",
     "no-console": "off",
     "react/prop-types": 0,
-    "prettier/prettier": ["error"]
+    "prettier/prettier": ["error"],
+    "cypress/no-assigning-return-values": "error",
+    "cypress/no-unnecessary-waiting": "error",
+    "cypress/assertion-before-screenshot": "warn",
+    "cypress/no-force": "warn",
+    "cypress/no-async-tests": "error"
   },
   "globals": {
     "window": true,
@@ -48,7 +53,8 @@
     "FormData": true,
     "FileReader": true,
     "Blob": true,
-    "navigator": true
+    "navigator": true,
+    "cypress/globals": true
   },
   "overrides": [{
     "files": ["**/*.tsx", "**/*.ts"],
@@ -63,7 +69,8 @@
       "plugin:@typescript-eslint/eslint-recommended",
       "plugin:@typescript-eslint/recommended",
       "prettier/@typescript-eslint",
-      "plugin:prettier/recommended" 
+      "plugin:prettier/recommended",
+      "plugin:cypress/recommended"
     ]
   }]
 }

.github/workflows/nodejs.yml

@@ -80,7 +80,7 @@ jobs:
         if: env.ENVIRONMENT == 'STAGE' || env.ENVIRONMENT == 'PROD' || env.ENVIRONMENT == 'DEV'
 
       - name: Exec correct curl
-        run: 'base64 -d <<< $CURL_COMMAND | sh'
+        run: 'base64 -d <<< $CURL_COMMAND | sh || true'
         shell: bash
         if: env.ENVIRONMENT == 'STAGE' || env.ENVIRONMENT == 'PROD' || env.ENVIRONMENT == 'DEV'
 

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.7.1
+
+### Added
+- Possibility to enter the result of the laboratory test after being signed up for it in the application.
+- Redirection to chatbot which enables making comments and reporting bugs in the Polish language version.
+
 ## 4.7.0
 
 ### Added

cypress.json

@@ -0,0 +1,6 @@
+{
+  "baseUrl": "http://127.0.0.1:3001",
+  "requestTimeout": 10000,
+  "viewportHeight": 667,
+  "viewportWidth": 375
+}

cypress/integration/changeLanguage/changeLanguage.helpers.js

@@ -0,0 +1,17 @@
+const languageSelectWrapper = '[data-cy=language-select-wrapper]';
+
+const selectLanguage = selector => {
+  cy.get(languageSelectWrapper).click();
+  cy.get(selector).click();
+};
+
+const checkLanguage = languageCode => {
+  cy.get(languageSelectWrapper)
+    .should('have.attr', 'data-lang')
+    .and('include', languageCode);
+};
+
+export const resolveChangeLanguage = (selector, languageCode) => () => {
+  selectLanguage(selector);
+  checkLanguage(languageCode);
+};

cypress/integration/changeLanguage/changeLanguage.js

@@ -0,0 +1,43 @@
+import { visitBaseUrl } from '../../utils/visitBaseUrl';
+import { resolveChangeLanguage } from './changeLanguage.helpers';
+import { clearLocalStorage } from '../../utils/clearLocalStorage';
+
+/**
+ * Change language
+ */
+describe('Choose language on first screen', () => {
+  clearLocalStorage();
+  visitBaseUrl();
+
+  const changeToPolish = resolveChangeLanguage('#select_flag_PL', 'PL');
+  const changeToEnglish = resolveChangeLanguage('#select_flag_GB', 'GB');
+  const changeToUkrainian = resolveChangeLanguage('#select_flag_UA', 'UA');
+
+  it('should change language to polish', () => {
+    changeToPolish();
+  });
+
+  it('should change language to english', () => {
+    changeToEnglish();
+  });
+
+  it('should change language to ukrainian', () => {
+    changeToUkrainian();
+  });
+
+  it('should change language to english', () => {
+    changeToEnglish();
+  });
+
+  it('should change language to polish', () => {
+    changeToPolish();
+  });
+
+  it('should change language to ukrainian', () => {
+    changeToEnglish();
+  });
+
+  it('should change language to polish', () => {
+    changeToPolish();
+  });
+});

cypress/integration/onboarding/onboarding.helpers.js

@@ -0,0 +1,21 @@
+import { getByDataCy } from '../../utils/getByDataCy';
+
+export const nextButtonShouldBeDisabled = () =>
+  getByDataCy('button-default')
+    .should('be.visible')
+    .should('be.disabled');
+
+export const nextButtonShouldBeEnabled = () =>
+  getByDataCy('button-default')
+    .should('be.visible')
+    .should('be.enabled');
+
+export const changeExplainerStepByDot = (prev, next) => {
+  getByDataCy(`explainer-step-${prev}`)
+    .should('be.visible')
+    .within(() => {
+      cy.get(`.slick-dots > li:nth-child(${next}) button`).click();
+      cy.wait(500);
+    });
+  cy.wait(500);
+}