-
-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into responseTimeAllure
- Loading branch information
Showing
20 changed files
with
324 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,27 +110,26 @@ jobs: | |
|
|
||
| - name: Upload coverage to Codecov | ||
| if: ${{ matrix.platform == 'ubuntu-latest' && ! github.event.pull_request.head.repo.fork || github.ref == 'refs/heads/master' }} | ||
| uses: codecov/[email protected].1 | ||
| uses: codecov/[email protected].2 | ||
| with: | ||
| fail_ci_if_error: true | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
|
|
||
| - name: Upload coverage to Codecov | ||
| if: ${{ matrix.platform == 'ubuntu-latest' && github.event.pull_request.head.repo.fork }} | ||
| uses: codecov/[email protected].1 | ||
| uses: codecov/[email protected].2 | ||
|
|
||
| - name: VIVIDUS tasks validation | ||
| run: | | ||
| ./gradlew validateKnownIssues printSteps countSteps -x testVividusInitialization -p vividus-tests --project-prop 'vividus.variables.iterationLimit=3' --project-prop 'vividus.variables.target-platform=ios' | ||
| - name: Integration tests | ||
| if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'windows-latest' | ||
| run: | | ||
| ./gradlew :vividus-tests:debugStories --project-prop 'vividus.configuration-set.active=integration' --project-prop 'vividus.allure.history-directory=output/history/integration-tests' --project-prop 'vividus.allure.executor.name="Github Actions (Vividus)"' --project-prop 'vividus.allure.executor.type=github' --project-prop 'vividus.allure.executor.url=https://github.com/vividus-framework/vividus/actions' --project-prop 'vividus.allure.executor.build-order=${GITHUB_RUN_ID}' --project-prop 'vividus.allure.executor.build-name="Integration Tests ${GITHUB_RUN_ID}"' --project-prop 'vividus.allure.executor.build-url=https://github.com/vividus-framework/vividus/actions/runs/${GITHUB_RUN_ID}' --project-prop 'vividus.allure.executor.report-url=https://github.com/vividus-framework/vividus/actions/runs/${GITHUB_RUN_ID}' --project-prop 'vividus.allure.executor.report-name="Integration tests report"' --project-prop "fileToSaveExitCode=$(pwd)/exitCode.txt" --no-daemon | ||
| - name: Publish integration tests report | ||
| if: (matrix.platform == 'ubuntu-latest' || matrix.platform == 'windows-latest') && always() | ||
| if: always() | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: Integration Tests - Allure report - ${{ matrix.platform }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ use, security is always extremely important. | |
| Please do not open an issue or pull request as this makes the problem immediately visible to everyone | ||
| including malicious actors. | ||
|
|
||
| Security issues in this project can be safely reported via the the following address: | ||
| Security issues in this project can be safely reported via the following address: | ||
|
|
||
| [email protected] | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule vividus-build-system
updated
12 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
vividus-plugin-saucelabs/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| mock-maker-inline |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
vividus/src/main/java/org/vividus/expression/UrlExpressionProcessors.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright 2019-2023 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.vividus.expression; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.jbehave.core.expressions.DelegatingExpressionProcessor; | ||
| import org.jbehave.core.expressions.SingleArgExpressionProcessor; | ||
| import org.vividus.util.UriUtils; | ||
|
|
||
| public class UrlExpressionProcessors extends DelegatingExpressionProcessor | ||
| { | ||
| public UrlExpressionProcessors() | ||
| { | ||
| super(List.of( | ||
| new SingleArgExpressionProcessor<>("extractHostFromUrl", url -> UriUtils.createUri(url).getHost()), | ||
| new SingleArgExpressionProcessor<>("extractPathFromUrl", url -> UriUtils.createUri(url).getPath()), | ||
| new SingleArgExpressionProcessor<>("extractQueryFromUrl", url -> UriUtils.createUri(url).getQuery()) | ||
| )); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Copyright 2019-2023 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.vividus.transformer; | ||
|
|
||
| import java.util.List; | ||
| import java.util.function.IntUnaryOperator; | ||
|
|
||
| enum Order | ||
| { | ||
| ASCENDING | ||
| { | ||
| @Override | ||
| IntUnaryOperator getIndexer(List<?> rows) | ||
| { | ||
| return i -> i; | ||
| } | ||
|
|
||
| @Override | ||
| int getDirection() | ||
| { | ||
| return 1; | ||
| } | ||
| }, | ||
| DESCENDING | ||
| { | ||
| @Override | ||
| IntUnaryOperator getIndexer(List<?> rows) | ||
| { | ||
| int size = rows.size(); | ||
| return i -> size - i - 1; | ||
| } | ||
|
|
||
| @Override | ||
| int getDirection() | ||
| { | ||
| return -1; | ||
| } | ||
| }; | ||
|
|
||
| abstract IntUnaryOperator getIndexer(List<?> rows); | ||
|
|
||
| abstract int getDirection(); | ||
| } |
Oops, something went wrong.