Skip to content

Commit 2573dcd

Browse files
committed
fix test
1 parent 4819470 commit 2573dcd

File tree

1 file changed

+30
-11
lines changed

1 file changed

+30
-11
lines changed

contentcuration/contentcuration/tests/viewsets/test_channel.py

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,10 +1253,12 @@ def setUp(self):
12531253
super().setUp()
12541254

12551255
self.editor_user = testdata.user(email="[email protected]")
1256+
self.admin_user = testdata.user(email="[email protected]")
12561257
self.forbidden_user = testdata.user(email="[email protected]")
12571258

12581259
self.channel = testdata.channel()
12591260
self.channel.editors.add(self.editor_user)
1261+
self.channel.editors.add(self.admin_user)
12601262

12611263
self.channel.published_data = {
12621264
"key1": "value1",
@@ -1270,13 +1272,22 @@ def test_get_version_detail__is_editor(self):
12701272

12711273
self.client.force_authenticate(user=self.editor_user)
12721274

1273-
# Create a ChannelVersion and set it as version_info
1274-
channel_version = ChannelVersion.objects.create(
1275+
self.channel.version = 1
1276+
self.channel.save()
1277+
1278+
channel_version, created = ChannelVersion.objects.get_or_create(
12751279
channel=self.channel,
12761280
version=1,
1277-
resource_count=100,
1278-
size=1024000,
1279-
)
1281+
defaults={
1282+
"resource_count": 100,
1283+
"size": 1024000,
1284+
}
1285+
)
1286+
if not created:
1287+
channel_version.resource_count = 100
1288+
channel_version.size = 1024000
1289+
channel_version.save()
1290+
12801291
self.channel.version_info = channel_version
12811292
self.channel.save()
12821293

@@ -1287,7 +1298,6 @@ def test_get_version_detail__is_editor(self):
12871298
self.assertEqual(response.status_code, 200, response.content)
12881299
data = response.json()
12891300

1290-
# Assert against the most recent ChannelVersion
12911301
self.assertEqual(data["version"], 1)
12921302
self.assertEqual(data["resource_count"], 100)
12931303
self.assertEqual(data["size"], 1024000)
@@ -1298,13 +1308,22 @@ def test_get_version_detail__is_admin(self):
12981308

12991309
self.client.force_authenticate(user=self.admin_user)
13001310

1301-
# Create a ChannelVersion and set it as version_info
1302-
channel_version = ChannelVersion.objects.create(
1311+
self.channel.version = 2
1312+
self.channel.save()
1313+
1314+
channel_version, created = ChannelVersion.objects.get_or_create(
13031315
channel=self.channel,
13041316
version=2,
1305-
resource_count=200,
1306-
size=2048000,
1307-
)
1317+
defaults={
1318+
"resource_count": 200,
1319+
"size": 2048000,
1320+
}
1321+
)
1322+
if not created:
1323+
channel_version.resource_count = 200
1324+
channel_version.size = 2048000
1325+
channel_version.save()
1326+
13081327
self.channel.version_info = channel_version
13091328
self.channel.save()
13101329

0 commit comments

Comments
 (0)