[Testbot] Plone 4.3 - Python 2.6 - Build # 2405 - Regression! - 44 failure(s)
jenkins at plone.org
jenkins at plone.org
Thu Oct 9 12:46:10 UTC 2014
-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 2405 - Failure!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-4.3-python-2.6/2405/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-06T10:26:04+02:00
Author: Albert (albertcasado) <albertcelma at gmail.com>
Commit: https://github.com/plone/plone.app.contenttypes/commit/428e9ff089ef9f54f8e3ec8dbc9e8e911ab1f735
News item with figure and figcaption structure
Files changed:
M plone/app/contenttypes/browser/templates/newsitem.pt
diff --git a/plone/app/contenttypes/browser/templates/newsitem.pt b/plone/app/contenttypes/browser/templates/newsitem.pt
index 1e0e742..009e8d9 100644
--- a/plone/app/contenttypes/browser/templates/newsitem.pt
+++ b/plone/app/contenttypes/browser/templates/newsitem.pt
@@ -21,7 +21,7 @@
scale_func context/@@images;
scaled_image python: getattr(context.aq_explicit, 'image', False) and scale_func.scale('image', scale='mini')">
- <div class="newsImageContainer"
+ <figure class="newsImageContainer"
tal:condition="python: scaled_image">
<a href="#"
tal:define="here_url context/@@plone_context_state/object_url;
@@ -29,13 +29,13 @@
tal:attributes="href large_image/url">
<img tal:replace="structure python: scaled_image.tag(css_class='newsImage')" />
- <p class="discreet"
+ <figcaption
tal:condition="context/image_caption|nothing"
tal:content="structure context/image_caption" >
- </p>
+ </figcaption>
</a>
- </div>
+ </figure>
<div id="parent-fieldname-text"
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-06T10:26:04+02:00
Author: Albert (albertcasado) <albertcelma at gmail.com>
Commit: https://github.com/plone/plone.app.contenttypes/commit/07eb762ec85dbc4e4c5fa845ca23918a4831330a
image product and fullscreen little update
Files changed:
M plone/app/contenttypes/browser/templates/image.pt
M plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
diff --git a/plone/app/contenttypes/browser/templates/image.pt b/plone/app/contenttypes/browser/templates/image.pt
index 44e852a..3090cab 100644
--- a/plone/app/contenttypes/browser/templates/image.pt
+++ b/plone/app/contenttypes/browser/templates/image.pt
@@ -10,27 +10,20 @@
<metal:content-core fill-slot="content-core">
<metal:block define-macro="content-core"
tal:define="size context/image/getSize">
-
- <a class="discreet"
- tal:attributes="href string:${context/@@plone_context_state/object_url}/image_view_fullscreen"
- tal:define="scale context/@@images;
- img_tag python:scale.scale('image', scale='preview').tag()"
- tal:on-error="string: Image cannot be displayed">
+ <figure class="image-product">
+ <a class="discreet"
+ tal:attributes="href string:${context/@@plone_context_state/object_url}/image_view_fullscreen"
+ tal:define="scale context/@@images;
+ img_tag python:scale.scale('image', scale='large').tag()"
+ tal:on-error="string: Image cannot be displayed">
<img tal:replace="structure img_tag" />
- <br />
- <span class="visualNoPrint">
- <img src="" alt="" tal:replace="structure context/search_icon.png" />
- <span i18n:translate="label_click_to_view_full_image">Click to view full-size image…</span>
- </span>
- </a>
-
- <span class="discreet visualNoPrint">
- —
- <span i18n:translate="label_size">Size</span>:
- <span tal:replace="python:size/1024">
- File size
- </span>KB
- </span>
+
+ <figcaption class="discreet">
+ <strong class="sr-only" i18n:translate="label_click_to_view_full_image">Click to view full-size image…</strong>
+ <span><tal:span i18n:translate="label_size">Size</tal:span>: <tal:span tal:replace="python:size/1024"> File size </tal:span>KB</span>
+ </figcaption>
+ </a>
+ </figure>
</metal:block>
</metal:content-core>
</body>
diff --git a/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt b/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
index 673a206..1cb6ca2 100644
--- a/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
+++ b/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
@@ -18,25 +18,27 @@
body {
background-color: white;
color: black;
- font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
- font-size: 69%;
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 14px;
+ padding:0;
+ margin:0;
}
-
a {
- display:block;
- margin: 0.5em;
- color: #436976;
- text-decoration: underline;
- line-height:1.5em;
+ color: #08c;
+ text-decoration: none;
+ text-align:center;
}
+ a:hover {text-decoration:underline;}
+ a span {
+ display:block;
+ line-height:1.5em;
+ padding:12px;
+ }
img {
- border: 0px;
- padding: 5px;
- }
-
- #content-core {
- text-align: center;
+ border: 0;
+ display:block;
+ margin:0 auto;
}
</style>
@@ -50,12 +52,16 @@
<a href=""
tal:attributes="href request/HTTP_REFERER"
tal:condition="request/HTTP_REFERER"
- ><span i18n:translate="label_back_to_site">Back to site</span><br /><tal:block replace="structure context/@@images/image" /></a>
+ ><span i18n:translate="label_back_to_site">Back to site</span>
+ <tal:block replace="structure context/@@images/image" />
+ </a>
<a href=""
tal:attributes="href context/portal_url"
tal:condition="not: request/HTTP_REFERER"
- ><span i18n:translate="label_home">Home</span><br /><tal:block replace="structure context/@@images/image" /></a>
+ ><span i18n:translate="label_home">Home</span>
+ <tal:block replace="structure context/@@images/image" />
+ </a>
</div>
</body>
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-06T10:26:04+02:00
Author: Albert (albertcasado) <albertcelma at gmail.com>
Commit: https://github.com/plone/plone.app.contenttypes/commit/c11ab816772d2b26854a2f6965f7663b77cd482a
table has-table class for responsive
Files changed:
M plone/app/contenttypes/browser/templates/folder_tabular_view.pt
diff --git a/plone/app/contenttypes/browser/templates/folder_tabular_view.pt b/plone/app/contenttypes/browser/templates/folder_tabular_view.pt
index af528ad..c5e87a8 100644
--- a/plone/app/contenttypes/browser/templates/folder_tabular_view.pt
+++ b/plone/app/contenttypes/browser/templates/folder_tabular_view.pt
@@ -8,12 +8,12 @@
<body>
- <metal:content-core fill-slot="content-core">
- <metal:block define-macro="listing" extend-macro="context/folder_listing/macros/content-core">
- <metal:entries fill-slot="entries">
-
- <div metal:use-macro="context/batch_macros/macros/navigation" />
+ <metal:content-core fill-slot="content-core">
+ <metal:block define-macro="listing" extend-macro="context/folder_listing/macros/content-core">
+ <metal:entries fill-slot="entries">
+ <div metal:use-macro="context/batch_macros/macros/navigation" />
+ <div class="has-table">
<table class="listing"
summary="Content listing"
i18n:attributes="summary summary_content_listing;">
@@ -86,11 +86,11 @@
</metal:block>
</tbody>
</table>
+ </div>
+ </metal:entries>
+ </metal:block>
- </metal:entries>
- </metal:block>
-
- </metal:content-core>
+ </metal:content-core>
</body>
</html>
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-06T10:26:04+02:00
Author: Ramon Navarro Bosch (bloodbare) <ramon.nb at gmail.com>
Commit: https://github.com/plone/plone.app.contenttypes/commit/52337f1c0d2bed0cb73c6d5cb9ab9d1b86389e2c
Integration bugs with new resource registry
Files changed:
M plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
M plone/app/contenttypes/tests/test_setup.py
diff --git a/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py b/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
index 0494064..8db0743 100644
--- a/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
+++ b/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
@@ -67,4 +67,4 @@ def test_toc_viewlet_shows_up(self):
toc_ctl.value = [u"selected"]
# Submit form
self.browser.getControl('Save').click()
- self.assertTrue('<dl id="document-toc"' in self.browser.contents)
+ self.assertTrue('<section id="document-toc"' in self.browser.contents)
diff --git a/plone/app/contenttypes/tests/test_setup.py b/plone/app/contenttypes/tests/test_setup.py
index 87fe047..650c92b 100644
--- a/plone/app/contenttypes/tests/test_setup.py
+++ b/plone/app/contenttypes/tests/test_setup.py
@@ -39,7 +39,8 @@ def test_browserlayer_available(self):
)
def test_css_registered(self):
- cssreg = getattr(self.portal, 'portal_css')
- stylesheets_ids = cssreg.getResourceIds()
+ resreg = getattr(self.portal, 'portal_registry')
+ from Products.CMFPlone.interfaces import IResourceRegistry
+ resources_ids = resreg.collectionOfInterface(IResourceRegistry, prefix="plone.resources").keys()
self.assertTrue(
- '++resource++collection.css' in stylesheets_ids)
+ 'resource-collection-css' in resources_ids)
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-07T10:45:31+02:00
Author: Ramon Navarro Bosch (bloodbare) <ramon.nb at gmail.com>
Commit: https://github.com/plone/plone.app.contenttypes/commit/da7ada8eba2e05620a44dc691060689ee45fc6fa
Toolbar workflow robottest correct css classes
Files changed:
M plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
diff --git a/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
index 909ba4e..6e801bc 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
@@ -25,7 +25,7 @@ Scenario: Test Review state Criterion
a published document
[Arguments] ${title}
a document ${title}
- Click link css=#plone-contentmenu-workflow a.actionMenuHeader
+ Click link xpath=//li[@id='plone-contentmenu-workflow']/a
Click Link workflow-transition-publish
a private document
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-08T03:45:11+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/1cc6542a9cb47b3c7262f659ec0046220f9fcbe3
Fix acceptance tests to wait for select2 choices to become visible
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 4842717..ebcbc83 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -133,14 +133,14 @@ I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Wait until page contains Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
- Wait until page contains Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the text '${label}'
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-08T08:50:59+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/c9f15a65e9cd0f035ec7c5eef84fcad471384c0c
Add screenshot-keywords for debugging acceptance tests on CI
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index ebcbc83..479122b 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -132,15 +132,19 @@ fill date field
I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
+ Capture page screenshot
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Capture page screenshot
Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
+ Capture page screenshot
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Capture page screenshot
Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the text '${label}'
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-08T18:22:13+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/5ff58bc366362bb04a0cc1360b59d70bfbb51f78
Try to fix select2 test on CI by moving mouse over selection before click
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 479122b..727b345 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -132,6 +132,7 @@ fill date field
I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
+ Mouse over css=${criteria_row} .querystring-criteria-${type} .select2-choice
Capture page screenshot
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
@@ -141,6 +142,7 @@ I set the criteria ${type} in row ${number} to the option '${label}'
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
+ Mouse over css=${criteria_row} .querystring-criteria-${type} .select2-choice
Capture page screenshot
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-08T19:05:40+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/c066ff79385f42a0bc0ff1e0b234869a4d91c067
Fix to use jquery-selector for select2-widget
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 727b345..57d70c8 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -131,22 +131,13 @@ fill date field
I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
- Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Mouse over css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Capture page screenshot
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
- Capture page screenshot
- Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Input text jquery=.select2-search:visible .select2-input ${label}\n
+# Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
- Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
- Mouse over css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Capture page screenshot
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
- Wait until element is visible xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
- Capture page screenshot
Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the text '${label}'
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-08T21:41:26+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/e73c0e373477e5e0040acc510c8a407c14d40a8c
Add settings header into keywords.robot
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 57d70c8..51ed581 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -1,3 +1,5 @@
+*** Settings ***
+
Variables plone/app/contenttypes/tests/robot/variables.py
*** Keywords ***
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-08T21:53:01+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/dbbba42ce41a58b9621e1a46b12b8bc96b7ced92
Restore element checks
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 51ed581..27ab957 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -133,12 +133,14 @@ fill date field
I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
+ Page should contain element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Input text jquery=.select2-search:visible .select2-input ${label}\n
# Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
+ Page should contain element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-09T04:14:07+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/ea2777c0865aafcb537a8a0bdefd248e5198ba57
Enable autologin for accaptance tests; Fix acceptance tests to use select2 autocomplete
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
M plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 27ab957..9c99d95 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -1,13 +1,13 @@
*** Settings ***
+Library Remote ${PLONE_URL}/RobotRemote
+
Variables plone/app/contenttypes/tests/robot/variables.py
*** Keywords ***
I am logged in as site owner
- # TODO: Replace with autologin
- Log in admin secret
- Wait until page contains You are now logged in
+ Enable autologin as Site Administrator
Click Edit
Click Link xpath=//a[contains(., "Edit")]
@@ -133,16 +133,19 @@ fill date field
I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
- Page should contain element css=${criteria_row} .querystring-criteria-${type} .select2-choice
+ Wait until page contains element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Input text jquery=.select2-search:visible .select2-input ${label}\n
+ Wait until page contains element css=.select2-input.select2-focused
+ Input text css=.select2-input.select2-focused ${label}\n
# Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
- Page should contain element css=${criteria_row} .querystring-criteria-${type} .select2-choices
+ Wait until page contains element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
- Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Wait until page contains element css=.select2-input.select2-focused
+ Input text css=.select2-input.select2-focused ${label}\n
+# Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the text '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
diff --git a/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
index 368b18e..b89e596 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
@@ -26,7 +26,7 @@ I set the collection short name (id) criterion to
[Arguments] ${criterion}
Click Edit
- I set the criteria index in row 1 to the option 'Short name (id)'
+ I set the criteria index in row 1 to the option 'Short name'
I set the criteria operator in row 1 to the option 'Is'
I set the criteria value in row 1 to the text '${criterion}'
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-09T08:50:05+03:00
Author: Asko Soukka (datakurre) <asko.soukka at iki.fi>
Commit: https://github.com/plone/plone.app.contenttypes/commit/0633bf87344db223017d452b5ce157ccc004d28f
Refactor to create most of the test fixture using remote library keywors
Files changed:
M plone/app/contenttypes/tests/robot/keywords.txt
M plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
M test-plone-4.3.x.cfg
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 9c99d95..25de625 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -18,27 +18,33 @@ Click Edit
a collection
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Collection
- Wait until page contains Add Collection
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Collection title=${title}
+# Go to ${PLONE_URL}/++add++Collection
+# Wait until page contains Add Collection
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a document
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Document
- Wait until page contains Add Page
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Document title=${title}
+# Go to ${PLONE_URL}/++add++Document
+# Wait until page contains Add Page
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a event
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Event
- Wait until page contains Add Event
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Event title=${title}
+# Go to ${PLONE_URL}/++add++Event
+# Wait until page contains Add Event
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a file
[Arguments] ${title}
@@ -51,11 +57,13 @@ a file
a folder
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Folder
- Wait until page contains Add Folder
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Folder title=${title}
+# Go to ${PLONE_URL}/++add++Folder
+# Wait until page contains Add Folder
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a image
[Arguments] ${title}
@@ -68,11 +76,13 @@ a image
a link
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Link
- Wait until page contains Add Link
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Link title=${title}
+# Go to ${PLONE_URL}/++add++Link
+# Wait until page contains Add Link
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a news item
[Arguments] ${title}
diff --git a/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
index f98d7f9..6135aca 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
@@ -38,6 +38,7 @@ a test user document
I set the collection's creator criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
Wait until page contains Edit Collection
I set the criteria index in row 1 to the option 'Creator'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
index ae7e968..8259f7b 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
@@ -47,6 +47,7 @@ a folder '${folder-id}' with a document '${document-title}'
I set the collection's relative location criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Location'
@@ -58,6 +59,7 @@ I set the collection's relative location criterion to
I set the collection's absolute location criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Location'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
index 6e801bc..8562f50 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
@@ -24,9 +24,8 @@ Scenario: Test Review state Criterion
a published document
[Arguments] ${title}
- a document ${title}
- Click link xpath=//li[@id='plone-contentmenu-workflow']/a
- Click Link workflow-transition-publish
+ ${uid} = a document ${title}
+ Fire transition ${uid} publish
a private document
[Arguments] ${title}
@@ -34,6 +33,7 @@ a private document
I set the collection's review state criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Review state'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
index b89e596..ab1e1b6 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
@@ -24,6 +24,7 @@ Test Short name (id) Criterion
I set the collection short name (id) criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Short name'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
index f593ad4..2ac2c36 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
@@ -24,6 +24,7 @@ Test Type Criterion
I set the collection's type criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Type'
diff --git a/test-plone-4.3.x.cfg b/test-plone-4.3.x.cfg
index 695986c..39683d3 100644
--- a/test-plone-4.3.x.cfg
+++ b/test-plone-4.3.x.cfg
@@ -115,11 +115,11 @@ plone.app.jquery = 1.8.3
# testing
plone.app.testing = 4.2.4
-plone.app.robotframework = 0.8.1
+plone.app.robotframework = 0.9.5
robotframework = 2.8.4
robotframework-selenium2library = 1.5.0
robotsuite = 1.4.3
-selenium = 2.39.0
+selenium = 2.43.0
robotframework-selenium2screenshots = 0.4.0
sphinxcontrib-robotframework = 0.4.3
Pygments = 1.6
Repository: plone.app.contenttypes
Branch: refs/heads/master
Date: 2014-10-09T13:58:49+02:00
Author: Ramon Navarro Bosch (bloodbare) <ramon.nb at gmail.com>
Commit: https://github.com/plone/plone.app.contenttypes/commit/668012284868df57b69efeab2300ee91414789c4
Merge pull request #175 from plone/barceloneta
Barceloneta
Files changed:
M plone/app/contenttypes/browser/templates/folder_tabular_view.pt
M plone/app/contenttypes/browser/templates/image.pt
M plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
M plone/app/contenttypes/browser/templates/newsitem.pt
M plone/app/contenttypes/tests/robot/keywords.txt
M plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
M plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
M plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
M plone/app/contenttypes/tests/test_setup.py
M test-plone-4.3.x.cfg
diff --git a/plone/app/contenttypes/browser/templates/folder_tabular_view.pt b/plone/app/contenttypes/browser/templates/folder_tabular_view.pt
index af528ad..c5e87a8 100644
--- a/plone/app/contenttypes/browser/templates/folder_tabular_view.pt
+++ b/plone/app/contenttypes/browser/templates/folder_tabular_view.pt
@@ -8,12 +8,12 @@
<body>
- <metal:content-core fill-slot="content-core">
- <metal:block define-macro="listing" extend-macro="context/folder_listing/macros/content-core">
- <metal:entries fill-slot="entries">
-
- <div metal:use-macro="context/batch_macros/macros/navigation" />
+ <metal:content-core fill-slot="content-core">
+ <metal:block define-macro="listing" extend-macro="context/folder_listing/macros/content-core">
+ <metal:entries fill-slot="entries">
+ <div metal:use-macro="context/batch_macros/macros/navigation" />
+ <div class="has-table">
<table class="listing"
summary="Content listing"
i18n:attributes="summary summary_content_listing;">
@@ -86,11 +86,11 @@
</metal:block>
</tbody>
</table>
+ </div>
+ </metal:entries>
+ </metal:block>
- </metal:entries>
- </metal:block>
-
- </metal:content-core>
+ </metal:content-core>
</body>
</html>
diff --git a/plone/app/contenttypes/browser/templates/image.pt b/plone/app/contenttypes/browser/templates/image.pt
index 44e852a..3090cab 100644
--- a/plone/app/contenttypes/browser/templates/image.pt
+++ b/plone/app/contenttypes/browser/templates/image.pt
@@ -10,27 +10,20 @@
<metal:content-core fill-slot="content-core">
<metal:block define-macro="content-core"
tal:define="size context/image/getSize">
-
- <a class="discreet"
- tal:attributes="href string:${context/@@plone_context_state/object_url}/image_view_fullscreen"
- tal:define="scale context/@@images;
- img_tag python:scale.scale('image', scale='preview').tag()"
- tal:on-error="string: Image cannot be displayed">
+ <figure class="image-product">
+ <a class="discreet"
+ tal:attributes="href string:${context/@@plone_context_state/object_url}/image_view_fullscreen"
+ tal:define="scale context/@@images;
+ img_tag python:scale.scale('image', scale='large').tag()"
+ tal:on-error="string: Image cannot be displayed">
<img tal:replace="structure img_tag" />
- <br />
- <span class="visualNoPrint">
- <img src="" alt="" tal:replace="structure context/search_icon.png" />
- <span i18n:translate="label_click_to_view_full_image">Click to view full-size image…</span>
- </span>
- </a>
-
- <span class="discreet visualNoPrint">
- —
- <span i18n:translate="label_size">Size</span>:
- <span tal:replace="python:size/1024">
- File size
- </span>KB
- </span>
+
+ <figcaption class="discreet">
+ <strong class="sr-only" i18n:translate="label_click_to_view_full_image">Click to view full-size image…</strong>
+ <span><tal:span i18n:translate="label_size">Size</tal:span>: <tal:span tal:replace="python:size/1024"> File size </tal:span>KB</span>
+ </figcaption>
+ </a>
+ </figure>
</metal:block>
</metal:content-core>
</body>
diff --git a/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt b/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
index 673a206..1cb6ca2 100644
--- a/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
+++ b/plone/app/contenttypes/browser/templates/image_view_fullscreen.pt
@@ -18,25 +18,27 @@
body {
background-color: white;
color: black;
- font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
- font-size: 69%;
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 14px;
+ padding:0;
+ margin:0;
}
-
a {
- display:block;
- margin: 0.5em;
- color: #436976;
- text-decoration: underline;
- line-height:1.5em;
+ color: #08c;
+ text-decoration: none;
+ text-align:center;
}
+ a:hover {text-decoration:underline;}
+ a span {
+ display:block;
+ line-height:1.5em;
+ padding:12px;
+ }
img {
- border: 0px;
- padding: 5px;
- }
-
- #content-core {
- text-align: center;
+ border: 0;
+ display:block;
+ margin:0 auto;
}
</style>
@@ -50,12 +52,16 @@
<a href=""
tal:attributes="href request/HTTP_REFERER"
tal:condition="request/HTTP_REFERER"
- ><span i18n:translate="label_back_to_site">Back to site</span><br /><tal:block replace="structure context/@@images/image" /></a>
+ ><span i18n:translate="label_back_to_site">Back to site</span>
+ <tal:block replace="structure context/@@images/image" />
+ </a>
<a href=""
tal:attributes="href context/portal_url"
tal:condition="not: request/HTTP_REFERER"
- ><span i18n:translate="label_home">Home</span><br /><tal:block replace="structure context/@@images/image" /></a>
+ ><span i18n:translate="label_home">Home</span>
+ <tal:block replace="structure context/@@images/image" />
+ </a>
</div>
</body>
diff --git a/plone/app/contenttypes/browser/templates/newsitem.pt b/plone/app/contenttypes/browser/templates/newsitem.pt
index 1e0e742..009e8d9 100644
--- a/plone/app/contenttypes/browser/templates/newsitem.pt
+++ b/plone/app/contenttypes/browser/templates/newsitem.pt
@@ -21,7 +21,7 @@
scale_func context/@@images;
scaled_image python: getattr(context.aq_explicit, 'image', False) and scale_func.scale('image', scale='mini')">
- <div class="newsImageContainer"
+ <figure class="newsImageContainer"
tal:condition="python: scaled_image">
<a href="#"
tal:define="here_url context/@@plone_context_state/object_url;
@@ -29,13 +29,13 @@
tal:attributes="href large_image/url">
<img tal:replace="structure python: scaled_image.tag(css_class='newsImage')" />
- <p class="discreet"
+ <figcaption
tal:condition="context/image_caption|nothing"
tal:content="structure context/image_caption" >
- </p>
+ </figcaption>
</a>
- </div>
+ </figure>
<div id="parent-fieldname-text"
diff --git a/plone/app/contenttypes/tests/robot/keywords.txt b/plone/app/contenttypes/tests/robot/keywords.txt
index 4842717..25de625 100644
--- a/plone/app/contenttypes/tests/robot/keywords.txt
+++ b/plone/app/contenttypes/tests/robot/keywords.txt
@@ -1,11 +1,13 @@
+*** Settings ***
+
+Library Remote ${PLONE_URL}/RobotRemote
+
Variables plone/app/contenttypes/tests/robot/variables.py
*** Keywords ***
I am logged in as site owner
- # TODO: Replace with autologin
- Log in admin secret
- Wait until page contains You are now logged in
+ Enable autologin as Site Administrator
Click Edit
Click Link xpath=//a[contains(., "Edit")]
@@ -16,27 +18,33 @@ Click Edit
a collection
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Collection
- Wait until page contains Add Collection
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Collection title=${title}
+# Go to ${PLONE_URL}/++add++Collection
+# Wait until page contains Add Collection
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a document
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Document
- Wait until page contains Add Page
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Document title=${title}
+# Go to ${PLONE_URL}/++add++Document
+# Wait until page contains Add Page
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a event
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Event
- Wait until page contains Add Event
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Event title=${title}
+# Go to ${PLONE_URL}/++add++Event
+# Wait until page contains Add Event
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a file
[Arguments] ${title}
@@ -49,11 +57,13 @@ a file
a folder
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Folder
- Wait until page contains Add Folder
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Folder title=${title}
+# Go to ${PLONE_URL}/++add++Folder
+# Wait until page contains Add Folder
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a image
[Arguments] ${title}
@@ -66,11 +76,13 @@ a image
a link
[Arguments] ${title}
- Go to ${PLONE_URL}/++add++Link
- Wait until page contains Add Link
- Input text name=form.widgets.IDublinCore.title ${title}
- Click Button Save
- Wait until page contains Item created
+ [Return] ${uid}
+ ${uid} = Create content type=Link title=${title}
+# Go to ${PLONE_URL}/++add++Link
+# Wait until page contains Add Link
+# Input text name=form.widgets.IDublinCore.title ${title}
+# Click Button Save
+# Wait until page contains Item created
a news item
[Arguments] ${title}
@@ -131,17 +143,19 @@ fill date field
I set the criteria ${type} in row ${number} to the option '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
- Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
+ Wait until page contains element css=${criteria_row} .querystring-criteria-${type} .select2-choice
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choice
- Wait until page contains Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
- Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Wait until page contains element css=.select2-input.select2-focused
+ Input text css=.select2-input.select2-focused ${label}\n
+# Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the options '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
- Wait until page contains Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
+ Wait until page contains element css=${criteria_row} .querystring-criteria-${type} .select2-choices
Click Element css=${criteria_row} .querystring-criteria-${type} .select2-choices
- Wait until page contains Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
- Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
+ Wait until page contains element css=.select2-input.select2-focused
+ Input text css=.select2-input.select2-focused ${label}\n
+# Click Element xpath=//div[@class='select2-result-label']/descendant-or-self::*[contains(text(), '${label}')]
I set the criteria ${type} in row ${number} to the text '${label}'
${criteria_row} = Convert to String .querystring-criteria-wrapper:nth-child(${number})
diff --git a/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
index f98d7f9..6135aca 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_creator_criterion.robot
@@ -38,6 +38,7 @@ a test user document
I set the collection's creator criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
Wait until page contains Edit Collection
I set the criteria index in row 1 to the option 'Creator'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
index ae7e968..8259f7b 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_location_criterion.robot
@@ -47,6 +47,7 @@ a folder '${folder-id}' with a document '${document-title}'
I set the collection's relative location criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Location'
@@ -58,6 +59,7 @@ I set the collection's relative location criterion to
I set the collection's absolute location criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Location'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
index 909ba4e..8562f50 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_review_state_criterion.robot
@@ -24,9 +24,8 @@ Scenario: Test Review state Criterion
a published document
[Arguments] ${title}
- a document ${title}
- Click link css=#plone-contentmenu-workflow a.actionMenuHeader
- Click Link workflow-transition-publish
+ ${uid} = a document ${title}
+ Fire transition ${uid} publish
a private document
[Arguments] ${title}
@@ -34,6 +33,7 @@ a private document
I set the collection's review state criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Review state'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
index 368b18e..ab1e1b6 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_short_name_criterion.robot
@@ -24,9 +24,10 @@ Test Short name (id) Criterion
I set the collection short name (id) criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
- I set the criteria index in row 1 to the option 'Short name (id)'
+ I set the criteria index in row 1 to the option 'Short name'
I set the criteria operator in row 1 to the option 'Is'
I set the criteria value in row 1 to the text '${criterion}'
diff --git a/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot b/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
index f593ad4..2ac2c36 100644
--- a/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
+++ b/plone/app/contenttypes/tests/robot/test_collection_type_criterion.robot
@@ -24,6 +24,7 @@ Test Type Criterion
I set the collection's type criterion to
[Arguments] ${criterion}
+ Go to ${PLONE_URL}/my-collection
Click Edit
I set the criteria index in row 1 to the option 'Type'
diff --git a/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py b/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
index 0494064..8db0743 100644
--- a/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
+++ b/plone/app/contenttypes/tests/test_behaviors_table_of_contents.py
@@ -67,4 +67,4 @@ def test_toc_viewlet_shows_up(self):
toc_ctl.value = [u"selected"]
# Submit form
self.browser.getControl('Save').click()
- self.assertTrue('<dl id="document-toc"' in self.browser.contents)
+ self.assertTrue('<section id="document-toc"' in self.browser.contents)
diff --git a/plone/app/contenttypes/tests/test_setup.py b/plone/app/contenttypes/tests/test_setup.py
index 87fe047..650c92b 100644
--- a/plone/app/contenttypes/tests/test_setup.py
+++ b/plone/app/contenttypes/tests/test_setup.py
@@ -39,7 +39,8 @@ def test_browserlayer_available(self):
)
def test_css_registered(self):
- cssreg = getattr(self.portal, 'portal_css')
- stylesheets_ids = cssreg.getResourceIds()
+ resreg = getattr(self.portal, 'portal_registry')
+ from Products.CMFPlone.interfaces import IResourceRegistry
+ resources_ids = resreg.collectionOfInterface(IResourceRegistry, prefix="plone.resources").keys()
self.assertTrue(
- '++resource++collection.css' in stylesheets_ids)
+ 'resource-collection-css' in resources_ids)
diff --git a/test-plone-4.3.x.cfg b/test-plone-4.3.x.cfg
index 695986c..39683d3 100644
--- a/test-plone-4.3.x.cfg
+++ b/test-plone-4.3.x.cfg
@@ -115,11 +115,11 @@ plone.app.jquery = 1.8.3
# testing
plone.app.testing = 4.2.4
-plone.app.robotframework = 0.8.1
+plone.app.robotframework = 0.9.5
robotframework = 2.8.4
robotframework-selenium2library = 1.5.0
robotsuite = 1.4.3
-selenium = 2.39.0
+selenium = 2.43.0
robotframework-selenium2screenshots = 0.4.0
sphinxcontrib-robotframework = 0.4.3
Pygments = 1.6
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 53458 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20141009/1693476b/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 1188287 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20141009/1693476b/attachment-0003.obj>
More information about the Testbot
mailing list