diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b724e32f4695baff22661c3d66095b648360aa6d..eb60c5f8522e53f59070a7ca61961d6c58ede968 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - setup - test + - coverage_report include: - local: .gitlab/server.gitlab-ci.yml diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml index d0850d79b0d00ae75ccf5b2d21dd95546801bfd2..3e979d733a329c6878b78c8f5ca6977c01598153 100644 --- a/.gitlab/client.gitlab-ci.yml +++ b/.gitlab/client.gitlab-ci.yml @@ -51,6 +51,23 @@ client:test: - cd client - npm run test:coverage coverage: /All files\s*\|\s*([\d\.]+)/ + artifacts: + reports: + path: client/output/coverage/jest/cobertura-coverage.xml + expire_in: 5 min + +client:coverage_report: + image: python + stage: coverage_report + only: + refs: + - dev + - merge_requests + changes: + - client/**/* + script: + - cd client + - python coverage_report.py artifacts: reports: cobertura: client/output/coverage/jest/cobertura-coverage.xml diff --git a/client/coverage_report.py b/client/coverage_report.py new file mode 100644 index 0000000000000000000000000000000000000000..c6cd37630e0801182235105d68788cf0324be4ac --- /dev/null +++ b/client/coverage_report.py @@ -0,0 +1,8 @@ +import xml.etree.ElementTree as et + +tree = et.parse('output/coverage/jest/cobertura-coverage.xml') +root = tree.getroot() +for package_class in tree.find('.//packages'): + package_class.set('name', 'client.' + package_class.attrib.get('name')) + package_class.set('filename', 'client/' + package_class.attrib.get('filename')) +tree.write('output/coverage/jest/cobertura-coverage.xml') diff --git a/client/src/App.tsx b/client/src/App.tsx index 931b58fa3cac3893f9b343cff3dc423a544ba577..fb88a8f1a7e7e9580ed876da06ecda78b351fcf2 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -6,7 +6,7 @@ import logo from './logo.svg' interface Message { message: string } - +//test const App: React.FC = () => { const [currentMessage, setCurrentMessage] = useState<Message>() useEffect(() => {