diff --git a/packages/main/test/pages/RangeSlider.html b/packages/main/test/pages/RangeSlider.html
index bc48265176901..c07daffedc97a 100644
--- a/packages/main/test/pages/RangeSlider.html
+++ b/packages/main/test/pages/RangeSlider.html
@@ -44,25 +44,25 @@
Basic Range Slider
-
Range Slider with custom min and max properties and tooltip
-
+
Range Slider with custom minValue and maxValue properties and tooltip
+
Range Slider with small step and tooltip
-
+
Range Slider with tickmarks
-
+
Disabled Range Slider
-
+
Range Slider with steps, tooltips, tickmarks and labels
-
+
Event Testing Slider
-
+
Event Testing Result Slider
diff --git a/packages/main/test/pages/Slider.html b/packages/main/test/pages/Slider.html
index d196f489fa926..7b17fe5490231 100644
--- a/packages/main/test/pages/Slider.html
+++ b/packages/main/test/pages/Slider.html
@@ -42,37 +42,37 @@
Basic Slider
-
+
Basic Slider with tooltip
-
+
Disabled Slider with tickmarks and labels
-
+
Slider with tickmarks
-
+
Slider with many steps and small width
-
-
+
+
Inactive slider with no steps and tooltip
-
+
Slider with steps, tooltips, tickmarks and labels
-
+
Slider with float number step (1.25), tooltips, tickmarks and labels between 3 steps (3.75 value)
-
+
Basic RTL Slider
-
+
Event Testing Slider
-
+
Event Testing Result Slider
diff --git a/packages/main/test/samples/RangeSlider.sample.html b/packages/main/test/samples/RangeSlider.sample.html
index fa0d3533c5649..596142bd2948f 100644
--- a/packages/main/test/samples/RangeSlider.sample.html
+++ b/packages/main/test/samples/RangeSlider.sample.html
@@ -23,10 +23,10 @@
Basic Range Slider
Range Slider with Custom 'min', 'max', 'startValue' and 'endValue' Properties
-
+
-
+
@@ -53,10 +53,10 @@
Range Slider with Tickmarks and Custom Step
Range Slider with Tooltips, Tickmarks and Labels
-
+
-
+
diff --git a/packages/main/test/samples/Slider.sample.html b/packages/main/test/samples/Slider.sample.html
index ef3fded10c23d..caef59d010d97 100644
--- a/packages/main/test/samples/Slider.sample.html
+++ b/packages/main/test/samples/Slider.sample.html
@@ -23,30 +23,30 @@
Basic Slider
Slider with Tooltip
-
+
-
+
Disabled Slider with Tickmarks and Labels
-
+
-
+
Slider Tooltip, Tickmarks and Labels
-
+
-
+
diff --git a/packages/main/test/specs/RangeSlider.spec.js b/packages/main/test/specs/RangeSlider.spec.js
index e3141ea27d2ce..eb8fdddf402ba 100644
--- a/packages/main/test/specs/RangeSlider.spec.js
+++ b/packages/main/test/specs/RangeSlider.spec.js
@@ -90,7 +90,7 @@ describe("Testing Range Slider interactions", () => {
assert.strictEqual(rangeSlider.getProperty("endValue"), 11, "endValue should swapped with the startValue and should be 11");
});
- it("Dragging the whole range selection should always keep the initially selected range and be within min/max values", () => {
+ it("Dragging the whole range selection should always keep the initially selected range and be within minValue/maxValue values", () => {
const rangeSlider = browser.$("#range-slider-tickmarks");
const startHandle = rangeSlider.shadow$(".ui5-slider-handle--start");
const endHandle = rangeSlider.shadow$(".ui5-slider-handle--end");
@@ -183,38 +183,38 @@ describe("Properties synchronization and normalization", () => {
assert.strictEqual(rangeSlider.getProperty("endValue"), 21, "The current value should be 'stepified' by 7");
});
- it("If min property is set to a greater number than the max property their effective values should be swapped, their real ones - not", () => {
+ it("If minValue property is set to a greater number than the maxValue property their effective values should be swapped, their real ones - not", () => {
const rangeSlider = browser.$("#range-slider-tickmarks-labels");
rangeSlider.setProperty("startValue", 2);
- rangeSlider.setProperty("max", 10);
- rangeSlider.setProperty("min", 100);
+ rangeSlider.setProperty("maxValue", 10);
+ rangeSlider.setProperty("minValue", 100);
- assert.strictEqual(rangeSlider.getProperty("min"), 100, "min property itself should not be normalized");
- assert.strictEqual(rangeSlider.getProperty("max"), 10, "max property itself should not be normalized");
- assert.strictEqual(rangeSlider.getProperty("startValue"), 10, "startValue property should be within the boundaries of the effective (swapped) min and max props");
+ assert.strictEqual(rangeSlider.getProperty("minValue"), 100, "minValue property itself should not be normalized");
+ assert.strictEqual(rangeSlider.getProperty("maxValue"), 10, "maxValue property itself should not be normalized");
+ assert.strictEqual(rangeSlider.getProperty("startValue"), 10, "startValue property should be within the boundaries of the effective (swapped) minValue and maxValue props");
});
- it("Should keep the current values between the boundaries of min and max properties", () => {
+ it("Should keep the current values between the boundaries of minValue and maxValue properties", () => {
const rangeSlider = browser.$("#range-slider-tickmarks-labels");
- rangeSlider.setProperty("min", 100);
- rangeSlider.setProperty("max", 200);
+ rangeSlider.setProperty("minValue", 100);
+ rangeSlider.setProperty("maxValue", 200);
rangeSlider.setProperty("endValue", 300);
- assert.strictEqual(rangeSlider.getProperty("endValue"), 200, "value prop should always be lower than the max value");
+ assert.strictEqual(rangeSlider.getProperty("endValue"), 200, "value prop should always be lower than the maxValue value");
rangeSlider.setProperty("startValue", 99);
- assert.strictEqual(rangeSlider.getProperty("startValue"), 100, "value prop should always be greater than the min value");
+ assert.strictEqual(rangeSlider.getProperty("startValue"), 100, "value prop should always be greater than the minValue value");
});
it("Should not 'stepify' current value if it is not in result of user interaction", () => {
const rangeSlider = browser.$("#range-slider-tickmarks-labels");
- rangeSlider.setProperty("min", 0);
- rangeSlider.setProperty("max", 44);
+ rangeSlider.setProperty("minValue", 0);
+ rangeSlider.setProperty("maxValue", 44);
rangeSlider.setProperty("step", 1.25);
rangeSlider.setProperty("startValue", 14);
rangeSlider.setProperty("endValue", 24);
@@ -226,8 +226,8 @@ describe("Properties synchronization and normalization", () => {
it("If the step property or the labelInterval are changed, the tickmarks and labels must be updated also", () => {
const rangeSlider = browser.$("#range-slider-tickmarks-labels");
- rangeSlider.setProperty("max", 0);
- rangeSlider.setProperty("min", 40);
+ rangeSlider.setProperty("maxValue", 0);
+ rangeSlider.setProperty("minValue", 40);
rangeSlider.setProperty("step", 1);
assert.strictEqual(rangeSlider.getProperty("_labels").length, 21, "Labels must be 21 - 1 for every 2 tickmarks (and steps)");
@@ -273,9 +273,9 @@ describe("Accessibility", () => {
assert.strictEqual(rangeSliderProgressBar.getAttribute("aria-labelledby"),
`${rangeSliderId}-sliderDesc`, "aria-labelledby is set correctly");
assert.strictEqual(rangeSliderProgressBar.getAttribute("aria-valuemin"),
- `${rangeSlider.getProperty("min")}`, "aria-valuemin is set correctly");
+ `${rangeSlider.getProperty("minValue")}`, "aria-valuemin is set correctly");
assert.strictEqual(rangeSliderProgressBar.getAttribute("aria-valuemax"),
- `${rangeSlider.getProperty("max")}`, "aria-valuemax is set correctly");
+ `${rangeSlider.getProperty("maxValue")}`, "aria-valuemax is set correctly");
assert.strictEqual(rangeSliderProgressBar.getAttribute("aria-valuetext"),
`From ${rangeSlider.getProperty("startValue")} to ${rangeSlider.getProperty("endValue")}`, "aria-valuetext is set correctly");
});
@@ -288,9 +288,9 @@ describe("Accessibility", () => {
assert.strictEqual(startHandle.getAttribute("aria-labelledby"),
`${rangeSliderId}-startHandleDesc`, "aria-labelledby is set correctly");
assert.strictEqual(startHandle.getAttribute("aria-valuemin"),
- `${rangeSlider.getProperty("min")}`, "aria-valuemin is set correctly");
+ `${rangeSlider.getProperty("minValue")}`, "aria-valuemin is set correctly");
assert.strictEqual(startHandle.getAttribute("aria-valuemax"),
- `${rangeSlider.getProperty("max")}`, "aria-valuemax is set correctly");
+ `${rangeSlider.getProperty("maxValue")}`, "aria-valuemax is set correctly");
assert.strictEqual(startHandle.getAttribute("aria-valuenow"),
`${rangeSlider.getProperty("startValue")}`, "aria-valuenow is set correctly");
});
@@ -303,9 +303,9 @@ describe("Accessibility", () => {
assert.strictEqual(endHandle.getAttribute("aria-labelledby"),
`${rangeSliderId}-endHandleDesc`, "aria-labelledby is set correctly");
assert.strictEqual(endHandle.getAttribute("aria-valuemin"),
- `${rangeSlider.getProperty("min")}`, "aria-valuemin is set correctly");
+ `${rangeSlider.getProperty("minValue")}`, "aria-valuemin is set correctly");
assert.strictEqual(endHandle.getAttribute("aria-valuemax"),
- `${rangeSlider.getProperty("max")}`, "aria-valuemax is set correctly");
+ `${rangeSlider.getProperty("maxValue")}`, "aria-valuemax is set correctly");
assert.strictEqual(endHandle.getAttribute("aria-valuenow"),
`${rangeSlider.getProperty("endValue")}`, "aria-valuenow is set correctly");
});
@@ -859,7 +859,7 @@ describe("Accessibility: Testing keyboard handling", () => {
return document.getElementById("basic-range-slider").shadowRoot.activeElement;
});
- assert.strictEqual(rangeSlider.getProperty("endValue"), 100, "The original end-value is set to min and switched as a start-value");
+ assert.strictEqual(rangeSlider.getProperty("endValue"), 100, "The original end-value is set to minValue and switched as a start-value");
assert.strictEqual($(innerFocusedElement).getAttribute("class"), endHandle.getAttribute("class"), "Range Slider second handle now has the shadowDom focus");
browser.keys("Home");
@@ -868,7 +868,7 @@ describe("Accessibility: Testing keyboard handling", () => {
return document.getElementById("basic-range-slider").shadowRoot.activeElement;
});
- assert.strictEqual(rangeSlider.getProperty("startValue"), 0, "The original end-value is set to min and switched as a start-value");
+ assert.strictEqual(rangeSlider.getProperty("startValue"), 0, "The original end-value is set to minValue and switched as a start-value");
assert.strictEqual($(innerFocusedElement).getAttribute("class"), startHandle.getAttribute("class"), "Range Slider second handle now has the shadowDom focus");
});
});
@@ -880,8 +880,8 @@ describe("Testing resize handling and RTL support", () => {
const endHandle = rangeSlider.shadow$(".ui5-slider-handle--end");
rangeSlider.setAttribute("dir", "rtl");
- rangeSlider.setProperty("min", 0);
- rangeSlider.setProperty("max", 10);
+ rangeSlider.setProperty("minValue", 0);
+ rangeSlider.setProperty("maxValue", 10);
rangeSlider.setProperty("step", 1);
rangeSlider.setProperty("startValue", 0);
rangeSlider.setProperty("endValue", 4);
@@ -918,8 +918,8 @@ describe("Testing resize handling and RTL support", () => {
const rangeSlider = browser.$("#range-slider-tickmarks-labels");
rangeSlider.setAttribute("dir", "ltr");
- rangeSlider.setProperty("min", 0);
- rangeSlider.setProperty("max", 44);
+ rangeSlider.setProperty("minValue", 0);
+ rangeSlider.setProperty("maxValue", 44);
rangeSlider.setProperty("step", 1.25);
browser.setWindowSize(400, 2000);
diff --git a/packages/main/test/specs/Slider.spec.js b/packages/main/test/specs/Slider.spec.js
index 2c6cfe0cf933a..d70baa8e2d472 100644
--- a/packages/main/test/specs/Slider.spec.js
+++ b/packages/main/test/specs/Slider.spec.js
@@ -37,11 +37,11 @@ describe("Slider basic interactions", () => {
assert.strictEqual(slider.getProperty("value"), 8, "Slider current value should be 8");
});
- it("Slider with floating min, max and step property", () => {
+ it("Slider with floating minValue, maxValue and step property", () => {
const slider = browser.$("#basic-slider");
- slider.setProperty("min", -12.5);
- slider.setProperty("max", 47.5);
+ slider.setProperty("minValue", -12.5);
+ slider.setProperty("maxValue", 47.5);
slider.setProperty("step", 1.25);
slider.setProperty("value", 21.25);
@@ -103,23 +103,23 @@ describe("Properties synchronization and normalization", () => {
assert.strictEqual(slider.getProperty("_labels").length, 6, "Labels must be 6 - 1 for every 4 tickmarks (and 8 current value points)");
});
- it("If min property is set to a greater number than the max property their effective values should be swapped, their real ones - not", () => {
+ it("If minValue property is set to a greater number than the maxValue property their effective values should be swapped, their real ones - not", () => {
const slider = browser.$("#basic-slider");
slider.setProperty("value", 2);
- slider.setProperty("max", 10);
- slider.setProperty("min", 100);
+ slider.setProperty("maxValue", 10);
+ slider.setProperty("minValue", 100);
- assert.strictEqual(slider.getProperty("max"), 10, "min property itself should not be normalized");
- assert.strictEqual(slider.getProperty("min"), 100, "max property itself should not be normalized");
- assert.strictEqual(slider.getProperty("value"), 10, "value property should be within the boundaries of the normalized 'effective' min and max values");
+ assert.strictEqual(slider.getProperty("maxValue"), 10, "minValue property itself should not be normalized");
+ assert.strictEqual(slider.getProperty("minValue"), 100, "maxValue property itself should not be normalized");
+ assert.strictEqual(slider.getProperty("value"), 10, "value property should be within the boundaries of the normalized 'effective' minValue and maxValue values");
});
it("Should keep the current value between the boundaries of min and max properties", () => {
const slider = browser.$("#basic-slider");
- slider.setProperty("min", 100);
- slider.setProperty("max", 200);
+ slider.setProperty("minValue", 100);
+ slider.setProperty("maxValue", 200);
slider.setProperty("value", 300);
assert.strictEqual(slider.getProperty("value"), 200, "value prop should always be lower than the max value");
@@ -248,9 +248,9 @@ describe("Accessibility", () => {
assert.strictEqual(sliderHandle.getAttribute("aria-labelledby"),
`${sliderId}-sliderDesc`, "aria-labelledby is set correctly");
assert.strictEqual(sliderHandle.getAttribute("aria-valuemin"),
- `${slider.getProperty("min")}`, "aria-valuemin is set correctly");
+ `${slider.getProperty("minValue")}`, "aria-valuemin is set correctly");
assert.strictEqual(sliderHandle.getAttribute("aria-valuemax"),
- `${slider.getProperty("max")}`, "aria-valuemax is set correctly");
+ `${slider.getProperty("maxValue")}`, "aria-valuemax is set correctly");
assert.strictEqual(sliderHandle.getAttribute("aria-valuenow"),
`${slider.getProperty("value")}`, "aria-valuenow is set correctly");
});
@@ -469,4 +469,4 @@ describe("Testing resize handling and RTL support", () => {
assert.strictEqual(slider.getProperty("_labelsOverlapping"), true, "state should reflect if any of the labels is overlapping with another");
assert.strictEqual(slider.getProperty("_hiddenTickmarks"), true, "state should reflect if the tickmarks has less than 8px space between each of them");
});
-});
\ No newline at end of file
+});
diff --git a/packages/tools/components-package/wdio.js b/packages/tools/components-package/wdio.js
index 1b956d2efec1e..ced2ce1a4cd89 100644
--- a/packages/tools/components-package/wdio.js
+++ b/packages/tools/components-package/wdio.js
@@ -57,7 +57,7 @@ exports.config = {
// to run chrome headless the following flags are required
// (see https://developers.google.com/web/updates/2017/04/headless-chrome)
args: ['--headless', '--disable-gpu'],
- // args: ['--disable-gpu'],
+ args: ['--disable-gpu'],
}
}],
//