Skip to content

Commit 6564bcc

Browse files
committed
Merge branch 'master' into angular_rework_development
2 parents 68d720a + e2c8019 commit 6564bcc

File tree

91 files changed

+181
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+181
-311
lines changed

.0pdd.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
alerts:
2+
suppress:
3+
- on-found-puzzle
4+
- on-lost-puzzle
5+
- on-scope
6+
tags:
7+
- Refactoring

.github/workflows/debug.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
java: [11, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
4242

4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- name: Set up JDK ${{ matrix.java }}
46-
uses: actions/setup-java@v3
46+
uses: actions/setup-java@v4
4747
with:
4848
java-version: ${{ matrix.java }}
4949
java-package: jdk
@@ -121,7 +121,7 @@ jobs:
121121
122122
- name: 'Upload allure report'
123123
if: steps.jdi-compile.outcome == 'success'
124-
uses: actions/upload-artifact@v3
124+
uses: actions/upload-artifact@v4
125125
with:
126126
name: allure-report-jdk${{ matrix.java }}
127127
path: ./allure-report.zip

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
java: [11, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
5454

5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5757
- name: Set up JDK ${{ matrix.java }}
58-
uses: actions/setup-java@v3
58+
uses: actions/setup-java@v4
5959
with:
6060
java-version: ${{ matrix.java }}
6161
java-package: jdk
@@ -217,7 +217,7 @@ jobs:
217217
218218
- name: 'Upload allure report'
219219
if: steps.jdi-compile.outcome == 'success'
220-
uses: actions/upload-artifact@v3
220+
uses: actions/upload-artifact@v4
221221
with:
222222
name: allure-report-jdk${{ matrix.java }}
223223
path: ./allure-report.zip

.pdd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--source=.
2+
--exclude README.md
3+
--exclude config/**/*
4+
--exclude Documents/**/*
5+
--exclude allure.tgz
6+
--exclude *.sh
7+
--exclude *.bat
8+
--exclude .idea/**.*

jdi-light-material-ui-tests/src/main/java/io/github/com/StaticSite.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import io.github.com.pages.layout.ContainerPage;
3636
import io.github.com.pages.layout.GridListPage;
3737
import io.github.com.pages.layout.GridPage;
38-
import io.github.com.pages.layout.HiddenPage;
3938
import io.github.com.pages.navigation.BottomNavigationPage;
4039
import io.github.com.pages.navigation.ClippedDrawerPage;
4140
import io.github.com.pages.navigation.ContextMenuPage;
@@ -302,10 +301,6 @@ public class StaticSite {
302301
public static ContextMenuPage contextMenuPage;
303302

304303
// layouts
305-
// hidden
306-
@Url("/hidden_layout")
307-
public static HiddenPage hiddenPage;
308-
309304
// box
310305
@Url("/box_layout")
311306
public static BoxPage boxPage;

jdi-light-material-ui-tests/src/main/java/io/github/com/pages/layout/HiddenPage.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

jdi-light-material-ui-tests/src/test/java/io/github/epam/material/tests/layout/HiddenTests.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/common/app/android/RatingBar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public double getRating() {
1717
return Double.parseDouble(core().getText());
1818
}
1919

20-
// @todo Check if 1.0 is really the minimum, as typically 0 is minimum
20+
// @todo #1 Check if 1.0 is really the minimum, as typically 0 is minimum
2121
@JDIAction("Setup rating value to {0} with the max value as {1} (Value should not greater then max and not less then 1.0)")
2222
public void setRatingByClick(double value, double fullStars) {
2323
if (value > fullStars || value < 1.0) {
@@ -28,7 +28,7 @@ public void setRatingByClick(double value, double fullStars) {
2828
int offset = (int) (stepLength * (value - 1));
2929
int newRatingPositionX = position.x + offset + (int) (stepLength * 0.6);
3030
int newRatingPositionY = position.y + position.height / 2;
31-
// @todo Change TouchAction in mobile project, as it is depricated
31+
// @todo #1 Change TouchAction in mobile project, as it is depricated
3232
TouchAction touchAction = new TouchAction((PerformsTouchActions) core().driver());
3333
touchAction.tap(PointOption.point(newRatingPositionX, newRatingPositionY)).perform();
3434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import static com.epam.jdi.light.driver.get.DriverData.getOs;
1313

1414
/**
15-
* To see example of AdvancedCombobox web element please visit https://vuetifyjs.com/en/components/combobox/
15+
* To see example of AdvancedCombobox web element please visit https://v2.vuetifyjs.com/en/components/combobox/
1616
*/
1717

1818
public class AdvancedCombobox extends Combobox {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Represents profile card Vuetify component on GUI.
1010
* Profile card contains avatar image, background image, username and job function.
1111
*
12-
* @see <a href="https://vuetifyjs.com/en/components/avatars/#profile-card">Profile Card Vuetify documentation</a>
12+
* @see <a href="https://v2.vuetifyjs.com/en/components/avatars/#profile-card">Profile Card Vuetify documentation</a>
1313
* @see <a href="https://jdi-testing.github.io/jdi-light/vuetify/">Vuetify test page</a>
1414
*/
1515

0 commit comments

Comments
 (0)