fix: Move evaluation of "has*" instructions after "is*" instructions

Allow existence check before class check in a single block. Forgotten change in the previous commit.

Author: prantlf

INSTRUCTIONS.md

@@ -22,12 +22,6 @@ One of the instructions has to be present in every command. These properties are
 - [keys](#keys)
 - [elementSendKeys](#elementSendKeys)
 - [wait](#wait)
-- [hasAttribute](#hasattribute)
-- [hasClass](#hasclass)
-- [hasValue](#hasvalue)
-- [hasText](#hastext)
-- [hasInnerHtml](#hasinnerhtml)
-- [hasOuterHtml](#hasouterhtml)
 - [isExisting](#isexisting)
 - [isVisible](#isvisible)
 - [isVisibleWithinViewport](#isvisiblewithinviewport)
@@ -40,6 +34,12 @@ One of the instructions has to be present in every command. These properties are
 - [isNotEnabled](#isnotenabled)
 - [isNotSelected](#isnotselected)
 - [isNotFocused](#isnotfocused)
+- [hasAttribute](#hasattribute)
+- [hasClass](#hasclass)
+- [hasValue](#hasvalue)
+- [hasText](#hastext)
+- [hasInnerHtml](#hasinnerhtml)
+- [hasOuterHtml](#hasouterhtml)
 - [break](#break)
 - [abort](#abort)
 - [file](#file)

README.md

@@ -297,12 +297,6 @@ One of the [instructions] has to be present in every command, otherwise its exec
 * [keys](INSTRUCTIONS.md#keys)
 * [elementSendKeys](INSTRUCTIONS.md#elementSendKeys)
 * [wait](INSTRUCTIONS.md#wait)
-* [hasAttribute](INSTRUCTIONS.md#hasattribute)
-* [hasClass](INSTRUCTIONS.md#hasclass)
-* [hasValue](INSTRUCTIONS.md#hasvalue)
-* [hasText](INSTRUCTIONS.md#hastext)
-* [hasInnerHtml](INSTRUCTIONS.md#hasinnerhtml)
-* [hasOuterHtml](INSTRUCTIONS.md#hasouterhtml)
 * [isExisting](INSTRUCTIONS.md#isexisting)
 * [isVisible](INSTRUCTIONS.md#isvisible)
 * [isVisibleWithinViewport](INSTRUCTIONS.md#isvisiblewithinviewport)
@@ -315,6 +309,12 @@ One of the [instructions] has to be present in every command, otherwise its exec
 * [isNotEnabled](INSTRUCTIONS.md#isnotenabled)
 * [isNotSelected](INSTRUCTIONS.md#isnotselected)
 * [isNotFocused](INSTRUCTIONS.md#isnotfocused)
+* [hasAttribute](INSTRUCTIONS.md#hasattribute)
+* [hasClass](INSTRUCTIONS.md#hasclass)
+* [hasValue](INSTRUCTIONS.md#hasvalue)
+* [hasText](INSTRUCTIONS.md#hastext)
+* [hasInnerHtml](INSTRUCTIONS.md#hasinnerhtml)
+* [hasOuterHtml](INSTRUCTIONS.md#hasouterhtml)
 * [break](INSTRUCTIONS.md#break)
 * [abort](INSTRUCTIONS.md#abort)
 * [file](INSTRUCTIONS.md#file)

tasks/html-dom-snapshot.js

@@ -10,12 +10,13 @@ const mkdirp = require('mkdirp')
 const instructionKeys = [
   'setViewport', 'url', 'go', 'scroll', 'focus', 'clearValue', 'setValue',
   'addValue', 'selectOptionByIndex', 'selectOptionByValue', 'moveCursor',
-  'click', 'clickIfVisible', 'keys', 'elementSendKeys', 'wait', 'hasAttribute',
-  'hasClass', 'hasValue', 'hasText', 'hasInnerHtml', 'hasOuterHtml',
+  'click', 'clickIfVisible', 'keys', 'elementSendKeys', 'wait',
   'isExisting', 'isVisible', 'isVisibleWithinViewport', 'isEnabled',
   'isSelected', 'isFocused', 'isNotExisting', 'isNotVisible',
   'isNotVisibleWithinViewport', 'isNotEnabled', 'isNotFocused',
-  'isNotSelected', 'break', 'abort'
+  'isNotSelected', 'hasAttribute', 'hasClass', 'hasValue', 'hasText',
+  'hasInnerHtml', 'hasOuterHtml',
+  'break', 'abort'
 ]
 const instructions = instructionKeys.map(instruction =>
   require('./instructions/' + instruction))