Merge pull request #65 from plone/datakurre-fix-tests

Fix tests for syndication control panel to pass also with new plone.app.registry version
plone · Aug 24, 2016 · 0f49f45 · 0f49f45
2 parents f0401ce + 180da62
commit 0f49f45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,8 +4,9 @@ Changelog
 2.3.10 (unreleased)
 -------------------
 
-- Nothing changed yet.
-
+- Fix tests for syndication control panel to pass also with
+  new plone.app.registry versions
+  [Asko Soukka]
 
 2.3.9 (2015-09-27)
 ------------------

diff --git a/plone/app/controlpanel/tests/syndication.txt b/plone/app/controlpanel/tests/syndication.txt
@@ -19,7 +19,8 @@ Edit some settings and make sure they stick.
 
 We should be back on the Site Setup screen:
 
-    >>> 'plone_control_panel' in self.browser.url
+    >>> ('plone_control_panel' in self.browser.url or
+    ...  '@@overview-controlpanel' in self.browser.url)
     True
 
 Navigate back to the syndication settings: