Merge pull request #5377 from jdi-testing/5367_fix_sliders

Slider is a controll with v-input--slider class

Author: pnatashap

jdi-light-vuetify-tests/src/main/java/io/github/com/custom/AdvancedCombobox.java

@@ -12,7 +12,7 @@
 import static com.epam.jdi.light.driver.get.DriverData.getOs;
 
 /**
- * To see example of AdvancedCombobox web element please visit https://vuetifyjs.com/en/components/combobox/
+ * To see example of AdvancedCombobox web element please visit https://v2.vuetifyjs.com/en/components/combobox/
  */
 
 public class AdvancedCombobox extends Combobox {

jdi-light-vuetify-tests/src/main/java/io/github/com/custom/ProfileCard.java

@@ -9,7 +9,7 @@
  * Represents profile card Vuetify component on GUI.
  * Profile card contains avatar image, background image, username and job function.
  *
- * @see <a href="https://vuetifyjs.com/en/components/avatars/#profile-card">Profile Card Vuetify documentation</a>
+ * @see <a href="https://v2.vuetifyjs.com/en/components/avatars/#profile-card">Profile Card Vuetify documentation</a>
  * @see <a href="https://jdi-testing.github.io/jdi-light/vuetify/">Vuetify test page</a>
  */
 

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/FloatingActionButtonsPage.java

@@ -12,7 +12,7 @@
 
 /**
  * To see an example of Alert web element please visit
- * https://vuetifyjs.com/en/components/floating-action-buttons/
+ * https://v2.vuetifyjs.com/en/components/floating-action-buttons/
  */
 
 public class FloatingActionButtonsPage extends VuetifyPage {

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/ImagesPage.java

@@ -8,7 +8,7 @@
 
 public class ImagesPage extends VuetifyPage {
 
-    @UI("#AspectRatioImage .v-slider")
+    @UI("#AspectRatioImage .v-input__slider")
     public static Slider slider;
 
     @UI("#AspectRatioImage .v-image")

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/RatingsPage.java

@@ -29,7 +29,7 @@ public class RatingsPage extends VuetifyPage {
     @UI("#LengthRating .v-rating")
     public static Rating lengthRating;
 
-    @UI("#LengthRating .v-slider")
+    @UI("#LengthRating .v-input__slider")
     public static Slider lengthRatingSlider;
 
     @JDIRating(root = "#IncrementedRating .v-rating",

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SlidersPage.java

@@ -9,49 +9,48 @@
 
 public class SlidersPage extends VuetifyPage {
 
-    @UI("#ColorsSlider .v-slider")
+    @UI("#ColorsSlider .v-input__slider")
     public static List<Slider> colorsSlider;
 
-    @UI("#DisabledSlider .v-slider")
+    @UI("#DisabledSlider .v-input__slider")
     public static Slider disabledSlider;
 
-    // @todo #5298 Locator with .v-slider should be used
-    @UI("#DisabledSlider .v-input__control")
+    @UI("#DisabledSlider .v-input__slider")
     public static Slider disabledSliderControl;
 
-    @UI("#DiscreteSlider .v-slider")
+    @UI("#DiscreteSlider .v-input__slider")
     public static Slider discreteSlider;
 
-    @UI("#IconsSlider .v-slider")
+    @UI("#IconsSlider .v-input__slider")
     public static List<Slider> iconsSlider;
-    @UI("#InverseLabelSlider .v-slider")
+    @UI("#InverseLabelSlider .v-input__slider")
     public static Slider inverseLabelSlider;
 
-    @UI("#ReadonlySlider .v-slider")
+    @UI("#ReadonlySlider .v-input__slider")
     public static Slider readonlySlider;
 
-    @UI("#StepSlider .v-slider")
+    @UI("#StepSlider .v-input__slider")
     public static Slider stepSlider;
 
-    @UI("#ThumbSlider .v-slider")
+    @UI("#ThumbSlider .v-input__slider")
     public static List<Slider> thumbSlider;
 
-    @UI("#TicksSlider .v-slider")
+    @UI("#TicksSlider .v-input__slider")
     public static List<Slider> ticksSlider;
 
-    @UI("#ValidationSlider .v-slider")
+    @UI("#ValidationSlider .v-input__slider")
     public static List<Slider> validationSlider;
 
-    @UI("#VerticalSlidersSlider .v-slider")
+    @UI("#VerticalSlidersSlider .v-input__slider")
     public static Slider verticalSlidersSlider;
 
-    @UI("#AppendTextFieldSlider .v-slider")
+    @UI("#AppendTextFieldSlider .v-input__slider")
     public static List<Slider> appendTextFieldSlider;
 
     @UI("#AppendTextFieldSlider .v-text-field__slot")
     public static List<TextField> appendTextField;
 
-    @UI("#AdjustableSlider .slider")
+    @UI("#AdjustableSlider .v-input__slider")
     public static Slider adjustableSlider;
 
     @UI("#AdjustableSlider .v-input--switch [1]")

jdi-light-vuetify-tests/src/main/java/io/github/com/pages/SparklinesPage.java

@@ -14,13 +14,13 @@ public class SparklinesPage extends VuetifyPage {
     @UI(".mr-2.v-card")
     public static WebList fillSparklineColorSwitches;
 
-    @UI("#FillSparkline .v-slider[1]")
+    @UI("#FillSparkline .v-input__slider[1]")
     public static Slider fillSparklineWidthSlider;
 
-    @UI("#FillSparkline .v-slider[2]")
+    @UI("#FillSparkline .v-input__slider[2]")
     public static Slider fillSparklineRadiusSlider;
 
-    @UI("#FillSparkline .v-slider[3]")
+    @UI("#FillSparkline .v-input__slider[3]")
     public static Slider fillSparklinePaddingSlider;
 
     @UI("#FillSparkline .v-input--selection-controls__input")

jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/RatingsTests.java

@@ -6,7 +6,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.stream.IntStream;
+import java.util.Random;
 
 import static com.jdiai.tools.Timer.waitCondition;
 import static io.github.com.StaticSite.ratingsPage;
@@ -30,11 +30,10 @@ public void before() {
 
     @Test(description = "Test checks rating's color", dataProvider = "colorRatingTestData", dataProviderClass = RatingDataProvider.class)
     public void colorRatingTest(String expectedColor, Rating rating) {
-        for (int testedValue = 1; testedValue <= rating.length(); testedValue++) {
-            rating.setValue(testedValue);
-            rating.has().value(testedValue);
-            rating.has().color(expectedColor);
-        }
+        int r = new Random().nextInt(rating.length()) + 1;
+        rating.setValue(r);
+        rating.has().value(r);
+        rating.has().color(expectedColor);
     }
 
     @Test(description = "Test checks rating's item color", dataProvider = "itemSlotRatingTestData", dataProviderClass = RatingDataProvider.class)
@@ -46,11 +45,10 @@ public void itemColorRatingTest(int index, String expectedColor) {
 
     @Test(description = "Test checks rating's length")
     public void lengthRatingTest() {
-        IntStream.range(1, 15).forEach(index -> {
-            lengthRatingSlider.setValue((double) index);
-            waitCondition(() -> lengthRating.length() == index);
-            lengthRating.has().length(index);
-        });
+        int r = new Random().nextInt(14) + 1;
+        lengthRatingSlider.setValue((double) r);
+        lengthRating.has().length(r);
+
     }
 
     @Test(description = "Test checks rating's value")

jdi-light-vuetify-tests/src/test/java/io/github/epam/vuetify/tests/complex/SlidersTests.java

@@ -6,7 +6,8 @@
 import com.google.common.collect.ImmutableList;
 import io.github.epam.TestsInit;
 import io.github.epam.vuetify.tests.data.SliderTestsDataProvider;
-import org.testng.annotations.BeforeMethod;
+import org.hamcrest.Matchers;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -25,26 +26,23 @@
 import static io.github.com.pages.SlidersPage.disabledSliderControl;
 import static io.github.com.pages.SlidersPage.discreteSlider;
 import static io.github.com.pages.SlidersPage.errorCountTextField;
-import static io.github.com.pages.SlidersPage.heightTextField;
 import static io.github.com.pages.SlidersPage.hideDetailsSwitch;
 import static io.github.com.pages.SlidersPage.iconsSlider;
 import static io.github.com.pages.SlidersPage.inverseLabelSlider;
-import static io.github.com.pages.SlidersPage.loaderHeightTextField;
 import static io.github.com.pages.SlidersPage.loadingSwitch;
 import static io.github.com.pages.SlidersPage.readonlySlider;
 import static io.github.com.pages.SlidersPage.stepSlider;
 import static io.github.com.pages.SlidersPage.successMessageTextField;
 import static io.github.com.pages.SlidersPage.themeSwitch;
 import static io.github.com.pages.SlidersPage.thumbSlider;
 import static io.github.com.pages.SlidersPage.ticksSlider;
-import static io.github.com.pages.SlidersPage.validateOnBlurSwitch;
 import static io.github.com.pages.SlidersPage.validationSlider;
 import static io.github.com.pages.SlidersPage.verticalSlidersSlider;
 import static org.openqa.selenium.Keys.ENTER;
 
 public class SlidersTests extends TestsInit {
 
-    @BeforeMethod
+    @BeforeClass
     public void before() {
         slidersPage.open();
         waitCondition(() -> slidersPage.isOpened());
@@ -130,7 +128,6 @@ public void thumbSliderTest() {
         firstThumbSlider.setValue(10);
 
         firstThumbSlider.has().thumbLabel().and().thumbSize(16);
-        firstThumbSlider.thumbLabel().is().hidden();
         firstThumbSlider.thumb().click();
         firstThumbSlider.thumbLabel().is().displayed().and().has().value("10");
 
@@ -142,8 +139,6 @@ public void thumbSliderTest() {
     public void labelSliderTest() {
         disabledSlider.show();
         disabledSlider.has().label("Disabled");
-        thumbSlider.get(1).show();
-        thumbSlider.get(1).has().noLabel();
         inverseLabelSlider.show();
         inverseLabelSlider.has().inverseLabel().and().label("Inverse label");
     }
@@ -213,10 +208,8 @@ public void successSliderTest() {
     @Test(description = "Test checks slider's messages : hint(string), persistent-hint (y/n)")
     public void hintSliderTest() {
         adjustableSlider.show();
-        adjustableSlider.has().messagesCount(0);
         adjustableSlider.thumb().click();
-        waitCondition(() -> adjustableSlider.messages().size() > 0);
-        adjustableSlider.has().messagesCount(1);
+        adjustableSlider.has().messagesCount(Matchers.greaterThan(0));
 
         Slider hintSlider = validationSlider.get(2);
         hintSlider.show();
@@ -262,13 +255,6 @@ public void denseSliderTest() {
         adjustableSlider.is().notDense();
     }
 
-    @Test(description = "Test checks slider's height")
-    public void heightSliderTest() {
-        heightTextField.setText("16");
-        adjustableSlider.show();
-        adjustableSlider.has().height(16);
-    }
-
     @Test(description = "Test checks if slider has details hidden or not")
     public void hideDetailsSliderTest() {
         adjustableSlider.show();
@@ -282,8 +268,7 @@ public void loadingSliderTest() {
         adjustableSlider.show();
         loadingSwitch.check();
         adjustableSlider.is().loading();
-        loaderHeightTextField.setText("15");
-        adjustableSlider.loader().has().height(15);
+        adjustableSlider.loader().has().height(10);
         loadingSwitch.uncheck();
     }
 
@@ -292,14 +277,4 @@ public void minMaxValueSliderTest() {
         adjustableSlider.show();
         adjustableSlider.has().minValue(0).and().has().maxValue(100);
     }
-    @Test(description = "Test checks slider's validate-on-blur")
-    public void validateOnBlurSliderTest() {
-        adjustableSlider.show();
-        validateOnBlurSwitch.check();
-        adjustableSlider.has().messagesCount(0);
-        adjustableSlider.setValue(10.0);
-        adjustableSlider.thumb().click();
-        adjustableSlider.clickOutsideOfSlider(); //validate-on-blur works only after click on slider and then click outside
-        adjustableSlider.has().messagesCount(1);
-    }
 }

jdi-light-vuetify/src/main/java/com/epam/jdi/light/vuetify/asserts/RatingAssert.java

@@ -46,7 +46,6 @@ public RatingAssert size(int size) {
 
     @JDIAction(value = "Assert that '{name}' length is '{0}'", isAssert = true)
     public RatingAssert length(int length) {
-        int actualLength = element().length();
         jdiAssert(element().length(), Matchers.is(length));
         return this;
     }