diff --git a/bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test/Zuite_setConversionServerUrl.py b/bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test/Zuite_setConversionServerUrl.py index 9f522d4032f042c7b2a89a011fd85b214d1e09ac..487d02f866f95aedc706e1d09228ad34f55d827e 100644 --- a/bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test/Zuite_setConversionServerUrl.py +++ b/bt5/erp5_corporate_identity_test/SkinTemplateItem/portal_skins/erp5_corporate_identity_test/Zuite_setConversionServerUrl.py @@ -7,7 +7,7 @@ Set preference for template test to textarea # ------------------------------------------------------------------------------ # make sure cloudooo is set for pdf conversions on system_preference -conversion_server_url_list = context.portal_preferences.getPreferredDocumentConversionServerUrlList() or ["https://cloudooo.erp5.net"] +conversion_server_url_list = ["https://softinst116254.host.vifib.net"] system_preference = context.portal_preferences.default_system_preference system_preference.setPreferredDocumentConversionServerUrlList(conversion_server_url_list) return "Conversion Server Url set." diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js index c74a62db147ad9c8db4f31fb7b83715ac0bb30a6..fb47598cbfc78d6ff6493bff805eae0edb93194e 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_configurator_js.js @@ -43,6 +43,7 @@ })); configuration = { + debug: true, type: "replicate", // XXX This drop the signature lists... query: { diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.js index db8a07a2c8c00180e5ca0b5f066947876b7058f1..0847f04635ddf602a1ba22b5ed83e3ff8a984a95 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_sync_js.js @@ -77,7 +77,13 @@ var gadget = this; if (gadget.state.auto_repair) { - return repair_and_redirect(gadget); + return repair_and_redirect(gadget) + .push(undefined, function (e) { + if (e.name === "ReplicateReport") { + throw new Error(e.toString()); + } + throw e; + }); } }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_cloudooo_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_cloudooo_js.js index 448d3c616d16f144b247435a6cebdc6374ae1880..8ba8c8811e9f36d9a857c85f30ecdc01e049af4e 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_cloudooo_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_cloudooo_js.js @@ -68,7 +68,7 @@ .push(function (jio_gadget) { return jio_gadget.createJio({ type: "cloudooo", - url: "https://cloudooo.erp5.net/", + url: "https://softinst116254.host.vifib.net", sub_storage: { type: "memory" } diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml index 1f732a76efbaf6a01f5cdbe7359cae08b047bdc0..b1fad1469ef165a910de3f3e12acaf5705c4f6a2 100644 --- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml +++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml @@ -417,7 +417,7 @@ configuration_content_security_policy - default-src \'self\'; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' https://content.dropboxapi.com https://api.dropboxapi.com mail.tiolive.com data: *.host.vifib.net *.node.vifib.com *.erp5.net https://netdna.bootstrapcdn.com; script-src \'self\' \'unsafe-eval\' \'unsafe-inline\'; font-src \'self\' netdna.bootstrapcdn.com; style-src \'self\' netdna.bootstrapcdn.com \'unsafe-inline\' data:; frame-src \'self\' data: + default-src \'self\'; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' https://content.dropboxapi.com https://api.dropboxapi.com mail.tiolive.com data: *.host.vifib.net *.node.vifib.com *.erp5.ru *.erp5.net https://netdna.bootstrapcdn.com; script-src \'self\' \'unsafe-eval\' \'unsafe-inline\'; font-src \'self\' netdna.bootstrapcdn.com; style-src \'self\' netdna.bootstrapcdn.com \'unsafe-inline\' data:; frame-src \'self\' data: configuration_default_view_action_reference @@ -718,7 +718,7 @@ actor - zope + admin comment @@ -732,7 +732,7 @@ serial - 973.33482.4166.8669 + 975.43773.52403.63470 state @@ -750,8 +750,8 @@ - 1549644564.5 - UTC + 1561471935.9 + GMT+3 diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet/app.xml b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet/app.xml index 6779018bd616850e6485e588cbfbb63d1415a079..558eb27bbe82c88ab904966418222b93490121ae 100644 --- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet/app.xml +++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet/app.xml @@ -351,7 +351,7 @@ configuration_content_security_policy - default-src \'self\'; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' https://content.dropboxapi.com https://api.dropboxapi.com mail.tiolive.com data: *.host.vifib.net *.node.vifib.com *.erp5.net https://netdna.bootstrapcdn.com; script-src \'self\' \'unsafe-eval\' \'unsafe-inline\'; font-src \'self\' netdna.bootstrapcdn.com; style-src \'self\' netdna.bootstrapcdn.com \'unsafe-inline\' data:; frame-src \'self\' data: + default-src \'self\'; img-src \'self\' data:; media-src \'self\' blob:; connect-src \'self\' https://content.dropboxapi.com https://api.dropboxapi.com mail.tiolive.com data: *.host.vifib.net *.node.vifib.com *.erp5.ru *.erp5.net https://netdna.bootstrapcdn.com; script-src \'self\' \'unsafe-eval\' \'unsafe-inline\'; font-src \'self\' netdna.bootstrapcdn.com; style-src \'self\' netdna.bootstrapcdn.com \'unsafe-inline\' data:; frame-src \'self\' data: configuration_default_jio_document_page_gadget_url @@ -650,7 +650,7 @@ actor - zope + admin comment @@ -664,7 +664,7 @@ serial - 970.26748.61427.10154 + 975.43773.52403.63470 state @@ -682,8 +682,8 @@ - 1537967626.41 - UTC + 1561472219.01 + GMT+3 diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt index 0e07611bb72174bf45a069bc64edda981606ce9a..3fe157292767680e08ab625653f2367362afc29a 100644 --- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt +++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt @@ -79,16 +79,7 @@ //div[@data-gadget-scope="notification"]//button[text()='Data Updated'] - - click - //a[@data-i18n="Synchronize"] - - - - waitForElementPresent - //a[text()='Add'] - - + open ${base_url}/portal_skins/erp5_officejs_ui_test/gadget_ooffice_spreadsheet_convert_check.html diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt index 2fb95f69e0f17673a247a8aaf7a3dff92e7e989b..38911489bf73eff0c080674952ce9f720a1f809b 100644 --- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt +++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt @@ -39,8 +39,7 @@ - - + diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt index f4fd3c821557fe534a59cc2f9f2d61d0fc51ec70..06fef1cbbd403df263abbe69218fdc9d063a1bd8 100644 --- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt +++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt @@ -72,7 +72,12 @@ id - open + pause + 1000 + + + + openAndWait ${base_url}/document_module/Zuite_waitForActivities @@ -110,8 +115,7 @@ - - + + + pause + 1000 + + openAndWait ${base_url}/Zuite_waitForActivities diff --git a/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py b/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py index a6af4e8095944510da51ebe46870167364054fb1..9f20e39b2565b38b873693baf4411140680b83e5 100644 --- a/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py +++ b/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py @@ -208,6 +208,7 @@ class FunctionalTestRunner: browser = webdriver.Firefox(**kw) start_time = time.time() browser.get(self._getTestURL()) + browser.maximize_window() WebDriverWait(browser, 10).until(EC.presence_of_element_located(( By.XPATH, '//iframe[@id="testSuiteFrame"]' @@ -230,6 +231,8 @@ class FunctionalTestRunner: html_parser ) browser.quit() + # XXX ffmpeg lose last video part if xvfb quit before ffmpeg + time.sleep(5) finally: xvfb.quit() return iframe diff --git a/tests/__init__.py b/tests/__init__.py index 580935d622e98b70ce2b2f976a2339adbca29f28..94f6be0ddec1d406cdffe559ecacf192ed31e6ad 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -34,10 +34,7 @@ class _ERP5(ERP5TypeTestSuite): path = "%s/../" % HERE component_re = re.compile(".*/([^/]+)/TestTemplateItem/portal_components" "/test\.[^.]+\.([^.]+).py$") - for test_path in ( - glob('%s/product/*/tests/test*.py' % path) + - glob('%s/bt5/*/TestTemplateItem/test*.py' % path) + - glob('%s/bt5/*/TestTemplateItem/portal_components/test.*.test*.py' % path)): + for test_path in glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path): component_re_match = component_re.match(test_path) if component_re_match is not None: test_case = "%s:%s" % (component_re_match.group(1),