Skip to content

Commit db46934

Browse files
pnatashappnatashap
authored
Merge pull request #508 from jdi-testing/update_cucumber
Update Cucumber version to 7.10.1
2 parents 593ea2e + 6c512d5 commit db46934

File tree

19 files changed

+101
-131
lines changed

19 files changed

+101
-131
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
7474
- name: Compile jdi code
7575
id: jdi-compile
76-
run: mvn clean install -DskipTests -Dsource.skip -Dmaven.source.skip -Dmaven.javadoc.skip=true
76+
run: mvn clean install -DskipTests -Dsource.skip -Dmaven.source.skip -Dmaven.javadoc.skip=true -ntp
7777

7878
- name: Run tests - BDD
7979
id: testsBdd

‎clean_trello_data.py‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import requests
2+
3+
query = {
4+
'key': '3445103a21ddca2619eaceb0e833d0db',
5+
'token': 'a9b951262e529821308e7ecbc3e4b7cfb14a24fef5ea500a68c69d374009fcc0'
6+
}
7+
8+
def get_boards():
9+
url = "https://api.trello.com/1/members/me/boards"
10+
11+
response = requests.request(
12+
"GET",
13+
url,
14+
params=query
15+
)
16+
return response.json()
17+
18+
def clean_board(board_id):
19+
url = "https://api.trello.com/1/boards/"
20+
21+
response = requests.request(
22+
"DELETE",
23+
url+board_id,
24+
params=query
25+
)
26+
27+
def clean_boards():
28+
board_list = get_boards()
29+
for board in board_list:
30+
print(board)
31+
clean_board(board['id'])
32+
33+
# run in case of error that user have too many boards
34+
if __name__ == '__main__':
35+
clean_boards()
36+

‎jdi-dark-bdd-tests/pom.xml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,43 @@
55
<groupId>com.epam.jdi</groupId>
66
<artifactId>jdi-dark-bdd-tests</artifactId>
77
<name>JDI Dark BDD Tests</name>
8-
<version>1.1.12</version>
8+
<version>1.1.13</version>
99

1010
<properties>
11-
<includeTags>@smoke</includeTags>
12-
<excludeTags>@skip</excludeTags>
1311
<java.version>1.8</java.version>
1412
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1513
<aspectj.version>1.9.5</aspectj.version>
1614
<allure.maven.version>2.10.0</allure.maven.version>
17-
<allure.cucumber.jvm.version>2.13.1</allure.cucumber.jvm.version>
18-
<allure.common.version>2.13.1</allure.common.version>
15+
<allure.common.version>2.20.1</allure.common.version>
1916
<junit.version>4.12</junit.version>
20-
<surefire.version>2.22.2</surefire.version>
21-
<jdi.dark.bdd.version>1.1.12</jdi.dark.bdd.version>
22-
<!-- - - add-opens java.base/java.lang=ALL-UNNAMED is needed for JDK 16+ -->
17+
<surefire.version>3.0.0-M7</surefire.version>
18+
<jdi.dark.version>1.1.13</jdi.dark.version>
19+
<cucumber.version>7.10.1</cucumber.version>
20+
<!-- use jdk16 profile for JDK 16+ -->
2321
<aspectj.args></aspectj.args>
2422
</properties>
2523

