Merge branch 'develop' into templates-e2e-test

dzonidoo · Apr 30, 2024 · 241440d · 241440d
2 parents 70d6dde + 2b4a6ae
commit 241440d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/e2e/client/specs/helpers/content_filters.ts b/e2e/client/specs/helpers/content_filters.ts
@@ -1,5 +1,6 @@
 import {element, by, browser} from 'protractor';
 import {openUrl} from './utils';
+import {ECE, el} from '@superdesk/end-to-end-testing-helpers';
 
 class ContentFilters {
     addNewContentFilterButton: any;
@@ -98,7 +99,10 @@ class ContentFilters {
         /**
          * Saves the content filter
          **/
-        this.save = () => this.saveButton.click();
+        this.save = () => {
+            this.saveButton.click();
+            browser.wait(ECE.stalenessOf(el(['notifications'])), 5000);
+        };
 
         /**
          * Enters given story guid into test textbox

diff --git a/e2e/server/Procfile b/e2e/server/Procfile
@@ -1,3 +1,3 @@
 rest: PYTHONUNBUFFERED=True gunicorn -c gunicorn_config.py wsgi
 wamp: python3 -u ws.py
-work: celery -A worker worker
+#work: celery -A worker worker
diff --git a/e2e/server/docker-compose.yml b/e2e/server/docker-compose.yml
@@ -51,6 +51,7 @@ services:
             - WEB_WORKERS=2
             - WEB_TIMEOUT=30
             - WEB_LOG_LEVEL=info
+            - CELERY_ALWAYS_EAGER=true
         volumes:
           - ./dump:/opt/superdesk/dump:rw
         user: 1000:1000

diff --git a/e2e/server/settings.py b/e2e/server/settings.py
@@ -25,6 +25,5 @@
 CONTENTAPI_ELASTICSEARCH_INDEX = CONTENTAPI_MONGO_DBNAME
 
 LEGAL_ARCHIVE = True
-CELERY_TASK_ALWAYS_EAGER = False
 
 DEFAULT_TIMEZONE = "Europe/London"