diff --git a/src/collective/lazysizes/tests/test_setup.py b/src/collective/lazysizes/tests/test_setup.py index 5db0a63..b312ecb 100644 --- a/src/collective/lazysizes/tests/test_setup.py +++ b/src/collective/lazysizes/tests/test_setup.py @@ -10,8 +10,9 @@ JS = ( - '++resource++collective.lazysizes/ls.twitter.min.js', - '++resource++collective.lazysizes/lazysizes-umd.min.js', + '++resource++collective.lazysizes/lazysizes/plugins/twitter/ls.twitter.min.js', + '++resource++collective.lazysizes/lazysizes/lazysizes-umd.min.js', + '++resource++collective.lazysizes/lazysizes/plugins/print/ls.print.min.js', ) @@ -48,7 +49,7 @@ def test_version(self): profile = 'collective.lazysizes:default' setup_tool = self.portal['portal_setup'] self.assertEqual( - setup_tool.getLastVersionForProfile(profile), (u'9',)) + setup_tool.getLastVersionForProfile(profile), (u'10',)) class UninstallTestCase(unittest.TestCase): diff --git a/src/collective/lazysizes/tests/test_upgrades.py b/src/collective/lazysizes/tests/test_upgrades.py index 6a10e3d..b0fb043 100644 --- a/src/collective/lazysizes/tests/test_upgrades.py +++ b/src/collective/lazysizes/tests/test_upgrades.py @@ -47,7 +47,7 @@ def setUp(self): def test_upgrade_to_2_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 2) def test_add_new_field_to_configlet(self): @@ -82,7 +82,7 @@ def setUp(self): def test_upgrade_to_2_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 1) @@ -93,7 +93,7 @@ def setUp(self): def test_upgrade_to_2_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 2) @unittest.skipIf(IS_PLONE_5, 'No easy way to test this under Plone 5') @@ -128,7 +128,7 @@ def setUp(self): def test_upgrade_to_2_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 2) @unittest.skipIf(IS_PLONE_5, 'Upgrade step not supported under Plone 5') @@ -158,7 +158,7 @@ def setUp(self): def test_upgrade_to_6_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 1) @@ -169,7 +169,7 @@ def setUp(self): def test_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 2) @unittest.skipIf(IS_PLONE_5, 'Upgrade step not supported under Plone 5') @@ -197,7 +197,7 @@ def setUp(self): def test_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 1) def test_add_new_field_to_configlet(self): @@ -232,5 +232,16 @@ def setUp(self): def test_registrations(self): version = self.setup.getLastVersionForProfile(self.profile_id)[0] - self.assertGreaterEqual(version, self.to_version) + self.assertGreaterEqual(int(version), int(self.to_version)) self.assertEqual(self.total_steps, 1) + + +class To10TestCase(UpgradeTestCaseBase): + + def setUp(self): + UpgradeTestCaseBase.setUp(self, u'9', u'10') + + def test_registrations(self): + version = self.setup.getLastVersionForProfile(self.profile_id)[0] + self.assertGreaterEqual(int(version), int(self.to_version)) + self.assertEqual(self.total_steps, 3)