diff --git a/e2e/client/specs/authoring_spec.ts b/e2e/client/specs/authoring_spec.ts index da0b824ca2..bde5e7ac4e 100644 --- a/e2e/client/specs/authoring_spec.ts +++ b/e2e/client/specs/authoring_spec.ts @@ -235,7 +235,8 @@ describe('authoring', () => { monitoring.actionOnItem('Edit', 3, 2); authoring.showHistory(); expect(authoring.getHistoryItems().count()).toBe(1); - expect(authoring.getHistoryItem(0).getText()).toMatch(/Fetched by first name last name Today/); + expect(authoring.getHistoryItem(0).getText()) + .toMatch(/Fetched by first name last name Wednesday, 8\. November/); // we use a dump, so date won't change authoring.close(); // view item history move operation diff --git a/e2e/client/specs/helpers/content.ts b/e2e/client/specs/helpers/content.ts index 11cc465480..ab9f7ced5e 100644 --- a/e2e/client/specs/helpers/content.ts +++ b/e2e/client/specs/helpers/content.ts @@ -100,11 +100,18 @@ class Content { this.openItemMenu = function(item) { const itemElem = this.getItem(item); + // move mouse out of the item + browser.actions() + .mouseMove(itemElem, {x: -50, y: -50}) + .perform(); + + // move mouse on the item browser.actions() - .mouseMove(itemElem, {x: -50, y: -50}) // first move out .mouseMove(itemElem) // now it can mouseover for sure .perform(); + browser.sleep(100); + el(['context-menu-button'], null, itemElem).click(); const menu = el(['context-menu']); diff --git a/e2e/client/specs/helpers/fixtures.ts b/e2e/client/specs/helpers/fixtures.ts index ef6f41a8fd..73ec05e729 100644 --- a/e2e/client/specs/helpers/fixtures.ts +++ b/e2e/client/specs/helpers/fixtures.ts @@ -3,10 +3,10 @@ import {backendRequest, backendRequestAuth} from './backend'; export function resetApp(profile, callback) { backendRequest({ - uri: '/prepopulate', + uri: '/restore_record', method: 'POST', timeout: 30000, - json: {profile: profile}, + json: {name: 'legacy'}, }, (e, r, j) => { browser.params.token = null; callback(e, r, j); diff --git a/e2e/client/specs/monitoring_spec.ts b/e2e/client/specs/monitoring_spec.ts index 90f77a4ede..40c94e28d6 100644 --- a/e2e/client/specs/monitoring_spec.ts +++ b/e2e/client/specs/monitoring_spec.ts @@ -791,7 +791,9 @@ describe('monitoring', () => { monitoring.actionOnItemSubmenu('Publishing actions', 'Correct item', 0, 0); authoring.send_correction_button.click(); - expect(element(by.id('multi-select-count')).isPresent()).toBeFalsy(); + + // check if multi select is closed + browser.wait(ECE.not(ECE.presenceOf(element(by.id('multi-select-count')))), 500); }); it('can view published duplicated item in duplicate tab of non-published original item', () => { diff --git a/e2e/client/specs/notifications_spec.ts b/e2e/client/specs/notifications_spec.ts index e61fa3c61d..4458af5b6c 100644 --- a/e2e/client/specs/notifications_spec.ts +++ b/e2e/client/specs/notifications_spec.ts @@ -24,14 +24,14 @@ describe('notifications', () => { browser.wait(() => comments.count(), 2000); expect(comments.count()).toBe(1); - expect(unreadCount.getText()).toBe('3'); + expect(unreadCount.getText()).toBe(''); logout(); var modal = new LoginModal(); modal.login('admin1', 'admin'); - expect(unreadCount.getText()).toBe('4'); + expect(unreadCount.getText()).toBe('1'); click(element(by.id('unread-count'))); diff --git a/e2e/client/specs/send_spec.ts b/e2e/client/specs/send_spec.ts index cd94f35b93..eb3f1fd1ab 100644 --- a/e2e/client/specs/send_spec.ts +++ b/e2e/client/specs/send_spec.ts @@ -32,7 +32,9 @@ describe('send', () => { expect(getItemState(0)).toBe('SUBMITTED'); }); - it('warns that there are spelling mistakes', () => { + // disabling the test, it wasn't really testing any spellcheck warning + // the popup there was related to saving unsaved changes + xit('warns that there are spelling mistakes', () => { workspace.editItem(1); authoring.writeText('mispeled word'); authoring.sendTo('Sports Desk'); diff --git a/e2e/server/.dockerignore b/e2e/server/.dockerignore index 151121e7d4..3667a2c2dc 100644 --- a/e2e/server/.dockerignore +++ b/e2e/server/.dockerignore @@ -1,2 +1,3 @@ env +dump __pycache__ diff --git a/e2e/server/README.md b/e2e/server/README.md new file mode 100644 index 0000000000..6c3313792b --- /dev/null +++ b/e2e/server/README.md @@ -0,0 +1,12 @@ + +# Start recording based on e2e base dump + +When running e2e server via docker you can run: + + $ docker-compose run superdesk run python manage.py storage:record -b e2e -n new + +This will create new record called `new` in the records which can be used now via `/restore_record` api. + +If running locally using `honcho` you can use similar command: + + $ honcho run python manage.py storage:record -b e2e -n new diff --git a/e2e/server/docker-compose.yml b/e2e/server/docker-compose.yml index ec72ee1053..770db66901 100644 --- a/e2e/server/docker-compose.yml +++ b/e2e/server/docker-compose.yml @@ -8,13 +8,18 @@ services: - e2e mongo: - image: mongo:4 + image: mongo:4.4 ports: - "27017:27017" networks: - e2e + environment: + - MONGO_INITDB_DATABASE=superdesk_e2e tmpfs: - /data/db + volumes: + - ./mongo-rs-initialize.js:/docker-entrypoint-initdb.d/mongo-rs-initialize.js:ro + command: --replSet rs0 elastic: image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2 @@ -46,6 +51,9 @@ services: - WEB_WORKERS=2 - WEB_TIMEOUT=30 - WEB_LOG_LEVEL=info + volumes: + - ./dump:/opt/superdesk/dump:rw + networks: e2e: driver: bridge diff --git a/e2e/server/dump/full/initial/contentapi_e2e/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/initial/contentapi_e2e/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..fee36ac0ca Binary files /dev/null and b/e2e/server/dump/full/initial/contentapi_e2e/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/initial/contentapi_e2e/api_audit.json.bz2 b/e2e/server/dump/full/initial/contentapi_e2e/api_audit.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/contentapi_e2e/api_audit.json.bz2 differ diff --git a/e2e/server/dump/full/initial/contentapi_e2e/items.json.bz2 b/e2e/server/dump/full/initial/contentapi_e2e/items.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/contentapi_e2e/items.json.bz2 differ diff --git a/e2e/server/dump/full/initial/contentapi_e2e/items_versions.json.bz2 b/e2e/server/dump/full/initial/contentapi_e2e/items_versions.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/contentapi_e2e/items_versions.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..6b09223aa7 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/activity.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/activity.json.bz2 new file mode 100644 index 0000000000..59c0a3dd22 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/activity.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/archive.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/archive.json.bz2 new file mode 100644 index 0000000000..005fcbfbb6 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/archive.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/archive_autosave.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/archive_autosave.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/archive_autosave.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/archive_history.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/archive_history.json.bz2 new file mode 100644 index 0000000000..7a2bc85b68 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/archive_history.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/archive_versions.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/archive_versions.json.bz2 new file mode 100644 index 0000000000..217490fca1 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/archive_versions.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/archive_versions_versions.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/archive_versions_versions.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/archive_versions_versions.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/audit.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/audit.json.bz2 new file mode 100644 index 0000000000..db36a4b7df Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/audit.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/auth.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/auth.json.bz2 new file mode 100644 index 0000000000..803652d355 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/auth.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/concept_items.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/concept_items.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/concept_items.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/config.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/config.json.bz2 new file mode 100644 index 0000000000..25334236d2 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/config.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/content_filters.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/content_filters.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/content_filters.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/content_templates.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/content_templates.json.bz2 new file mode 100644 index 0000000000..8ba63a21c0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/content_templates.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/content_types.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/content_types.json.bz2 new file mode 100644 index 0000000000..c2cabd63c0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/content_types.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/desks.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/desks.json.bz2 new file mode 100644 index 0000000000..9b058697f6 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/desks.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/filter_conditions.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/filter_conditions.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/filter_conditions.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/highlights.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/highlights.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/highlights.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/ingest.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/ingest.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/ingest.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/ingest_providers.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/ingest_providers.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/ingest_providers.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/item_comments.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/item_comments.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/item_comments.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/media_references.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/media_references.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/media_references.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/mongolock.lock.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/mongolock.lock.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/mongolock.lock.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/products.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/products.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/products.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/publish_queue.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/publish_queue.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/publish_queue.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/published.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/published.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/published.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/roles.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/roles.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/roles.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/routing_schemes.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/routing_schemes.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/routing_schemes.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/rule_sets.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/rule_sets.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/rule_sets.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/sequences.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/sequences.json.bz2 new file mode 100644 index 0000000000..b1c0a7523a Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/sequences.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/stages.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/stages.json.bz2 new file mode 100644 index 0000000000..fb3d818a14 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/stages.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/subscribers.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/subscribers.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/subscribers.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/usage_metrics.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/usage_metrics.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/usage_metrics.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/users.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/users.json.bz2 new file mode 100644 index 0000000000..baf16ed7bd Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/users.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/validators.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/validators.json.bz2 new file mode 100644 index 0000000000..fee844d489 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/validators.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e/vocabularies.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e/vocabularies.json.bz2 new file mode 100644 index 0000000000..de3225bfad Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e/vocabularies.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..f3275e94cf Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_archived/archived.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_archived/archived.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_archived/archived.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..899c472ab7 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive_history.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive_history.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive_history.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive_versions.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive_versions.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_archive_versions.json.bz2 differ diff --git a/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_publish_queue.json.bz2 b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_publish_queue.json.bz2 new file mode 100644 index 0000000000..eb1d645dc0 Binary files /dev/null and b/e2e/server/dump/full/initial/superdesk_e2e_legal_archive/legal_publish_queue.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/contentapi_e2e/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/legacy/contentapi_e2e/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..037346ef82 Binary files /dev/null and b/e2e/server/dump/full/legacy/contentapi_e2e/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..f17d3c992f Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/activity.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/activity.json.bz2 new file mode 100644 index 0000000000..b85524a82c Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/activity.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/archive.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/archive.json.bz2 new file mode 100644 index 0000000000..e791968688 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/archive.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/archive_history.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/archive_history.json.bz2 new file mode 100644 index 0000000000..80bee59a08 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/archive_history.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/archive_versions.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/archive_versions.json.bz2 new file mode 100644 index 0000000000..faf9fe714e Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/archive_versions.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/auth.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/auth.json.bz2 new file mode 100644 index 0000000000..21c3d7f030 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/auth.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/config.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/config.json.bz2 new file mode 100644 index 0000000000..a5d5e922d3 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/config.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/content_templates.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/content_templates.json.bz2 new file mode 100644 index 0000000000..c108d9d504 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/content_templates.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/content_types.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/content_types.json.bz2 new file mode 100644 index 0000000000..6a697e58b1 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/content_types.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/desks.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/desks.json.bz2 new file mode 100644 index 0000000000..f88556e0db Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/desks.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/dictionaries.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/dictionaries.json.bz2 new file mode 100644 index 0000000000..487a3000df Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/dictionaries.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/email_timestamps.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/email_timestamps.json.bz2 new file mode 100644 index 0000000000..d8d3682335 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/email_timestamps.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/highlights.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/highlights.json.bz2 new file mode 100644 index 0000000000..459c46db63 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/highlights.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/ingest.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/ingest.json.bz2 new file mode 100644 index 0000000000..a44720fd43 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/ingest.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/ingest_providers.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/ingest_providers.json.bz2 new file mode 100644 index 0000000000..2b2c1c4be3 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/ingest_providers.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/internal_destinations.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/internal_destinations.json.bz2 new file mode 100644 index 0000000000..1e0c8d436c Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/internal_destinations.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/products.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/products.json.bz2 new file mode 100644 index 0000000000..77ea1e085c Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/products.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/roles.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/roles.json.bz2 new file mode 100644 index 0000000000..d68a07254d Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/roles.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/saved_searches.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/saved_searches.json.bz2 new file mode 100644 index 0000000000..891bf78bdf Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/saved_searches.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/sequences.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/sequences.json.bz2 new file mode 100644 index 0000000000..1c8dee5893 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/sequences.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/stages.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/stages.json.bz2 new file mode 100644 index 0000000000..dfe6dd86ab Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/stages.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/subscribers.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/subscribers.json.bz2 new file mode 100644 index 0000000000..d54589f46f Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/subscribers.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/users.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/users.json.bz2 new file mode 100644 index 0000000000..d73c309a4c Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/users.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/validators.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/validators.json.bz2 new file mode 100644 index 0000000000..919d6efd7f Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/validators.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e/vocabularies.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e/vocabularies.json.bz2 new file mode 100644 index 0000000000..777d5a1937 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e/vocabularies.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..0f35a6d543 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e_archived/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e_archived/archived.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e_archived/archived.json.bz2 new file mode 100644 index 0000000000..c385ce5378 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e_archived/archived.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 new file mode 100644 index 0000000000..7f7b82dfe0 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/_sd_dump_metadata.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/legal_archive.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/legal_archive.json.bz2 new file mode 100644 index 0000000000..43b8fdc92b Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/legal_archive.json.bz2 differ diff --git a/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/legal_archive_versions.json.bz2 b/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/legal_archive_versions.json.bz2 new file mode 100644 index 0000000000..a7c6f77cb5 Binary files /dev/null and b/e2e/server/dump/full/legacy/superdesk_e2e_legal_archive/legal_archive_versions.json.bz2 differ diff --git a/e2e/server/dump/records/initial.json.bz2 b/e2e/server/dump/records/initial.json.bz2 new file mode 100644 index 0000000000..988e516cc8 Binary files /dev/null and b/e2e/server/dump/records/initial.json.bz2 differ diff --git a/e2e/server/dump/records/legacy.json.bz2 b/e2e/server/dump/records/legacy.json.bz2 new file mode 100644 index 0000000000..28abdcf590 Binary files /dev/null and b/e2e/server/dump/records/legacy.json.bz2 differ diff --git a/e2e/server/mongo-rs-initialize.js b/e2e/server/mongo-rs-initialize.js new file mode 100644 index 0000000000..dee22aaeff --- /dev/null +++ b/e2e/server/mongo-rs-initialize.js @@ -0,0 +1 @@ +rs.initiate(); \ No newline at end of file diff --git a/e2e/server/requirements.txt b/e2e/server/requirements.txt index f7edac047c..04aa037ce2 100644 --- a/e2e/server/requirements.txt +++ b/e2e/server/requirements.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile requirements.in # -amqp==5.1.1 +amqp==5.2.0 # via kombu arrow==0.13.0 # via @@ -14,7 +14,7 @@ async-timeout==4.0.3 # via redis authlib==0.14.3 # via superdesk-core -babel==2.12.1 +babel==2.13.1 # via flask-babel bcrypt==3.1.7 # via superdesk-core @@ -26,16 +26,18 @@ blinker==1.4 # flask-mail # raven # superdesk-core -boto3==1.28.37 +boto3==1.28.80 # via superdesk-core -botocore==1.31.37 +botocore==1.31.80 # via # boto3 # s3transfer -cachetools==5.3.1 +cachetools==5.3.2 # via flask-oidc-ex celery[redis]==5.2.7 - # via superdesk-core + # via + # celery + # superdesk-core cerberus==1.3.5 # via # eve @@ -45,13 +47,13 @@ certifi==2023.7.22 # elastic-apm # elasticsearch # requests -cffi==1.15.1 +cffi==1.16.0 # via # bcrypt # cryptography chardet==3.0.4 # via superdesk-core -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests ciso8601==1.0.8 # via eve-elastic @@ -71,18 +73,22 @@ click-repl==0.3.0 # via celery croniter==0.3.37 # via superdesk-core -cryptography==41.0.3 +cryptography==41.0.5 # via # authlib # jwcrypto deprecated==1.2.14 # via jwcrypto draftjs-exporter[lxml]==2.1.7 - # via superdesk-core + # via + # draftjs-exporter + # superdesk-core ecs-logging==2.1.0 # via elastic-apm -elastic-apm[flask]==6.18.0 - # via superdesk-core +elastic-apm[flask]==6.19.0 + # via + # elastic-apm + # superdesk-core elasticsearch==7.13.4 # via eve-elastic eve==1.1.2 @@ -164,7 +170,7 @@ oauth2client==4.1.3 # via flask-oidc-ex oauthlib==3.2.2 # via requests-oauthlib -packaging==23.1 +packaging==23.2 # via gunicorn pillow==9.2.0 # via superdesk-core @@ -180,6 +186,8 @@ pyasn1-modules==0.3.0 # via oauth2client pycparser==2.21 # via cffi +pymemcache==4.0.0 + # via superdesk-core pymongo==3.11.4 # via # eve @@ -199,7 +207,7 @@ python-magic==0.4.27 # via superdesk-core python-twitter==3.5 # via superdesk-core -pytz==2023.3 +pytz==2023.3.post1 # via # celery # eve-elastic @@ -209,7 +217,9 @@ pytz==2023.3 pyyaml==6.0.1 # via superdesk-core raven[flask]==6.10.0 - # via superdesk-core + # via + # raven + # superdesk-core redis==4.5.5 # via # celery @@ -225,11 +235,11 @@ requests-oauthlib==1.3.1 # via python-twitter rsa==4.9 # via oauth2client -s3transfer==0.6.2 +s3transfer==0.7.0 # via boto3 sgmllib3k==1.0.0 # via feedparser -simplejson==3.19.1 +simplejson==3.19.2 # via eve six==1.16.0 # via @@ -239,7 +249,7 @@ six==1.16.0 # python-dateutil superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop # via -r requirements.in -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via superdesk-core tzlocal==2.1 # via superdesk-core @@ -252,12 +262,12 @@ urllib3==1.25.11 # elasticsearch # requests # superdesk-core -vine==5.0.0 +vine==5.1.0 # via # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.9 # via prompt-toolkit websockets==10.3 # via superdesk-core @@ -265,7 +275,7 @@ werkzeug==1.0.1 # via # flask # superdesk-core -wrapt==1.15.0 +wrapt==1.14.1 # via # deprecated # elastic-apm