diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/integration-tests.yml similarity index 94% rename from .github/workflows/e2e-tests.yml rename to .github/workflows/integration-tests.yml index ff4f0829ea..47c3480b7f 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1,7 +1,7 @@ name: Integration tests concurrency: - group: ${{ github.head_ref }}${{ github.ref }}-e2e-tests + group: ${{ github.head_ref }}${{ github.ref }}-integration-tests cancel-in-progress: true on: @@ -16,14 +16,14 @@ on: defaults: run: shell: bash - working-directory: "tests/e2e-tests" + working-directory: "tests/integration-tests" jobs: - run-e2e-tests: + run-integration-tests: name: "Run e2e tests" runs-on: ubuntu-latest env: - REPORTS_DIR: "tests/e2e-tests/target/site/serenity" + REPORTS_DIR: "tests/integration-tests/target/site/serenity" steps: - name: Checkout uses: actions/checkout@v3 @@ -99,10 +99,10 @@ jobs: distribution: 'zulu' java-version: '19' - - name: Run e2e tests + - name: Run integration tests continue-on-error: true run: | - ./gradlew test --tests "E2eTestsRunner" || true + ./gradlew test --tests "IntegrationTestsRunner" || true ./gradlew reports - name: Extract test results @@ -148,7 +148,7 @@ jobs: if: github.ref_name == 'main' || steps.analyze_test_results.outputs.conclusion == 'failure' uses: actions/upload-artifact@v2 with: - name: e2e-tests-result + name: integration-tests-result path: ${{ env.REPORTS_DIR }} - name: Slack Notification diff --git a/tests/e2e-tests/src/main/kotlin/api_models/Credential.kt b/tests/e2e-tests/src/main/kotlin/api_models/Credential.kt deleted file mode 100644 index eea423b762..0000000000 --- a/tests/e2e-tests/src/main/kotlin/api_models/Credential.kt +++ /dev/null @@ -1,31 +0,0 @@ -package api_models - -import kotlinx.serialization.Serializable - -@Serializable -data class Credential( - var automaticIssuance: Boolean = false, - var awaitConfirmation: Boolean = false, - var createdAt: String = "", - var protocolState: String = "", - var recordId: String = "", - var thid: String = "", - var role: String = "", - var schemaId: String? = "", - var subjectId: String = "", - var updatedAt: String = "", - var validityPeriod: Double = 0.0, - var claims: LinkedHashMap = LinkedHashMap(), - var credential: String = "", - var issuingDID: String = "", - var connectionId: String = "", - var credentialFormat: String = "JWT", - var metaRetries: Int = 0, -): JsonEncoded - -object CredentialState { - const val OFFER_RECEIVED = "OfferReceived" - const val REQUEST_RECEIVED = "RequestReceived" - const val CREDENTIAL_SENT = "CredentialSent" - const val CREDENTIAL_RECEIVED = "CredentialReceived" -} diff --git a/tests/integration-tests/src/test/kotlin/runners/E2eTestsRunner.kt b/tests/integration-tests/src/test/kotlin/runners/IntegrationTestsRunner.kt similarity index 93% rename from tests/integration-tests/src/test/kotlin/runners/E2eTestsRunner.kt rename to tests/integration-tests/src/test/kotlin/runners/IntegrationTestsRunner.kt index ee58f0f22f..4613f9d205 100644 --- a/tests/integration-tests/src/test/kotlin/runners/E2eTestsRunner.kt +++ b/tests/integration-tests/src/test/kotlin/runners/IntegrationTestsRunner.kt @@ -16,4 +16,4 @@ import org.junit.runner.RunWith ] ) @RunWith(CucumberWithSerenity::class) -class E2eTestsRunner +class IntegrationTestsRunner