Skip to content

Commit

Permalink
Move upgrade step for issue #303 to version 6.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpgimenez committed Oct 11, 2013
1 parent f01a27f commit b840f75
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 21 deletions.
8 changes: 0 additions & 8 deletions src/collective/cover/profiles.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
handler=".upgrades.issue_201"
/>

</genericsetup:upgradeSteps>

<genericsetup:upgradeSteps
source="6"
destination="7"
profile="collective.cover:default"
>

<genericsetup:upgradeStep
title="issue_303"
description="Remove unused bundles from portal_javascript."
Expand Down
2 changes: 1 addition & 1 deletion src/collective/cover/profiles/default/metadata.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<metadata>
<version>7</version>
<version>6</version>
<dependencies>
<dependency>profile-collective.js.galleria:default</dependency>
<dependency>profile-collective.js.jqueryui:default</dependency>
Expand Down
13 changes: 1 addition & 12 deletions src/collective/cover/tests/test_upgrades.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def setUp(self):
def test_upgrade_to_6_registrations(self):
version = self.setup.getLastVersionForProfile(self.profile_id)[0]
self.assertTrue(version >= self.to_version)
self.assertEqual(self._how_many_upgrades_to_do(), 1)
self.assertEqual(self._how_many_upgrades_to_do(), 2)

def test_issue_201(self):
# check if the upgrade step is registered
Expand Down Expand Up @@ -83,17 +83,6 @@ def test_issue_201(self):
self.assertNotIn(old_js, js_tool.getResourceIds())
self.assertIn(new_js, js_tool.getResourceIds())


class Upgrade6to7TestCase(UpgradeTestCaseBase):

def setUp(self):
UpgradeTestCaseBase.setUp(self, u'6', u'7')

def test_upgrade_to_7_registrations(self):
version = self.setup.getLastVersionForProfile(self.profile_id)[0]
self.assertTrue(version >= self.to_version)
self.assertEqual(self._how_many_upgrades_to_do(), 1)

def test_issue_303(self):
# check if the upgrade step is registered
title = u'issue_303'
Expand Down

0 comments on commit b840f75

Please sign in to comment.