diff --git a/module/testtask/config.php b/module/testtask/config.php index 66c12c437d..487bcd113a 100644 --- a/module/testtask/config.php +++ b/module/testtask/config.php @@ -22,5 +22,5 @@ $config->testtask->datatable = new stdclass(); $config->testtask->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'stepNumber','actions'); $config->testtask->unitResultRules = new stdclass(); -$config->testtask->unitResultRules->common = array('path' => array('testsuite/testcase', 'testcase'), 'name' => array('classname', 'name'), 'failure' => 'failure', 'suite' => 'name', 'aliasSuite' => array('classname')); -$config->testtask->unitResultRules->phpunit = array('path' => array('test', 'testsuite/testcase', 'testcase'), 'name' => array('className', 'methodName'), 'aliasName' => array('classname', 'name'), 'failure' => 'failure', 'suite' => 'name', 'aliasSuite' => array('classname', 'className')); +$config->testtask->unitResultRules->common = array('path' => array('testsuite/testcase', 'testcase'), 'name' => array('classname', 'name'), 'failure' => 'failure', 'skipped' => 'skipped', 'suite' => 'name', 'aliasSuite' => array('classname')); +$config->testtask->unitResultRules->phpunit = array('path' => array('test', 'testsuite/testcase', 'testcase'), 'name' => array('className', 'methodName'), 'aliasName' => array('classname', 'name'), 'failure' => 'failure', 'skipped' => 'skipped', 'suite' => 'name', 'aliasSuite' => array('classname', 'className')); diff --git a/module/testtask/model.php b/module/testtask/model.php index 7b55416254..7074579c6c 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1902,6 +1902,7 @@ class testtaskModel extends model $matchPaths = $rules['path']; $nameFields = $rules['name']; $failure = $rules['failure']; + $skipped = $rules['skipped']; $suiteField = $rules['suite']; $aliasSuite = zget($rules, 'aliasSuite', array()); $aliasName = zget($rules, 'aliasName', array()); @@ -2027,6 +2028,12 @@ class testtaskModel extends model $result->stepResults[0]['real'] = (string)$failureAttrs['message']; } } + elseif(isset($matchNode->$skipped)) + { + $result->caseResult = 'n/a'; + $result->stepResults[0]['result'] = 'n/a'; + $result->stepResults[0]['real'] = ''; + } $result->stepResults = serialize($result->stepResults); $case->lastRunner = $this->app->user->account; $case->lastRunDate = $now;