Commit e47213a5 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'master' into 'master' 

Move default and fixed argument of test to give the possibility of using Jest instead Karma

See merge request to-be-continuous/angular!38
parents 4588eda3 db6665d4

templates/gitlab-ci-angular.yml

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ variables: 
    test

    --code-coverage

    --reporters progress,junit

    --watch=false 

    --no-progress



  NG_E2E_ARGS: >-

    e2e
@@ -298,7 +300,7 @@ stages: 


  function run_tests() {

    # shellcheck disable=SC2086

    ng $NG_TEST_ARGS --watch=false --no-progress

    ng $NG_TEST_ARGS

  }



  function merge_coverage() {