merge aftermath

plone · Sep 27, 2018 · aafe823 · aafe823
2 parents 7e5ada9 + 340a19c
commit aafe823
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -19,6 +19,12 @@ New features:
 - Add support for Python 3.5 and 3.6.
   [loechel, ale-rt, icemac]
 
+- Add copy of bbb.PloneTestCase. 
+  For Plone 5.2 the bbb.PloneTestCase will uses Dexterity instead of Archetypes. 
+  Adding bbb_at.PloneTestCase for them to use allows to keep the AT tests working. 
+  See https://github.com/plone/plone.app.testing/pull/51
+  [pbauer]
+
 Bug fixes:
 
 - *none yet*

diff --git a/src/plone/app/testing/bbb_at.py b/src/plone/app/testing/bbb_at.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+<<<<<<< HEAD:src/plone/app/testing/bbb_at.py:src/plone/app/testing/bbb_at.py
 """Backwards-compatibility test class for PloneTestCase for Archetypes."""
+=======
+"""Backwards-compatibility test class for PloneTestCase for Dexterity."""
+>>>>>>> master:plone/app/testing/bbb.py:plone/app/testing/bbb.py
 
 from AccessControl import getSecurityManager
 from plone.app import testing