diff options
Diffstat (limited to 'ui/tests/selenium/testFormTriggerPrototype.php')
| -rw-r--r-- | ui/tests/selenium/testFormTriggerPrototype.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ui/tests/selenium/testFormTriggerPrototype.php b/ui/tests/selenium/testFormTriggerPrototype.php index 192cd641248..be6c96362f5 100644 --- a/ui/tests/selenium/testFormTriggerPrototype.php +++ b/ui/tests/selenium/testFormTriggerPrototype.php @@ -527,77 +527,77 @@ class testFormTriggerPrototype extends CLegacyWebTest { [ 'expected' => TEST_GOOD, 'description' => 'MyTrigger_sysUptime', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => '1234567890', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => 'a?aa+', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => '}aa]a{', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => '-aaa=%', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => 'aaa,;:', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => 'aaa><.', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => 'aaa*&_', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => 'aaa#@!', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => '([)$^', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0' + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0' ] ], [ [ 'expected' => TEST_GOOD, 'description' => 'MyTrigger_generalCheck', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<5', + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<5', 'type' => true, 'comments' => 'Trigger status (expression) is recalculated every time Zabbix server receives new value, if this value is part of this expression. If time based functions are used in the expression, it is recalculated every 30 seconds by a zabbix timer process. ', 'url_name' => 'Trigger context menu name for trigger URL.', @@ -610,7 +610,7 @@ class testFormTriggerPrototype extends CLegacyWebTest { [ 'expected' => TEST_GOOD, 'description' => 'MyTrigger_CheckUrl', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<5', + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<5', 'url_name' => 'MyTrigger: menu name', 'url' => 'index.php' ] @@ -653,10 +653,10 @@ class testFormTriggerPrototype extends CLegacyWebTest { [ 'expected' => TEST_BAD, 'description' => 'MyTrigger', - 'expression' => 'last(/Simple form test host/item-prototype-reuse,#1)<0 or {#MACRO}', + 'expression' => 'last(/Simple form test host/item-prototype-reuse[{#KEY}],#1)<0 or {#MACRO}', 'constructor' => [ 'text' => ['A or B', 'A', 'B'], - 'elements' => ['expr_0_53', 'expr_58_65'] + 'elements' => ['expr_0_61', 'expr_66_73'] ] ] ], @@ -812,7 +812,7 @@ class testFormTriggerPrototype extends CLegacyWebTest { if (isset($data['expression'])) { switch ($data['expression']) { case 'default': - $expression = 'last(/'.$this->host.'/'.$this->itemKey.',#1)=0'; + $expression = 'last(/'.$this->host.'/'.$this->itemKey.'[{#KEY}],#1)=0'; $this->zbxTestInputType('expression', $expression); break; default: |