Skip to content

erp5
erp5
Commit bb4ea6a9 authored by Sven Franck's avatar Sven Franck
Browse files
Options

erp5_corporate_identitiy: fix failing tests

parent b4100ae4
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 140 deletions
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_001_en_pdf.xml
View file @ bb4ea6a9
......@@ -39,7 +39,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts12554317.38</string> </value>
<value> <string>ts12574913.49</string> </value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
......@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>cf97caf7dce3dac69a926c601f1933d4</string> </value>
<value> <string>f7850c76d911b9af68adadd360002084</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -282,7 +282,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.62225.40453.40038</string> </value>
<value> <string>963.62459.32541.24320</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -300,7 +300,7 @@
</tuple>
<state>
<tuple>
<float>1512554317.39</float>
<float>1512574913.5</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_002_en_pdf.xml
View file @ bb4ea6a9
......@@ -39,7 +39,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts11431737.56</string> </value>
<value> <string>ts12568181.68</string> </value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
......@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>8e1ecefbc23d77cab30dcb62ac2c711a</string> </value>
<value> <string>e14be48e4e6e7275bc10b303fb277019</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -125,7 +125,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>377551</int> </value>
<value> <int>376926</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -282,7 +282,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42080.62928.8823</string> </value>
<value> <string>963.62461.45600.31863</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -300,7 +300,7 @@
</tuple>
<state>
<tuple>
<float>1512554370.87</float>
<float>1512574946.16</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_003_en_pdf.xml
View file @ bb4ea6a9
......@@ -39,7 +39,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts11431795.07</string> </value>
<value> <string>ts12568247.69</string> </value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
......@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>f0f6c61a858f026327dadb9898b9fba0</string> </value>
<value> <string>132513bbba0401202af0073be4001f1e</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -125,7 +125,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>377551</int> </value>
<value> <int>386329</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -282,7 +282,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42081.60204.26828</string> </value>
<value> <string>963.62462.52355.5427</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -300,7 +300,7 @@
</tuple>
<state>
<tuple>
<float>1512554384.37</float>
<float>1512574959.35</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_004_en_pdf.xml
View file @ bb4ea6a9
......@@ -39,7 +39,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts11432920.01</string> </value>
<value> <string>ts12568119.22</string> </value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
......@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>3978a348b1101fe7e69cc9bddef6aebc</string> </value>
<value> <string>65faf6de705e6709424bcde1bf9c02a9</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -282,7 +282,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42100.43774.6092</string> </value>
<value> <string>963.62460.42922.17629</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -300,7 +300,7 @@
</tuple>
<state>
<tuple>
<float>1512554357.17</float>
<float>1512574934.34</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/document_module/template_test_slideshow_input_005_de_pdf.xml
View file @ bb4ea6a9
......@@ -39,7 +39,7 @@
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts11431833.72</string> </value>
<value> <string>ts12568313.92</string> </value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
......@@ -63,97 +63,6 @@
</tuple>
</value>
</item>
<item>
<key> <string>_content_information</string> </key>
<value>
<dictionary>
<item>
<key> <string>ArtBox</string> </key>
<value> <string>0.00 0.00 842.00 595.00</string> </value>
</item>
<item>
<key> <string>BleedBox</string> </key>
<value> <string>0.00 0.00 842.00 595.00</string> </value>
</item>
<item>
<key> <string>CreationDate</string> </key>
<value> <string>Thu Nov 23 11:10:17 2017</string> </value>
</item>
<item>
<key> <string>Creator</string> </key>
<value> <string>wkhtmltopdf 0.12.4</string> </value>
</item>
<item>
<key> <string>CropBox</string> </key>
<value> <string>0.00 0.00 842.00 595.00</string> </value>
</item>
<item>
<key> <string>Encrypted</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>File size</string> </key>
<value> <string>390890 bytes</string> </value>
</item>
<item>
<key> <string>Form</string> </key>
<value> <string>none</string> </value>
</item>
<item>
<key> <string>JavaScript</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>MediaBox</string> </key>
<value> <string>0.00 0.00 842.00 595.00</string> </value>
</item>
<item>
<key> <string>Optimized</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>PDF version</string> </key>
<value> <string>1.4</string> </value>
</item>
<item>
<key> <string>Page rot</string> </key>
<value> <string>0</string> </value>
</item>
<item>
<key> <string>Page size</string> </key>
<value> <string>842 x 595 pts (A4)</string> </value>
</item>
<item>
<key> <string>Pages</string> </key>
<value> <string>14</string> </value>
</item>
<item>
<key> <string>Producer</string> </key>
<value> <string>Qt 4.8.7</string> </value>
</item>
<item>
<key> <string>Suspects</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Tagged</string> </key>
<value> <string>no</string> </value>
</item>
<item>
<key> <string>Title</string> </key>
<value> <string>Template Test Slideshow</string> </value>
</item>
<item>
<key> <string>TrimBox</string> </key>
<value> <string>0.00 0.00 842.00 595.00</string> </value>
</item>
<item>
<key> <string>UserProperties</string> </key>
<value> <string>no</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
......@@ -174,7 +83,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>3f1545b0e18dd872d0d930a953862848</string> </value>
<value> <string>2232076ac8dd7ef2dc9f098365ec0687</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -216,7 +125,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>390890</int> </value>
<value> <int>390315</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -373,7 +282,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42358.28102.28245</string> </value>
<value> <string>963.62463.58982.64733</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -391,7 +300,7 @@
</tuple>
<state>
<tuple>
<float>1512554397.63</float>
<float>1512574973.21</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_001_en_bmp.xml
View file @ bb4ea6a9
......@@ -270,7 +270,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.62225.48075.33638</string> </value>
<value> <string>963.62459.39645.52650</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>1512554324.53</float>
<float>1512574915.48</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_002_en_bmp.xml
View file @ bb4ea6a9
......@@ -79,7 +79,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>51f2363a7945b9146b9a255bc77eba54</string> </value>
<value> <string>cf639505f6709f51ef74d544d3b2f0f3</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -270,7 +270,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42100.62104.26897</string> </value>
<value> <string>963.62461.52678.47854</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>1512554372.6</float>
<float>1512574948.6</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_0_003_en_bmp.xml
View file @ bb4ea6a9
......@@ -79,7 +79,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>51f2363a7945b9146b9a255bc77eba54</string> </value>
<value> <string>84658bd9dc58b0847179e996ae9c0f82</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -270,7 +270,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42101.19457.30378</string> </value>
<value> <string>963.62462.59148.54886</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>1512554385.81</float>
<float>1512574960.83</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_13_004_en_bmp.xml
View file @ bb4ea6a9
......@@ -270,7 +270,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42100.46018.29252</string> </value>
<value> <string>963.62460.49393.40584</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>1512554358.96</float>
<float>1512574936.06</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/image_module/template_test_slideshow_input_slide_8_005_de_bmp.xml
View file @ bb4ea6a9
......@@ -79,7 +79,7 @@
</item>
<item>
<key> <string>content_md5</string> </key>
<value> <string>7c59e4c2b8c9c8ce495123104365dfb1</string> </value>
<value> <string>6bbe38dd6a8235ed74653965a994d83a</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
......@@ -270,7 +270,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.42101.40464.53077</string> </value>
<value> <string>963.62464.819.10666</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -288,7 +288,7 @@
</tuple>
<state>
<tuple>
<float>1512554399.17</float>
<float>1512574974.72</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/person_module/template_test_author.xml
View file @ bb4ea6a9
......@@ -176,7 +176,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>2</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -190,7 +190,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.2047.44285.54869</string> </value>
<value> <string>963.41028.40156.40584</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -208,7 +208,7 @@
</tuple>
<state>
<tuple>
<float>1509029764.31</float>
<float>1511368619.19</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_001_en_html.xml
View file @ bb4ea6a9
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1512554172.68</float>
<float>1512574813.08</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_002_en_html.xml
View file @ bb4ea6a9
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1512554204.3</float>
<float>1512574828.27</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/PathTemplateItem/web_page_module/template_test_slideshow_output_expected_003_en_html.xml
View file @ bb4ea6a9
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1512554256.59</float>
<float>1512574875.6</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewExportAsSlideshowDialog/content.xml
View file @ bb4ea6a9
......@@ -301,7 +301,7 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Slide&amp;override_publisher_title=%s&amp;override_logo_reference=%s&amp;svg_display=%s" name="default_version"></iframe>\' % (here.absolute_url(), context.REQUEST.get("override_publisher_title", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("svg_display", "png"))
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Slide&amp;override_source_organisation_title=%s&amp;override_logo_reference=%s&amp;display_svg=%s" name="default_version"></iframe>\' % (here.absolute_url(), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("display_svg", "png"))
]]></string> </value>
</item>
......
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/WebPage_viewPrintAsSlideshowDialog/content.xml
View file @ bb4ea6a9
......@@ -301,7 +301,7 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Slide&amp;override_publisher_title=%s&amp;override_logo_reference=%s&amp;svg_display=%s" name="default_version"></iframe>\' % (context.absolute_url(), context.REQUEST.get("override_publisher_title", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("svg_display", "png"))
python: \'<iframe width="100%%" height="500" style="background-color:#FFFFFF;box-sizing:border-box;-wekbit-box-sizing:border-box;" src="%s/WebPage_viewAsWeb?portal_skin=Slide&amp;override_source_organisation_title=%s&amp;override_logo_reference=%s&amp;display_svg=%s" name="default_version"></iframe>\' % (context.absolute_url(), context.REQUEST.get("override_source_organisation_title", ""), context.REQUEST.get("override_logo_reference", ""), context.REQUEST.get("display_svg", "png"))
]]></string> </value>
</item>
......
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity_slide/WebPage_viewAsSlideshow.py
View file @ bb4ea6a9
......@@ -249,8 +249,8 @@ doc_css = ''.join(['.ci-slideshow-intro.present:not(.slide-background):before {'
# ---------------------------------- Source ------------------------------------
doc_source = doc.Base_getSourceDict(
override_source_person_title=override_source_person_title,
override_source_organisation_title=html_quote(override_source_organisation_title),
override_logo_reference=html_quote(override_logo_reference),
override_source_organisation_title=override_source_organisation_title,
override_logo_reference=override_logo_reference,
default_company_title=getCustomParameter("default_company_title", None),
default_bank_account_uid=getCustomParameter("default_bank_account_uid", None),
theme_logo_url=doc_theme.get("theme_logo_url", None)
......
bt5/erp5_corporate_identity/TestTemplateItem/portal_components/test.erp5.testCorportateIdentityTemplates.py
View file @ bb4ea6a9
......@@ -550,6 +550,8 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
)
)
'''
@changeSkin('Letter')
def test_htmlLetter(self):
......@@ -626,7 +628,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
**dict(
test_method="WebPage_exportAsLetter",
use_skin="Letter",
head_display=0,
display_head=0,
lang="de",
)
)
......@@ -719,7 +721,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
test_method="WebPage_exportAsLetter",
format="pdf",
lang="de",
head_display=0,
display_head=0,
use_skin="Letter",
)
)
......@@ -738,7 +740,7 @@ class TestCorporateIdentityTemplates(ERP5TypeTestCase):
"template_test_letter_input_001_en_pdf",
**dict(
page_number=0,
test_method="WebPage_PrintAsLetter",
test_method="WebPage_printAsLetter",
use_skin="Letter",
)
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7