Merge pull request #3046 from sap-labs-france/master-qa

merge master-qa

.github/workflows/unit-tests.yml

@@ -0,0 +1,42 @@
+name: Unit Tests CI
+
+on:
+  push:
+    branches:
+      - master
+      - master-qa
+  pull_request:
+    branches:
+      - master-qa
+
+jobs:
+  unit-tests-submodules:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ssh-key: ${{ secrets.ACTION_ACCESS_SUB_MODULES_PRIVATE_REPOS }}
+        submodules: true
+    - name: Install NodeJs ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: npm
+    - name: Install NodeJs Packages
+      run: npm ci
+    - name: Build sources
+      run: |
+        cp src/assets/configs-ci/config.json src/assets
+        npm run build:dev
+    - name: Start Dashboard
+      run: |
+        npm run start & sleep 60
+    - name: Initialize integration test configuration
+      run: |
+        if [ ! -d test/config ]; then mkdir -p test/config; fi
+        cp src/assets/configs-ci/local-dashboard.json test/config/local.json
+    - name: Run Integration Tests
+      run: npm run test

.gitmodules

@@ -2,3 +2,8 @@
 	path = src/assets/configs-aws
 	url = ../../sap-labs-france/ev-aws.git
 	branch = master
+[submodule "src/assets/configs-ci"]
+	path = src/assets/configs-ci
+	url = ../../sap-labs-france/ev-ci.git
+	branch = master
+

.vscode/launch.json

@@ -6,7 +6,7 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Launch tenant 'SLF@localhost' in Chrome",
+      "name": "tenant: slf",
       "request": "launch",
       "type": "pwa-chrome",
       "url": "http://slf.localhost:45000",
@@ -18,6 +18,27 @@
       "name": "tenant: utbilling",
       "url": "http://utbilling.localhost:45000",
       "webRoot": "${workspaceFolder}"
-    }
+    },
+    {
+      "type": "node",
+      "name": "vscode-jest-tests",
+      "request": "launch",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+        "--i",
+        "--runInBand",
+        "--config='./jest.config.ts'",
+        "--reporters='default'",
+        "--reporters='./test/JestEvseReporter'",
+        "--watchAll=false",
+      ],
+      "cwd": "${workspaceFolder}",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": false,
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest"
+      }
+    },
   ]
 }

.vscode/settings-template.json

@@ -1,5 +1,13 @@
 {
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
-  }
+  },
+  "eslint.validate": [
+    "javascript",
+    "typescript"
+  ],
+  "files.autoSave": "off",
+  "search.usePCRE2": true,
+  "jest.jestCommandLine": "npm run test -- ",
+  "jest.autoRun": "false"
 }

README.md

@@ -116,14 +116,14 @@ Build the sources as above and run it with:
 npm run start:prod:ssl
 ```
 
-## Tests End To End
+## Integration tests
 
-To run e2e tests, you first need to have a server and UI up and running. Then start the e2e suite with:
+To run integration tests, you first need to start the UI and run the below command:
 ```shell
-npm run e2e
+npm run test
 ```
 
-That's it!
+This will run all integraiton tests written with **Jest** framework.
 
 ## License
 

docker/autoconfig.sh

@@ -6,10 +6,10 @@ then
   [ -z $emobility_landscape ] && { echo "emobility landscape env variable not found, exiting"; exit 1; }
   [ -z $emobility_server_type ] && { echo "emobility env server type variable not found, exiting"; exit 1; }
   [ -z $emobility_service_type ] && { echo "emobility env service type variable not found, exiting"; exit 1; }
-  [ ! -f $emobility_install_dir/assets/configs-aws/$emobility_server_type-$emobility_service_type-$emobility_landscape.json ] && { echo "emobility conf dir not found, ignored"; exit 1; }
+  [ ! -f $emobility_install_dir/dist/assets/configs-aws/$emobility_server_type-$emobility_service_type-$emobility_landscape.json ] && { echo "emobility conf dir not found, ignored"; exit 1; }
 
-  cp $emobility_install_dir/assets/configs-aws/$emobility_server_type-$emobility_service_type-$emobility_landscape.json $emobility_install_dir/assets/config.json
-  rm -rf $emobility_install_dir/assets/configs-aws
+  cp $emobility_install_dir/dist/assets/configs-aws/$emobility_server_type-$emobility_service_type-$emobility_landscape.json $emobility_install_dir/dist/assets/config.json
+  rm -rf $emobility_install_dir/dist/assets/configs-aws
 else
   echo "no emobility env defined, start with default configuration"
 fi

jest-puppeteer.config.js

@@ -0,0 +1,15 @@
+module.exports = {
+  launch: {
+    dumpio: false,
+    headless: true,
+    product: 'chrome',
+    /* slowMo: 30, */
+    devtools: false,
+    defaultViewport: { width: 1920, height: 1080 },
+    args: [
+      '--disable-web-security',
+      '--disable-features=IsolateOrigins',
+      '--disable-site-isolation-trials'
+    ]
+  },
+}

jest.config.ts

@@ -0,0 +1,197 @@
+/*
+ * For a detailed explanation regarding each configuration property and type check, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+export default {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/fx/0dp28qr92z34tvcylsw8z7zr0000gn/T/jest_dx",
+
+  // Automatically clear mock calls, instances and results before every test
+  // clearMocks: false,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  // collectCoverage: false,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  // coverageDirectory: undefined,
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: 'v8',
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number.
+  // E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "json",
+  //   "node"
+  // ],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // moduleNameMapper: {},
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  preset: 'jest-puppeteer',
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  reporters: ['default', './test/JestEvseReporter'],
+
+  // Automatically reset mock state before every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state and implementation before every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  setupFilesAfterEnv: ['./test/jest-setup.ts'],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  // testEnvironment: "jest-environment-node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  testMatch: [
+    '**/test/integration/*.[jt]s?(x)',
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+  // testURL: "http://localhost",
+
+  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+  // timers: "real",
+
+  // Transpile ts files using ts-jest
+  transform: {
+    '^.+\\.ts$': 'ts-jest',
+  },
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};