diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 6fa4216e67..5e98afad89 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -51,6 +51,7 @@ $lang->testtask->linkedCases = 'Linked cases'; $lang->testtask->confirmDelete = 'Are you sure to delete this test task?'; $lang->testtask->passAll = 'Pass all'; $lang->testtask->pass = 'Pass'; +$lang->testtask->fail = 'Fail'; $lang->testtask->byModule = 'By module'; $lang->testtask->assignedToMe = 'Assgined to me'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 5f6dbad531..7554468797 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -51,6 +51,7 @@ $lang->testtask->linkedCases = '已关联用例列表'; $lang->testtask->confirmDelete = '您确认要删除该测试任务吗?'; $lang->testtask->passAll = '全部通过'; $lang->testtask->pass = '通过'; +$lang->testtask->fail = '失败'; $lang->testtask->byModule = '按模块'; $lang->testtask->assignedToMe = '指派给我'; diff --git a/module/testtask/model.php b/module/testtask/model.php index 60f04d93f7..c414bac9b6 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -208,14 +208,21 @@ class testtaskModel extends model $caseResult = 'pass'; if(!$this->post->passall) { - foreach($this->post->steps as $stepID => $stepResult) + if(isset($this->post->steps)) { - if($stepResult != 'pass' and $stepResult != 'n/a') + foreach($this->post->steps as $stepID => $stepResult) { - $caseResult = $stepResult; - break; + if($stepResult != 'pass' and $stepResult != 'n/a') + { + $caseResult = $stepResult; + break; + } } } + else + { + $caseResult = 'fail'; + } } /* Create result of every step. */ diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php index a06529fcad..d025f86a16 100644 --- a/module/testtask/view/runcase.html.php +++ b/module/testtask/view/runcase.html.php @@ -40,6 +40,7 @@ if(empty($run->case->steps)) { echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)"); + echo html::submitButton($lang->testtask->fail, "onclick=$('#passall').val(0)"); } else {