diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2177148..6b79ed0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,8 +32,8 @@ jobs: - name: Create config.properties run: | - echo "key=${{ secrets.login }}" > src/test/resources/config.properties - echo "token=${{ secrets.password }}" >> src/test/resources/config.properties + echo "login=${{ secrets.login }}" > src/test/resources/test.conf + echo "password=${{ secrets.password }}" >> src/test/resources/test.conf - name: Build with Docker Compose run: docker-compose build diff --git a/pom.xml b/pom.xml index f30ef28..fcd2f7d 100644 --- a/pom.xml +++ b/pom.xml @@ -74,50 +74,28 @@ - org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + 3.1.2 -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar" - - - org.aspectj - aspectjweaver - ${aspectj.version} - - - io.qameta.allure - allure-testng - ${allure-testng.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - 11 - + io.qameta.allure allure-maven - 2.12.0 + 2.10.0 - 2.29.0 + https://github.com/allure-framework/allure2/releases/download/2.14.0/allure-2.14.0.zip + ${project.build.directory}/allure-results - diff --git a/src/test/java/automation/utils/ConfigProvider.java b/src/test/java/automation/utils/ConfigProvider.java index bd90937..bcb1087 100644 --- a/src/test/java/automation/utils/ConfigProvider.java +++ b/src/test/java/automation/utils/ConfigProvider.java @@ -12,7 +12,7 @@ static Config readConfig() { : ConfigFactory.load("test.conf"); } - static final String LOGIN = config.getString("loginUser.login"); - static final String PASSWORD = config.getString("loginUser.password"); + static final String LOGIN = config.getString("login"); + static final String PASSWORD = config.getString("password"); } diff --git a/src/test/resources/allure.properties b/src/test/resources/allure.properties index 6c1e0bb..13c3e71 100644 --- a/src/test/resources/allure.properties +++ b/src/test/resources/allure.properties @@ -1 +1,5 @@ -allure.results.directory=target/allure-results \ No newline at end of file +allure.results.directory=target/allure-results +allure.testng.hide.disabled.tests = true +allure.testng.hide.configuration.failures = true +allure.rest-assured.hide.disabled.tests = true +allure.rest-assured.hide.configuration.failures = true \ No newline at end of file diff --git a/src/test/resources/test.conf b/src/test/resources/test.conf index 7651835..a9839af 100644 --- a/src/test/resources/test.conf +++ b/src/test/resources/test.conf @@ -1,4 +1,3 @@ -loginUser { - login = "standard_user" - password = "secret_sauce" -} \ No newline at end of file + + login = "standard_user" + password = "secret_sauce" diff --git a/src/test/resources/test.conf.templates b/src/test/resources/test.conf.templates index 3cb0479..02f2551 100644 --- a/src/test/resources/test.conf.templates +++ b/src/test/resources/test.conf.templates @@ -1,4 +1,3 @@ -loginUser { + login = password = -} \ No newline at end of file diff --git a/src/test/resources/test.properties b/src/test/resources/test.properties deleted file mode 100644 index 7de3b14..0000000 --- a/src/test/resources/test.properties +++ /dev/null @@ -1,2 +0,0 @@ -#login = "standard_user" -#password = "secret_sauce" \ No newline at end of file