From c8f76594b46b60e4d204806b4da455c4b1431aed Mon Sep 17 00:00:00 2001 From: jguz-pubnub Date: Mon, 21 Oct 2024 15:29:21 +0200 Subject: [PATCH] Update runner groups and contract tests --- .github/workflows/commands-handler.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/run-tests.yml | 2 +- .github/workflows/run-validations.yml | 4 +- .../PubNubContractCucumberTest.m | 48 ++++++++----------- .../Files/PubNubFilesContractTestSteps.swift | 2 +- .../PubNubPublishContractTestSteps.swift | 4 +- 7 files changed, 28 insertions(+), 36 deletions(-) diff --git a/.github/workflows/commands-handler.yml b/.github/workflows/commands-handler.yml index 48f71d24..51f8668f 100644 --- a/.github/workflows/commands-handler.yml +++ b/.github/workflows/commands-handler.yml @@ -12,7 +12,7 @@ jobs: name: Process command if: github.event.issue.pull_request && endsWith(github.repository, '-private') != true runs-on: - group: Default + group: organization/Default steps: - name: Check referred user id: user-check diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26387d6e..b05312e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: name: Check release required if: github.event.pull_request.merged && endsWith(github.repository, '-private') != true runs-on: - group: Default + group: organization/Default outputs: release: ${{ steps.check.outputs.ready }} steps: diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index aa427071..82ca58ad 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -133,7 +133,7 @@ jobs: name: Tests needs: [tests, acceptance-tests] runs-on: - group: Default + group: organization/Default steps: - name: Tests summary run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed" diff --git a/.github/workflows/run-validations.yml b/.github/workflows/run-validations.yml index a5edab8b..f20c7fbe 100644 --- a/.github/workflows/run-validations.yml +++ b/.github/workflows/run-validations.yml @@ -19,7 +19,7 @@ jobs: pubnub-yml: name: "Validate .pubnub.yml" runs-on: - group: Default + group: organization/Default steps: - name: Checkout project uses: actions/checkout@v4 @@ -114,7 +114,7 @@ jobs: name: Validations needs: [pubnub-yml, package-managers-validation, demo-app-validation] runs-on: - group: Default + group: organization/Default steps: - name: Validations summary run: echo -e "\033[38;2;95;215;0m\033[1mAll validations passed" diff --git a/Tests/PubNubContractTest/PubNubContractCucumberTest.m b/Tests/PubNubContractTest/PubNubContractCucumberTest.m index cc8ac961..3cb30a0f 100644 --- a/Tests/PubNubContractTest/PubNubContractCucumberTest.m +++ b/Tests/PubNubContractTest/PubNubContractCucumberTest.m @@ -49,34 +49,26 @@ void CucumberishInit(void) { // TODO: REMOVE AFTER ALL TESTS FOR OBJECTS WILL BE MERGED. NSArray *includedTags = @[ - @"contract=getChannelMetadataOfChat", - @"contract=getChannelMetadataOfDMWithCustom", - @"contract=setChannelMetadataForChat", - @"contract=removeChannelMetadataOfChat", - @"contract=getAllChannelMetadata", - @"contract=getAllChannelMetadataWithCustom", - - @"contract=getUUIDMetadataOfAlice", - @"contract=getUUIDMetadataOfBobWithCustom", - @"contract=setUUIDMetadataForAlice", - @"contract=removeUUIDMetadataOfAlice", - @"contract=getAllUUIDMetadata", - @"contract=getAllUUIDMetadataWithCustom", - - @"contract=getMembersOfChatChannel", - @"contract=getMembersOfVipChatChannelWithCustomAndUuidWithCustom", - @"contract=setMembersForChatChannel", - @"contract=setMembersForChatChannelWithCustomAndUuidWithCustom", - @"contract=removeMembersForChatChannel", - @"contract=manageMembersForChatChannel", - - @"contract=getAliceMemberships", - @"contract=getAliceMemberships", - @"contract=getBobMembershipWithCustomAndChannelCustom", - @"contract=setAliceMembership", - @"contract=removeAliceMembership", - @"contract=manageAliceMemberships" - ]; + @"contract=sendFileWithType", + @"contract=sendFileWithTooShortType", + @"contract=sendFileWithTooLongType", + @"contract=fetchHistoryWithPubNubMessageTypes", + @"contract=fetchHistoryWithUserAndPubNubTypes", + @"contract=fetchHistoryWithoutTypes", + @"contract=publishWithType", + @"contract=publishWithTooShortType", + @"contract=publishWithTooLongType", + @"contract=publishWithTypeStartingWithReservedStrings", + @"contract=publishWithTypeStartingWithNotAllowedCharacter", + @"contract=publishWithTypeContainingNotAllowedCharacter", + @"contract=signalWithType", + @"contract=signalWithTooShortType", + @"contract=signalWithTooLongType", + @"contract=signalWithTypeStartingWithReservedStrings", + @"contract=signalWithTypeStartingWithNotAllowedCharacter", + @"contract=signalWithTypeContainingNotAllowedCharacter", + @"contract=subscribeReceiveMessagesWithTypes" + ]; NSBundle * bundle = [NSBundle bundleForClass:[PubNubContractTestCase class]]; [Cucumberish executeFeaturesInDirectory:@"Features" diff --git a/Tests/PubNubContractTest/Steps/Files/PubNubFilesContractTestSteps.swift b/Tests/PubNubContractTest/Steps/Files/PubNubFilesContractTestSteps.swift index df6b01bf..94205249 100644 --- a/Tests/PubNubContractTest/Steps/Files/PubNubFilesContractTestSteps.swift +++ b/Tests/PubNubContractTest/Steps/Files/PubNubFilesContractTestSteps.swift @@ -105,7 +105,7 @@ public class PubNubFilesContractTestSteps: PubNubContractTestCase { self.wait(for: [sendFileExpect], timeout: 60.0) } - When("^I send a file with '(.+)' type$") { args, _ in + When("^I send a file with '(.+)' customMessageType$") { args, _ in let type = args?.first ?? String() let sendFileExpect = self.expectation(description: "Send file Response") diff --git a/Tests/PubNubContractTest/Steps/Publish/PubNubPublishContractTestSteps.swift b/Tests/PubNubContractTest/Steps/Publish/PubNubPublishContractTestSteps.swift index f9232704..f2752b53 100644 --- a/Tests/PubNubContractTest/Steps/Publish/PubNubPublishContractTestSteps.swift +++ b/Tests/PubNubContractTest/Steps/Publish/PubNubPublishContractTestSteps.swift @@ -54,7 +54,7 @@ public class PubNubPublishContractTestSteps: PubNubContractTestCase { self.wait(for: [publishMessageExpect], timeout: 60.0) } - When("^I publish message with '(.*)' type$") { args, _ in + When("^I publish message with '(.*)' customMessageType$") { args, _ in guard let type = args?.first as? String? else { XCTAssertNotNil(args?.first, "Step match failed") return @@ -96,7 +96,7 @@ public class PubNubPublishContractTestSteps: PubNubContractTestCase { } - When("^I send a signal with '(.*)' type$") { args, _ in + When("^I send a signal with '(.*)' customMessageType$") { args, _ in guard let type = args?.last else { XCTAssertNotNil(args?.first, "Step match failed") return