From 3bd16781d9770383a5f86d178b5640cb338aece8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A4ser?= Date: Thu, 2 Feb 2023 17:24:17 +0100 Subject: [PATCH] test: enable lcov report --- .gitignore | 2 +- analysis.sh | 4 ++-- apps/sonar-project.properties | 34 +++++++++++++++++++++++++++ apps/website/jest.config.ts | 9 ++++--- apps/website/sonar-project.properties | 9 ------- 5 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 apps/sonar-project.properties delete mode 100644 apps/website/sonar-project.properties diff --git a/.gitignore b/.gitignore index b372997..9bfebba 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ node_modules # misc /.sass-cache /connect.lock -/coverage +**/coverage /libpeerconnection.log npm-debug.log yarn-error.log diff --git a/analysis.sh b/analysis.sh index 948cf59..2f7ec46 100755 --- a/analysis.sh +++ b/analysis.sh @@ -5,5 +5,5 @@ wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scann unzip sonar-scanner-cli-4.8.0.2856-linux.zip ls -la mv ./sonar-scanner-4.8.0.2856-linux ./sonarscanner -cd apps/website -../../sonarscanner/bin/sonar-scanner -X -Dsonar.login=b6b66f8b798b46b693cc19f788215111871d5287 +cd apps +../sonarscanner/bin/sonar-scanner -X -Dsonar.login=b6b66f8b798b46b693cc19f788215111871d5287 diff --git a/apps/sonar-project.properties b/apps/sonar-project.properties new file mode 100644 index 0000000..d7c92d3 --- /dev/null +++ b/apps/sonar-project.properties @@ -0,0 +1,34 @@ +sonar.host.url=https://sonarqube.naser.fr/ +sonar.projectKey=david:guitar-apps +sonar.projectName=Apps Guitar School +sonar.projectVersion=0.1.0-SNAPSHOT + +# ===================================================== +# Meta-data for the project +# ===================================================== + +sonar.links.homepage=https://gitea.naser.fr/sebsn86/nx-guitar-school +sonar.links.ci=https://teamcity.naser.fr/buildConfiguration/NxGuitarSchool_GuitarSchool?mode=builds#all-projects +sonar.links.issues=https://gitea.naser.fr/sebsn86/nx-guitar-school/issues + +# ===================================================== +# Definition of the modules +# ===================================================== + +sonar.modules=website + +website.sonar.projectName=NextJS Guitar School + +# ===================================================== +# Properties that will be shared amongst all modules +# ===================================================== + +# Website properties +website.sonar.projectBaseDir=./website +website.sonar.sources=./ +website.sonar.exclusions=**/.next/**/.coverage/,**/.eslintrc.json,**/index.d.ts,**/jest.config.ts,**/next.config.js,**/postcss.config.js,**/tailwind.config.js,**/with-nx.js,**/*.css,**/*.scss,**/*.spec.ts,**/*.spec.tsx +website.sonar.coverage.exclusions=**/.next/**/.coverage,**/.eslintrc.json,**/index.d.ts,**/jest.**/config.ts,**/next.config.js,**/postcss.config.js,**/tailwind.config.js,**/with-nx.js,**/*.css,**/*.scss +website.sonar.language=ts +website.sonar.tests=./tests +website.sonar.javascript.lcov.reportPaths=./coverage/lcov.info +website.sonar.sourceEncoding=UTF-8 diff --git a/apps/website/jest.config.ts b/apps/website/jest.config.ts index 26339d7..5fc3e4d 100644 --- a/apps/website/jest.config.ts +++ b/apps/website/jest.config.ts @@ -4,10 +4,13 @@ export default { preset: '../../jest.preset.js', transform: { '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest', - '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], + '^.+\\.[tj]sx?$': ['babel-jest', {presets: ['@nrwl/next/babel']}], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], collectCoverage: true, - coverageReporters: ["clover", "json", "lcov", "text"], - coverageDirectory: '../../coverage/apps/website', + coverageReporters: ["text", ["lcov", {"projectRoot": "./apps/website"}]], + coverageDirectory: './coverage', + moduleNameMapper: { + '^@/(.*)$': '/$1', + }, }; diff --git a/apps/website/sonar-project.properties b/apps/website/sonar-project.properties deleted file mode 100644 index 45e8a09..0000000 --- a/apps/website/sonar-project.properties +++ /dev/null @@ -1,9 +0,0 @@ -sonar.host.url=https://sonarqube.naser.fr/ -sonar.projectKey=david:guitar-apps -sonar.sources=./ -sonar.exclusions=.next/,.eslintrc.json,config.ts,index.d.ts,jest.config.ts,next.config.js,postcss.config.js,tailwind.config.js,with-nx.js,**/*.css,**/*.scss,**/*.spec.ts,**/*.spec.tsx -sonar.coverage.exclusions=.next/,.eslintrc.json,config.ts,index.d.ts,jest.config.ts,next.config.js,postcss.config.js,tailwind.config.js,with-nx.js,**/*.css,**/*.scss -sonar.language=ts -sonar.tests=./tests -sonar.javascript.lcov.reportPaths=../../coverage/apps/website/lcov.info -sonar.sourceEncoding=UTF-8