Skip to content

Changes from master to release/1.1 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TimurKasatkin wants to merge 3 commits into from
Closed

Changes from master to release/1.1 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9af2f25
Actualize build dependencies
TimurKasatkin Sep 4, 2025
1fdebc5
Merge pull request #14 from ru-fix/fix/actualize-deps
swarmshine Oct 26, 2025
625ae65
Being able to customize RestAssured config AND github actions fix (#16)
TimurKasatkin Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions .github/workflows/build-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,27 @@ jobs:
build-job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: gradle
cache-dependency-path: |
**/gradle-wrapper.properties
**/build.gradle
**/build.gradle.kts
**/settings.gradle
**/settings.gradle.kts
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
uses: gradle/wrapper-validation-action@v1
- name: Ensure gradlew is executable
run: chmod +x ./gradlew
- name: build
run: ./gradlew clean build
run: ./gradlew --no-daemon clean build
- name: Cleanup Gradle Cache
if: always()
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
rm -f ~/.gradle/caches/modules-2/modules-2.lock || true
rm -f ~/.gradle/caches/modules-2/gc.properties || true
38 changes: 24 additions & 14 deletions .github/workflows/deploy-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,41 @@ jobs:
deploy-job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: gradle
cache-dependency-path: |
**/gradle-wrapper.properties
**/build.gradle
**/build.gradle.kts
**/settings.gradle
**/settings.gradle.kts
- name: decode key
env:
secringEncodingKey: ${{secrets.MC_SECRING_ENC_KEY}}
secringEncodingKey: ${{ secrets.MC_SECRING_ENC_KEY }}
run: gpg --quiet --batch --yes --decrypt --passphrase="$secringEncodingKey" --output secring.gpg secring.gpg.gpgenc
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
uses: gradle/wrapper-validation-action@v1
- name: Ensure gradlew is executable
run: chmod +x ./gradlew
- name: deploy
env:
repositoryUrl: ${{secrets.MC_REPOSITORY_URL}}
repositoryUser: ${{secrets.MC_REPOSITORY_USER}}
repositoryPassword: ${{secrets.MC_REPOSITORY_PASSWORD}}
signingKeyId: ${{secrets.MC_SIGNING_KEY_ID}}
signingPassword: ${{secrets.MC_SIGNING_PASSWORD}}
run: ./gradlew -PsigningSecretKeyRingFile="`pwd`/secring.gpg" -Dorg.gradle.internal.publish.checksums.insecure=true --info clean build publishToSonatype closeAndReleaseRepository
repositoryUrl: ${{ secrets.MC_REPOSITORY_URL }}
repositoryUser: ${{ secrets.MC_REPOSITORY_USER }}
repositoryPassword: ${{ secrets.MC_REPOSITORY_PASSWORD }}
signingKeyId: ${{ secrets.MC_SIGNING_KEY_ID }}
signingPassword: ${{ secrets.MC_SIGNING_PASSWORD }}
run: ./gradlew --no-daemon -PsigningSecretKeyRingFile="$(pwd)/secring.gpg" -Dorg.gradle.internal.publish.checksums.insecure=true --info clean build publishToSonatype closeAndReleaseRepository
- name: Cleanup Gradle Cache
if: always()
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
rm -f ~/.gradle/caches/modules-2/modules-2.lock || true
rm -f ~/.gradle/caches/modules-2/gc.properties || true
- name: Cleanup
if: always()
run: |
rm secring.gpg
rm -f secring.gpg || true
3 changes: 3 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import kotlin.reflect.KProperty

buildscript {
repositories {
jcenter()
mavenCentral()
mavenLocal()
maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/")
}
dependencies {
classpath(Libs.gradle_release_plugin)
Expand Down Expand Up @@ -78,6 +80,7 @@ subprojects {
jcenter()
mavenCentral()
mavenLocal()
maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/")
}

val sourcesJar by tasks.creating(Jar::class) {
Expand Down
3 changes: 3 additions & 0 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
mavenLocal()
maven(url = "https://repo.gradle.org/artifactory/jcenter-backup/")
}
15 changes: 2 additions & 13 deletions buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ object Vers {
const val dynamic_property = "1.1.9"
const val jfix_stdlib = "2.0.2"
const val corounit = "1.1.1"
const val koin = "2.0.1"

const val aspectj = "1.9.5"
const val freefair_aspectj = "5.0.1"
const val koin = "2.2.3"
}

object Libs {
Expand All @@ -46,14 +43,6 @@ object Libs {
const val groovy = "org.codehaus.groovy:groovy:3.0.1"
const val groovy_xml = "org.codehaus.groovy:groovy-xml:3.0.1"

const val dynamic_property_api = "ru.fix:dynamic-property-api:${Vers.dynamic_property}"

const val dynamic_property_std_source = "ru.fix:dynamic-property-std-source:${Vers.dynamic_property}"
const val dynamic_property_jackson = "ru.fix:dynamic-property-jackson:${Vers.dynamic_property}"
const val dynamic_property_spring = "ru.fix:dynamic-property-spring:${Vers.dynamic_property}"
const val jfix_stdlib_files = "ru.fix:jfix-stdlib-files:${Vers.jfix_stdlib}"

const val jfix_stdlib_concurrency = "ru.fix:jfix-stdlib-concurrency:${Vers.jfix_stdlib}"
const val jfix_corounit_engine = "ru.fix:corounit-engine:${Vers.corounit}"
const val jfix_corounit_allure = "ru.fix:corounit-allure:${Vers.corounit}"

Expand Down Expand Up @@ -86,7 +75,7 @@ object Libs {
const val wiremock = "com.github.tomakehurst:wiremock:2.26.1"
const val jfix_stdlib_socket = "ru.fix:jfix-stdlib-socket:${Vers.jfix_stdlib}"

const val koin = "org.koin:koin-core:${Vers.koin}"
const val koin = "io.insert-koin:koin-core:${Vers.koin}"
}

enum class Projs {
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/CookieRestTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/IntroductionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Description
import io.qameta.allure.Epic
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/JsonRestTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.kbdd.asserts.isContains
import ru.fix.kbdd.asserts.isEquals
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/NavigationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import io.qameta.allure.Description
import io.qameta.allure.Epic
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ParameterizedTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ru.fix.kbdd.example.cases.documentation
import io.qameta.allure.Epic
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.parameterized
import ru.fix.corounit.allure.row
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/RedirectRestTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import com.google.common.net.HttpHeaders
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.get
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseAsserts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import io.qameta.allure.Description
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
4 changes: 2 additions & 2 deletions ...-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/ResponseCustomAsserts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/documentation/XmlRestTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.kotest.matchers.shouldBe
import io.qameta.allure.Epic
import io.qameta.allure.Feature
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.kbdd.asserts.*
import ru.fix.kbdd.example.MockServer
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/cases/example/AirportBookingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.qameta.allure.Epic
import io.qameta.allure.Feature
import io.qameta.allure.Story
import org.junit.jupiter.api.Test
import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Package
import ru.fix.corounit.allure.invoke
import ru.fix.kbdd.asserts.*
Expand Down
2 changes: 1 addition & 1 deletion kbdd-example/src/test/kotlin/ru/fix/kbdd/example/config/Settings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ru.fix.kbdd.example.config

import org.koin.core.KoinComponent
import org.koin.core.component.KoinComponent


class Settings : KoinComponent {
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/AirportSteps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.fix.kbdd.example.steps

import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.kbdd.asserts.*
import ru.fix.kbdd.example.config.Settings
import ru.fix.kbdd.rest.Rest
Expand Down
4 changes: 2 additions & 2 deletions kbdd-example/src/test/kotlin/ru/fix/kbdd/example/steps/BillingSteps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ru.fix.kbdd.example.steps

import org.koin.core.KoinComponent
import org.koin.core.inject
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import ru.fix.corounit.allure.Step
import ru.fix.kbdd.example.config.Settings
import ru.fix.kbdd.rest.Rest
Expand Down
Loading