# Compensation State view refactoring
* refactors compensation state views for kom, ema, oek * updates tests * refactors before-after state toggling into initialization of NewCompensationStateModalForm
This commit is contained in:
@@ -190,12 +190,20 @@ class NewCompensationStateModalFormTestCase(BaseTestCase):
|
||||
self.assertEqual(self.compensation.before_states.count(), 0)
|
||||
self.assertEqual(self.compensation.after_states.count(), 0)
|
||||
|
||||
form = NewCompensationStateModalForm(data, request=self.request, instance=self.compensation)
|
||||
|
||||
self.request.GET._mutable = True
|
||||
self.request.GET.update(
|
||||
{
|
||||
"before": True,
|
||||
}
|
||||
)
|
||||
self.request.GET._mutable = False
|
||||
form = NewCompensationStateModalForm(
|
||||
data,
|
||||
request=self.request,
|
||||
instance=self.compensation,
|
||||
)
|
||||
self.assertTrue(form.is_valid(), msg=form.errors)
|
||||
|
||||
is_before_state = True
|
||||
state = form.save(is_before_state)
|
||||
state = form.save()
|
||||
|
||||
self.assertEqual(self.compensation.before_states.count(), 1)
|
||||
self.assertEqual(self.compensation.after_states.count(), 0)
|
||||
@@ -209,8 +217,16 @@ class NewCompensationStateModalFormTestCase(BaseTestCase):
|
||||
self.assertEqual(last_log.action, UserAction.EDITED)
|
||||
self.assertEqual(last_log.comment, ADDED_COMPENSATION_STATE)
|
||||
|
||||
is_before_state = False
|
||||
state = form.save(is_before_state)
|
||||
self.request.GET._mutable = True
|
||||
del self.request.GET["before"]
|
||||
self.request.GET._mutable = False
|
||||
form = NewCompensationStateModalForm(
|
||||
data,
|
||||
request=self.request,
|
||||
instance=self.compensation,
|
||||
)
|
||||
self.assertTrue(form.is_valid(), msg=form.errors)
|
||||
state = form.save()
|
||||
|
||||
self.assertEqual(self.compensation.before_states.count(), 1)
|
||||
self.assertEqual(self.compensation.after_states.count(), 1)
|
||||
@@ -234,7 +250,11 @@ class EditCompensationStateModalFormTestCase(NewCompensationStateModalFormTestCa
|
||||
self.compensation.after_states.add(self.comp_state)
|
||||
|
||||
def test_init(self):
|
||||
form = EditCompensationStateModalForm(request=self.request, instance=self.compensation, state=self.comp_state)
|
||||
form = EditCompensationStateModalForm(
|
||||
request=self.request,
|
||||
instance=self.compensation,
|
||||
state_id=self.comp_state.id
|
||||
)
|
||||
|
||||
self.assertEqual(form.state, self.comp_state)
|
||||
self.assertEqual(form.form_title, str(_("Edit state")))
|
||||
@@ -265,7 +285,7 @@ class EditCompensationStateModalFormTestCase(NewCompensationStateModalFormTestCa
|
||||
data,
|
||||
request=self.request,
|
||||
instance=self.compensation,
|
||||
state=self.comp_state
|
||||
state_id=self.comp_state.id
|
||||
)
|
||||
self.assertTrue(form.is_valid(), msg=form.errors)
|
||||
|
||||
@@ -286,7 +306,11 @@ class RemoveCompensationStateModalFormTestCase(EditCompensationStateModalFormTes
|
||||
super().setUp()
|
||||
|
||||
def test_init(self):
|
||||
form = RemoveCompensationStateModalForm(request=self.request, instance=self.compensation, state=self.comp_state)
|
||||
form = RemoveCompensationStateModalForm(
|
||||
request=self.request,
|
||||
instance=self.compensation,
|
||||
state_id=self.comp_state.id
|
||||
)
|
||||
|
||||
self.assertEqual(form.state, self.comp_state)
|
||||
|
||||
@@ -298,7 +322,7 @@ class RemoveCompensationStateModalFormTestCase(EditCompensationStateModalFormTes
|
||||
data,
|
||||
request=self.request,
|
||||
instance=self.compensation,
|
||||
state=self.comp_state
|
||||
state_id=self.comp_state.id
|
||||
)
|
||||
self.assertTrue(form.is_valid(), msg=form.errors)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user