Commit 31cd26a7 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix-cobertura' into 'master' 

fix: replace broken cobertura-merge with merge-cobertura

See merge request to-be-continuous/angular!66
parents a76e9bf4 b5e527e5

README.md

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ This stage is bound to the `test` stage and uses the following variables : 
| `e2e-args` / `NG_E2E_ARGS` | Angular [ng e2e](https://angular.io/cli/e2e) arguments     | `e2e`                                    |

| `e2e-enabled` / `NG_E2E_ENABLED` | set to `true`to enable the e2e tests execution             | *none (disabled by default)*             |



Implementation rely on the official [Angular CLI](https://cli.angular.io/) tool (`ng build` and `ng test` commands).

Implementation rely on the official [Angular CLI](https://angular.dev/cli) tool (`ng build` and `ng test` commands).



To enable JUnit reporting on this job, you'll need to add [jasmine-reporters](https://www.npmjs.com/package/jasmine-reporters) dependency to your project and add the following snippet to your protractor config file :

templates/gitlab-ci-angular.yml

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ stages: 
        reports_opts="${reports_opts} ${project}=${report}"

      done

      # shellcheck disable=SC2086

      npx -y cobertura-merge -p -o "${final_report}" ${reports_opts}

      npx -y merge-cobertura -p -o "${final_report}" ${reports_opts}

    fi

  }