From f98f1411dc15265d0249a9d388d994a0ed8b5e86 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@nexedi.com> Date: Mon, 25 Nov 2019 17:19:00 +0000 Subject: [PATCH] erp5_document_scanner_ui_test: Clean up bt5 and declare test as expected failure properly --- .../testScanDocument.zpt | 16 +---- .../Base_enableDocumentScannerTest.py | 1 - .../Base_enableDocumentScannerTest.xml | 62 ------------------- .../test.erp5.testRenderJSDocumentScanner.py | 11 +--- .../bt/dependency_list | 1 + 5 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.py delete mode 100644 bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.xml diff --git a/bt5/erp5_document_scanner_ui_test/PathTemplateItem/portal_tests/renderjs_erp5_document_scanner_zuite/testScanDocument.zpt b/bt5/erp5_document_scanner_ui_test/PathTemplateItem/portal_tests/renderjs_erp5_document_scanner_zuite/testScanDocument.zpt index 1bc11ec98a..bf2544eb3c 100644 --- a/bt5/erp5_document_scanner_ui_test/PathTemplateItem/portal_tests/renderjs_erp5_document_scanner_zuite/testScanDocument.zpt +++ b/bt5/erp5_document_scanner_ui_test/PathTemplateItem/portal_tests/renderjs_erp5_document_scanner_zuite/testScanDocument.zpt @@ -2,13 +2,13 @@ xmlns:metal="http://xml.zope.org/namespaces/metal"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Test Page Front</title> +<title>Test Scan Document (expected failure)</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" /> -<tr><td rowspan="1" colspan="3">Test Page Action Breadcrumb List</td></tr> +<tr><td rowspan="1" colspan="3">Test Scan Document (expected failure)</td></tr> </thead><tbody> <tr> <td>open</td> @@ -93,12 +93,6 @@ <td>//a[text()="Scan Document"]</td> <td></td> </tr> -<tr tal:condition="not:here/Base_enableDocumentScannerTest"> - <td>assertEval</td> - <td>true == false</td> - <td>This test is disabled to run automatically. You need to run manually and enable it in Base_enableDocumentScannerTest</td> -</tr> -<tal:block tal:condition="here/Base_enableDocumentScannerTest"> <tr> <td>click</td> <td>//a[text()="Scan Document"]</td> @@ -134,11 +128,6 @@ <td>field_your_version</td> <td>001</td> </tr> -<tr> - <td>select</td> - <td>field_your_publication_section</td> - <td>Financial Reports</td> -</tr> <tr> <td>select</td> <td>field_your_publication_state</td> @@ -224,7 +213,6 @@ <td>Done</td> <td></td> </tr> -</tal:block> </tbody></table> </body> </html> \ No newline at end of file diff --git a/bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.py b/bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.py deleted file mode 100644 index ab92203fb8..0000000000 --- a/bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.py +++ /dev/null @@ -1 +0,0 @@ -return False diff --git a/bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.xml b/bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.xml deleted file mode 100644 index ed2f5557b6..0000000000 --- a/bt5/erp5_document_scanner_ui_test/SkinTemplateItem/portal_skins/erp5_document_scanner_ui_test/Base_enableDocumentScannerTest.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Base_enableDocumentScannerTest</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_document_scanner_ui_test/TestTemplateItem/portal_components/test.erp5.testRenderJSDocumentScanner.py b/bt5/erp5_document_scanner_ui_test/TestTemplateItem/portal_components/test.erp5.testRenderJSDocumentScanner.py index 88ed116301..3c821d4b34 100644 --- a/bt5/erp5_document_scanner_ui_test/TestTemplateItem/portal_components/test.erp5.testRenderJSDocumentScanner.py +++ b/bt5/erp5_document_scanner_ui_test/TestTemplateItem/portal_components/test.erp5.testRenderJSDocumentScanner.py @@ -25,6 +25,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################## + import unittest from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctionalTestCase @@ -33,16 +34,6 @@ class TestRenderJSDocumentScanner(ERP5TypeFunctionalTestCase): foreground = 0 run_only = "renderjs_erp5_document_scanner_zuite" - def getBusinessTemplateList(self): - return ( - 'erp5_web_renderjs_ui', - 'erp5_web_renderjs_ui_test', - 'erp5_ui_test_core', - 'erp5_dms', - 'erp5_accounting', - 'erp5_pdf_merge', - 'erp5_document_scanner' - ) def test_suite(): suite = unittest.TestSuite() diff --git a/bt5/erp5_document_scanner_ui_test/bt/dependency_list b/bt5/erp5_document_scanner_ui_test/bt/dependency_list index 575e5ddaff..a6e43c6ea1 100644 --- a/bt5/erp5_document_scanner_ui_test/bt/dependency_list +++ b/bt5/erp5_document_scanner_ui_test/bt/dependency_list @@ -1 +1,2 @@ +erp5_ui_test_core erp5_document_scanner \ No newline at end of file -- 2.30.9