Merge pull request #5481 from jdi-testing/5363

#5363 Fix locators, add tasks
jdi-testing · Apr 22, 2024 · b281431 · b281431
2 parents 72d00db + 70867b9
commit b281431
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/FileInputsPage.java b/jdi-light-vuetify-tests/src/main/java/io/github/com/pages/FileInputsPage.java
@@ -19,17 +19,16 @@ public class FileInputsPage extends VuetifyPage {
     @JDIFileInput(root = "#MultipleFileInput.v-file-input")
     public static FileInput multipleFileInput;
 
-    // @todo #5298 Locators should use .v-file-input class
-    @JDIFileInput(root = "//*[@id='AppendPrependIconFileInput']/div[1]")
+    @JDIFileInput(root = "#AppendPrependIconFileInput .v-file-input")
     public static FileInput prependIconFileInput;
 
-    @JDIFileInput(root = "//*[@id='AppendPrependIconFileInput']/div[2]")
+    @JDIFileInput(root = "#AppendPrependIconFileInput .v-file-input:nth-child(2)")
     public static FileInput prependInnerIconFileInput;
 
-    @JDIFileInput(root = "//*[@id='AppendPrependIconFileInput']/div[3]")
+    @JDIFileInput(root = "#AppendPrependIconFileInput .v-file-input:nth-child(3)")
     public static FileInput appendIconWithSuffixFileInput;
 
-    @JDIFileInput(root = "//*[@id='AppendPrependIconFileInput']/div[4]")
+    @JDIFileInput(root = "#AppendPrependIconFileInput .v-file-input:nth-child(4)")
     public static FileInput appendOuterIconWithPrefixFileInput;
 
     @JDIFileInput(root = "#ShowSizeFileInput.v-file-input")

diff --git a/...ght-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/FileInputsTests.java b/...ght-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/FileInputsTests.java
@@ -54,6 +54,7 @@ public void before() {
 
     @BeforeClass
     public void createFiles() throws IOException {
+        // @todo #5363 fix paths to do not use src, they are available in resources
         pathTXT = Paths.get(mergePath(COMMON.projectPath, "/src/test/resources/TextTestFile.txt"));
         pathPNG = Paths.get(mergePath(COMMON.projectPath, "/src/test/resources/ImageTestFile.png"));
         Files.deleteIfExists(pathTXT);

diff --git a/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/annotations/JDIFileInput.java b/jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/annotations/JDIFileInput.java
@@ -11,5 +11,7 @@
 @Target({ElementType.TYPE, ElementType.FIELD})
 public @interface JDIFileInput {
     @MarkupLocator String root() default "";
+    // @todo #5363 Check if this descriptor is needed, add a tests if needed,
+    //  delete if not needed with all annotation
     @MarkupLocator String files() default "";
 }