Merge branch 'develop' of github.com:superdesk/superdesk-client-core …

…into develop

.fireq.json

@@ -0,0 +1,3 @@
+{
+    "superdesk_branch": "release/2.5"
+}

.github/workflows/tests.yml

@@ -62,3 +62,8 @@ jobs:
       with:
         name: screenshots-e2e-${{ matrix.suite }}
         path: /tmp/*.png
+
+    - name: Server Logs
+      if: ${{ failure() }}
+      run: docker-compose logs superdesk
+      working-directory: e2e/server

e2e/client/package.json

@@ -12,7 +12,7 @@
     "jasmine-reporters": "2.3.0",
     "protractor": "7.0.0",
     "typescript": "4.9.3",
-    "webdriver-manager": "^12.1.8"
+    "webdriver-manager": "^12.1.9"
   },
   "scripts": {
     "build": "npx @superdesk/build-tools build-root-repo ./",

e2e/client/protractor.conf.js

@@ -1,6 +1,7 @@
 /* eslint-disable comma-dangle */
 
 var path = require('path');
+const execSync = require('child_process').execSync;
 
 function getChromeOptions() {
     var chromeOptions = {
@@ -55,6 +56,16 @@ var config = {
     chromeDriver: process.env.CHROMEWEBDRIVER ? (process.env.CHROMEWEBDRIVER + '/chromedriver') : null,
 
     onPrepare: function() {
+        execSync(
+            `
+                echo "chrome version:" && $CHROME_BIN --version
+                echo "\n"
+                echo "webdriver-manager version:" && npx webdriver-manager version
+                echo "\n"
+            `,
+            {stdio: 'inherit'},
+        );
+
         require('./specs/helpers/setup').setup({fixture_profile: 'app_prepopulate_data'});
 
         // so it can be used without import in tests
@@ -73,6 +84,7 @@ var config = {
             this.specDone = function(result) {
                 if (result.failedExpectations.length > 0) {
                     browser.screenshot(result.fullName.replace(/[^\w]+/g, '-'));
+                    require('./specs/helpers/utils').printLogs();
                 }
             };
         }

e2e/client/run-end-to-end-tests.js

@@ -19,24 +19,10 @@ function installWebdriverDriver() {
         } catch (_) {
             // driver not installed, installing:
 
-            let version = null;
-
-            try {
-                version = execSync('chromium-browser --product-version').toString();
-            } catch (_) {
-                // Chromium not installed
-            }
-
-            if (version == null) {
-                try {
-                    version = execSync('google-chrome --product-version --product-version').toString();
-                } catch (_) {
-                    // Google Chrome not installed
-                }
-            }
+            const  version = execSync('$CHROME_BIN --product-version').toString();
 
             if (version == null) {
-                return reject('To launch the test server either Chromium or Google Chrome has to be installed.');
+                return reject('To launch the test server a chrome based browser has to be installed and CHROME_BIN environment variable set.');
             }
 
             console.info('Installing webdriver...', version);
@@ -52,7 +38,7 @@ ensurePackageInstalled()
     .then(() => {
         const argumentsToForward = process.argv.slice(2).join(' ');
 
-        return execSync(`npx protractor protractor.conf.js ${argumentsToForward}`, {stdio: 'inherit'});
+        execSync(`npx protractor protractor.conf.js ${argumentsToForward}`, {stdio: 'inherit'});
     })
     .catch((e) => {
         console.error(e);

e2e/client/specs/helpers/utils.ts

@@ -42,10 +42,9 @@ export function printLogs(prefix) {
         .then((browserLog) => {
             var logs = browserLog.filter((log) => log.level.value >= 1000);
 
-            console.info(
-                (prefix ? prefix + ' ' : '') +
-                'log: ' + require('util').inspect(logs, {dept: 3}),
-            );
+            for (const log of logs) {
+                console.error(`BROWSER CONSOLE ERROR: ${log.message}`);
+            }
         });
 }
 

e2e/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.10
 
 ADD requirements.txt .
 RUN pip3 install -U pip wheel setuptools

e2e/server/Procfile

@@ -1,2 +1,3 @@
 rest: PYTHONUNBUFFERED=True gunicorn -c gunicorn_config.py wsgi
 wamp: python3 -u ws.py
+work: celery -A worker worker

e2e/server/docker-compose.yml

@@ -24,6 +24,7 @@ services:
             - e2e
         environment:
             - discovery.type=single-node
+            - action.auto_create_index=false
         tmpfs:
             - /usr/share/elasticsearch/data
 

e2e/server/requirements.in

@@ -1,3 +1,3 @@
 honcho
 gunicorn
-git+https://github.com/superdesk/superdesk-core.git@v2.6.0#egg=Superdesk-Core
+git+https://github.com/superdesk/superdesk-core.git@develop#egg=Superdesk-Core