24+
<profiles>
25+
<profile>
26+
<id>jdk16</id>
27+
<properties>
28+
<aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>
29+
</properties>
30+
</profile>
31+
</profiles>
32+
2633
<dependencies>
2734
<!--JDI-->
2835
<dependency>
2936
<groupId>com.epam.jdi</groupId>
3037
<artifactId>jdi-dark-bdd</artifactId>
31-
<version>${jdi.dark.bdd.version}</version>
38+
<version>${jdi.dark.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>io.cucumber</groupId>
42+
<artifactId>cucumber-junit</artifactId>
43+
<version>${cucumber.version}</version>
44+
<scope>test</scope>
3245
</dependency>
3346
<dependency>
3447
<groupId>io.qameta.allure</groupId>
@@ -37,8 +50,8 @@
3750
</dependency>
3851
<dependency>
3952
<groupId>io.qameta.allure</groupId>
40-
<artifactId>allure-cucumber4-jvm</artifactId>
41-
<version>${allure.cucumber.jvm.version}</version>
53+
<artifactId>allure-cucumber7-jvm</artifactId>
54+
<version>${allure.common.version}</version>
4255
</dependency>
4356
</dependencies>
4457
<build>
@@ -57,26 +70,12 @@
5770
<artifactId>maven-surefire-plugin</artifactId>
5871
<version>${surefire.version}</version>
5972
<configuration>
73+
<failIfNoTests>true</failIfNoTests>
6074
<systemPropertyVariables>
6175
<allure.results.directory>${project.build.directory}/allure-results</allure.results.directory>
6276
</systemPropertyVariables>
63-
<suiteXmlFiles>
64-
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
65-
</suiteXmlFiles>
6677
<!-- testFailureIgnore>true</testFailureIgnore -->
67-
<argLine>
68-
${aspectj.args}
69-
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
70-
-Dcucumber.options="--plugin io.qameta.allure.cucumber4jvm.AllureCucumber4Jvm"
71-
</argLine>
7278
</configuration>
73-
<dependencies>
74-
<dependency>
75-
<groupId>org.aspectj</groupId>
76-
<artifactId>aspectjweaver</artifactId>
77-
<version>${aspectj.version}</version>
78-
</dependency>
79-
</dependencies>
8079
</plugin>
8180
<plugin>
8281
<groupId>io.qameta.allure</groupId>

‎jdi-dark-bdd-tests/src/test/java/com/epam/jdi/httptests/CucumberTestRunner.java‎

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

‎jdi-dark-bdd-tests/src/test/java/com/epam/jdi/httptests/HttpTestsRunner.java‎

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

‎jdi-dark-bdd-tests/src/test/java/com/epam/jdi/httptests/steps/Hooks.java‎

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

‎jdi-dark-bdd-tests/src/test/java/httptests/CucumberTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package httptests;
2+
3+
import io.cucumber.junit.Cucumber;
4+
import io.cucumber.junit.CucumberOptions;
5+
import org.junit.runner.RunWith;
6+
7+
@RunWith(Cucumber.class)
8+
@CucumberOptions(
9+
features = "classpath:features",
10+
glue = {"httptests/steps", "com/epam/jdi/http/stepdefs/en"},
11+
plugin = {"io.qameta.allure.cucumber7jvm.AllureCucumber7Jvm"}
12+
)
13+
public class CucumberTest {
14+
15+
}

‎jdi-dark-bdd-tests/src/test/java/com/epam/jdi/httptests/steps/InitService.java‎ renamed to ‎jdi-dark-bdd-tests/src/test/java/httptests/steps/InitService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.epam.jdi.httptests.steps;
1+
package httptests.steps;
22

33
import com.epam.jdi.services.ServiceExample;
44
import io.cucumber.java.en.Given;

‎jdi-dark-bdd-tests/src/test/resources/testng.xml‎

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

‎jdi-dark-bdd/pom.xml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
<name>JDI Dark BDD</name>
88
<description>BDD add-in for JDI Dark</description>
99
<url>http://jdi.epam.com/</url>
10-
<version>1.1.12</version>
10+
<version>1.1.13</version>
1111

1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<java.version>1.8</java.version>
15-
<cucumber.version>4.8.1</cucumber.version>
16-
<junit.version>4.13.1</junit.version>
17-
<testng.version>7.1.0</testng.version>
18-
<jdi.dark.version>1.1.12</jdi.dark.version>
15+
<cucumber.version>7.10.1</cucumber.version>
16+
<jdi.dark.version>1.1.13</jdi.dark.version>
1917
<gpg.key></gpg.key>
2018
</properties>
2119

@@ -26,30 +24,15 @@
2624
<artifactId>jdi-dark</artifactId>
2725
<version>${jdi.dark.version}</version>
2826
</dependency>
29-
<dependency>
30-
<groupId>io.cucumber</groupId>
31-
<artifactId>cucumber-testng</artifactId>
32-
<version>${cucumber.version}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>io.cucumber</groupId>
36-
<artifactId>cucumber-junit</artifactId>
37-
<version>${cucumber.version}</version>
38-
</dependency>
3927
<dependency>
4028
<groupId>io.cucumber</groupId>
4129
<artifactId>cucumber-java</artifactId>
4230
<version>${cucumber.version}</version>
4331
</dependency>
4432
<dependency>
45-
<groupId>junit</groupId>
46-
<artifactId>junit</artifactId>
47-
<version>${junit.version}</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.testng</groupId>
51-
<artifactId>testng</artifactId>
52-
<version>${testng.version}</version>
33+
<groupId>io.cucumber</groupId>
34+
<artifactId>gherkin</artifactId>
35+
<version>26.0.2</version>
5336
</dependency>
5437
<dependency>
5538
<groupId>org.assertj</groupId>

0 commit comments

Comments
 (0)