Skip to content

Commit

Permalink
1.3.15 windows manager (#3323)
Browse files Browse the repository at this point in the history
* update names

* 1.3.12

* fix nested forms issue

* correct menu locator

* switch to 3.0.2

* update Keyboard

* fix data table cache

* add dropdown tests

* optimize imports

* fix table no cache issues

* fix table inRow

* add new features to WindowsManager

* switch to lightsaber 3.0.6 add direction validatiosn

* optimize i,ports

* ашч шьзщкеы ащк фтпгдк

* update aspectj to 1.9.6

* update aspectj to 1.9.6

* fix ambigous sert

* fix ambigous sert

* remove kill chrome
  • Loading branch information
RomanIovlev authored Sep 17, 2021
1 parent 09a3d69 commit 32f04ff
Show file tree
Hide file tree
Showing 326 changed files with 1,307 additions and 1,077 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ jobs:
- name: Check Chrome
run: ps -aux | grep chrome

- name: Kill Chrome
run: pkill -f "chrome"
# - name: Kill Chrome
# run: pkill -f "chrome"

##### Example for original allure data upload
# - name: 'Upload BDD results'
Expand All @@ -130,8 +130,8 @@ jobs:
- name: Check Chrome
run: ps -aux | grep chrome

- name: Kill Chrome
run: pkill -f "chrome"
# - name: Kill Chrome
# run: pkill -f "chrome"

# - name: Run tests - Angular Unit tests
# id: tests-angular-unit
Expand Down Expand Up @@ -176,8 +176,8 @@ jobs:
- name: Check Chrome
run: ps -aux | grep chrome

- name: Kill Chrome
run: pkill -f "chrome"
# - name: Kill Chrome
# run: pkill -f "chrome"

- name: Run tests - HTML performace
id: tests-html-perf
Expand All @@ -189,8 +189,8 @@ jobs:
- name: Check Chrome
run: ps -aux | grep chrome

- name: Kill Chrome
run: pkill -f "chrome"
# - name: Kill Chrome
# run: pkill -f "chrome"

- name: Run tests - Test Examples
id: tests-examples
Expand All @@ -202,8 +202,8 @@ jobs:
- name: Check Chrome
run: ps -aux | grep chrome

- name: Kill Chrome
run: pkill -f "chrome"
# - name: Kill Chrome
# run: pkill -f "chrome"

- name: Run tests - Performance
id: tests-perf
Expand Down
148 changes: 0 additions & 148 deletions CHANGELOG.md

This file was deleted.

4 changes: 2 additions & 2 deletions jdi-bdd-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-bdd-tests</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
<name>Tests: JDI BDD</name>

<properties>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.epam.jdi</groupId>
<artifactId>jdi-bdd</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.com.entities;


import com.epam.jdi.tools.DataClass;
import com.jdiai.tools.DataClass;

public class Contacts extends DataClass<Contacts> {
public String firstName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.com.entities;

import com.epam.jdi.tools.DataClass;
import com.jdiai.tools.DataClass;

public class MarvelUserInfo extends DataClass<MarvelUserInfo> {
public String number, type, user, description;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.com.entities;

import com.epam.jdi.tools.DataClass;
import com.jdiai.tools.DataClass;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.com.entities;


import com.epam.jdi.tools.DataClass;
import com.jdiai.tools.DataClass;

public class User extends DataClass<User> {
public String name = "Roman";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import static com.epam.jdi.bdd.stepdefs.CheckListSteps.multiSelect;
import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
import static com.epam.jdi.light.settings.JDISettings.COMMON;
import static com.epam.jdi.tools.PathUtils.mergePath;
import static com.jdiai.tools.PathUtils.mergePath;
import static io.github.com.StaticSite.homePage;
import static io.github.com.entities.Users.DEFAULT_USER;
import static io.github.com.pages.Header.*;
Expand Down
4 changes: 2 additions & 2 deletions jdi-bdd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-bdd</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
<name>JDI BDD</name>

<properties>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-html</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jdi-bdd/src/main/java/com/epam/jdi/bdd/BDDUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.epam.jdi.light.elements.common.UIElement;
import com.epam.jdi.light.elements.interfaces.base.HasLabel;
import com.epam.jdi.light.elements.interfaces.common.IsInput;
import com.epam.jdi.tools.map.MapArray;
import com.jdiai.tools.map.MapArray;
import cucumber.api.DataTable;

import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.List;

import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
import static com.epam.jdi.tools.LinqUtils.toIntArray;
import static com.jdiai.tools.LinqUtils.toIntArray;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
import static com.epam.jdi.light.settings.JDISettings.COMMON;
import static com.epam.jdi.tools.PathUtils.mergePath;
import static com.jdiai.tools.PathUtils.mergePath;

/**
* Created by Roman Iovlev on 26.09.2019
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.epam.jdi.bdd.stepdefs;

import com.epam.jdi.light.elements.composite.Form;
import com.epam.jdi.tools.Safe;
import com.jdiai.tools.Safe;
import cucumber.api.DataTable;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;

import static com.epam.jdi.bdd.BDDUtils.getMapFromTable;
import static com.epam.jdi.light.common.Exceptions.exception;
import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
import static com.epam.jdi.tools.JsonUtils.getMapFromJson;
import static com.jdiai.tools.JsonUtils.getMapFromJson;

/**
* Created by Roman Iovlev on 26.09.2019
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import static com.epam.jdi.bdd.BDDUtils.selectAssert;
import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
import static com.epam.jdi.tools.LinqUtils.toIntArray;
import static com.jdiai.tools.LinqUtils.toIntArray;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.core.IsIterableContaining.hasItem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue;
import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue;
import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI;
import static com.epam.jdi.tools.LinqUtils.map;
import static com.epam.jdi.tools.LinqUtils.safeException;
import static com.epam.jdi.tools.PrintUtils.print;
import static com.jdiai.tools.LinqUtils.map;
import static com.jdiai.tools.LinqUtils.safeException;
import static com.jdiai.tools.PrintUtils.print;
import static java.lang.Integer.parseInt;
import static org.hamcrest.Matchers.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import static com.epam.jdi.light.driver.WebDriverFactory.jsExecute;
import static com.epam.jdi.light.elements.composite.WebPage.*;
import static com.epam.jdi.tools.JsonUtils.getInt;
import static com.jdiai.tools.JsonUtils.getInt;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;

Expand Down
11 changes: 6 additions & 5 deletions jdi-eyes-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.epam.jdi</groupId>
<artifactId>jdi-eyes-demo</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
<name>Selenium to JDI Example with Eyes</name>
<packaging>jar</packaging>

Expand All @@ -23,18 +23,19 @@
<dependency>
<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-eyes</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
</dependency>
<dependency>
<groupId>com.epam.jdi</groupId>
<artifactId>jdi-light-html</artifactId>
<version>1.3.14</version>
<version>1.3.15</version>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.14.3</version>
<version>7.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.qameta.allure</groupId>
Expand Down Expand Up @@ -113,4 +114,4 @@
</plugin>
</plugins>
</reporting>
</project>
</project>
Loading

0 comments on commit 32f04ff

Please sign in to comment.