Skip to content

Commit d576663

Browse files
authored
Merge pull request #2780 from DFE-Digital/AQTS-1017-bug-fix
AQTS 1017 work history bug fix
2 parents 9807c4d + 517fda2 commit d576663

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

app/controllers/teacher_interface/work_histories_controller.rb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,16 @@ def destroy
227227
)
228228

229229
if @form.save(validate: true)
230-
redirect_to %i[check teacher_interface application_form work_histories]
230+
if application_form.work_histories.none?
231+
redirect_to %i[new teacher_interface application_form work_history]
232+
else
233+
redirect_to %i[
234+
check
235+
teacher_interface
236+
application_form
237+
work_histories
238+
]
239+
end
231240
else
232241
send_errors_to_big_query(@form)
233242

spec/system/teacher_interface/work_history_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,19 @@
7171
when_i_delete_work_history
7272
then_i_see_the(:teacher_check_work_histories_page)
7373
and_i_see_two_work_histories
74+
75+
when_i_click_delete_work_history
76+
then_i_see_the(:teacher_delete_work_history_page)
77+
78+
when_i_delete_work_history
79+
then_i_see_the(:teacher_check_work_histories_page)
80+
and_i_see_one_work_history
81+
82+
when_i_click_delete_work_history
83+
then_i_see_the(:teacher_delete_work_history_page)
84+
85+
when_i_delete_work_history
86+
then_i_see_the(:teacher_new_work_history_page)
7487
end
7588

7689
private
@@ -262,6 +275,10 @@ def and_i_see_two_work_histories
262275
expect(teacher_check_work_histories_page.summary_cards.count).to eq(2)
263276
end
264277

278+
def and_i_see_one_work_history
279+
expect(teacher_check_work_histories_page.summary_cards.count).to eq(1)
280+
end
281+
265282
def teacher
266283
@teacher ||= create(:teacher)
267284
end

0 commit comments

Comments
 (0)