Skip to content
Snippets Groups Projects
Commit 355c3d7a authored by Bastien Abadie's avatar Bastien Abadie
Browse files

Merge branch 'restore-worker-slug' into 'master'

Restore worker slug on RetrieveWorkerVersion

Closes #662

See merge request !1243
parents 0a6d731c 45421269
No related branches found
No related tags found
1 merge request!1243Restore worker slug on RetrieveWorkerVersion
......@@ -25,7 +25,7 @@ class WorkerLightSerializer(serializers.ModelSerializer):
class Meta:
model = Worker
fields = ('id', 'name', 'type')
fields = ('id', 'name', 'type', 'slug')
class WorkerSerializer(WorkerLightSerializer):
......@@ -36,7 +36,7 @@ class WorkerSerializer(WorkerLightSerializer):
class Meta(WorkerLightSerializer.Meta):
model = Worker
fields = WorkerLightSerializer.Meta.fields + ('slug', 'repository_id')
fields = WorkerLightSerializer.Meta.fields + ('repository_id', )
class WorkerVersionSerializer(serializers.ModelSerializer):
......
......@@ -68,6 +68,7 @@ class TestWorkerRuns(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
}])
......@@ -169,7 +170,8 @@ class TestWorkerRuns(FixtureAPITestCase):
'worker': {
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
......@@ -236,6 +238,7 @@ class TestWorkerRuns(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
......@@ -357,6 +360,7 @@ class TestWorkerRuns(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
self.run_1.refresh_from_db()
......@@ -415,6 +419,7 @@ class TestWorkerRuns(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
......
......@@ -359,6 +359,7 @@ class TestWorkersWorkerVersions(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
......@@ -549,6 +550,7 @@ class TestWorkersWorkerVersions(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
......@@ -570,6 +572,7 @@ class TestWorkersWorkerVersions(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
})
......@@ -807,6 +810,7 @@ class TestWorkersWorkerVersions(FixtureAPITestCase):
'id': str(self.worker_1.id),
'name': self.worker_1.name,
'type': self.worker_1.type,
'slug': self.worker_1.slug,
}
}]
})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment