diff --git a/.circleci/config.yml b/.circleci/config.yml index 91ccb9f..ae14a68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,15 +49,13 @@ jobs: - setup_remote_docker: docker_layer_caching: true - run: .circleci/build.sh - - run: .cicircleci/phpunit_tests.sh - run: - name: Run on fail status + name: Run phpunit tests and generate coverage command: | - .circleci/phpunit_results.sh - when: always - - run: .circleci/phpunit_coverage.sh + .circleci/phpunit_tests.sh + .circleci/phpunit_coverage.sh - run: - name: Run on fail coverage + name: Run on fail tests command: | .circleci/phpunit_results.sh when: always @@ -66,27 +64,6 @@ jobs: - store_test_results: path: /tmp/phpunit -# phpunit_coverage: -# <<: *job-build -# steps: -# - attach_workspace: -# at: /workspace -# - checkout -# - run: if [ -f "./dev-tools.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-tools.sh; fi -# - setup_remote_docker: -# docker_layer_caching: true -# - run: .circleci/build.sh -# - run: .circleci/phpunit_coverage.sh -# - run: -# name: Run on fail status -# command: | -# .circleci/phpunit_results.sh -# when: always -# - store_artifacts: -# path: /tmp/phpunit -# - store_test_results: -# path: /tmp/phpunit - workflows: version: 2 main: @@ -94,4 +71,3 @@ workflows: - build - build_suggest - phpunit_tests -# - phpunit_coverage diff --git a/modules/tide_site_preview/tests/src/Kernel/TideSitePreviewHelperTest.php b/modules/tide_site_preview/tests/src/Kernel/TideSitePreviewHelperTest.php index cf4ac87..08e7b9c 100644 --- a/modules/tide_site_preview/tests/src/Kernel/TideSitePreviewHelperTest.php +++ b/modules/tide_site_preview/tests/src/Kernel/TideSitePreviewHelperTest.php @@ -54,7 +54,7 @@ protected function setUp() { public function testGetNodeFrontendUrl($value, $expected) { $url = Url::fromUri($value); $url = $this->tideSitePreviewHelper->getNodeFrontendUrl($url); - $this->assertEquals($expected, $url->toString().'hello'); + $this->assertEquals($expected, $url->toString()); } /**