Skip to content

Commit

Permalink
Refactor tests to avoid depending on the Folder content type
Browse files Browse the repository at this point in the history
This way we can avoid installing plone.app.contenttypes on tests for Plone 5.0.
  • Loading branch information
hvelarde committed Aug 27, 2014
1 parent f9ce019 commit c132c7f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
4 changes: 1 addition & 3 deletions src/collective/liveblog/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ class Fixture(PloneSandboxLayer):
defaultBases = (PLONE_FIXTURE,)

def setUpZope(self, app, configurationContext):
# Load ZCML
import collective.liveblog
self.loadZCML(package=collective.liveblog)

def setUpPloneSite(self, portal):
self.applyProfile(
portal, 'collective.liveblog:default')
self.applyProfile(portal, 'collective.liveblog:default')


FIXTURE = Fixture()
Expand Down
4 changes: 2 additions & 2 deletions src/collective/liveblog/tests/test_adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class ContentTypeTestCase(unittest.TestCase):
def setUp(self):
self.portal = self.layer['portal']
with api.env.adopt_roles(['Manager']):
self.folder = api.content.create(self.portal, 'Folder', 'test')
self.liveblog = api.content.create(self.folder, 'Liveblog', 'liveblog')
self.liveblog = api.content.create(
self.portal, 'Liveblog', 'liveblog')

def test_adding(self):
adapter = IMicroUpdateContainer(self.liveblog)
Expand Down
4 changes: 2 additions & 2 deletions src/collective/liveblog/tests/test_liveblog.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class ContentTypeTestCase(unittest.TestCase):
def setUp(self):
self.portal = self.layer['portal']
with api.env.adopt_roles(['Manager']):
self.folder = api.content.create(self.portal, 'Folder', 'test')
self.liveblog = api.content.create(self.folder, 'Liveblog', 'liveblog')
self.liveblog = api.content.create(
self.portal, 'Liveblog', 'liveblog')

def test_adding(self):
self.assertTrue(ILiveblog.providedBy(self.liveblog))
Expand Down
4 changes: 2 additions & 2 deletions src/collective/liveblog/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def setUp(self):
self.request = self.layer['request']
directlyProvides(self.request, IBrowserLayer)
with api.env.adopt_roles(['Manager']):
self.folder = api.content.create(self.portal, 'Folder', 'test')
self.liveblog = api.content.create(self.folder, 'Liveblog', 'liveblog')
self.liveblog = api.content.create(
self.portal, 'Liveblog', 'liveblog')

def test_add_microupdate_no_parameters(self):
# invoke the view and check the status message
Expand Down

0 comments on commit c132c7f

Please sign in to comment.