diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 18:08:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 18:08:15 +0300 |
| commit | c2b98d3dbd47ab92c79c702276fe9130d9a28036 (patch) | |
| tree | bf4071f551fdc12c22b23b2bb66483064e7b9ea9 /scripts/frontend | |
| parent | badb9c1deacbea601b02f88811b7e123589d9251 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/frontend')
| -rwxr-xr-x | scripts/frontend/check_no_partial_karma_jest.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/frontend/check_no_partial_karma_jest.sh b/scripts/frontend/check_no_partial_karma_jest.sh index 0d0c897bb18..c5fffa5900b 100755 --- a/scripts/frontend/check_no_partial_karma_jest.sh +++ b/scripts/frontend/check_no_partial_karma_jest.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash -karma_files=$(find spec/javascripts ee/spec/javascripts -type f -name '*_spec.js' -not -path '*/helpers/*') +karma_directory=spec/javascripts + +if [ -d ee ]; then + karma_directory="$karma_directory ee/$karma_directory" +fi + +karma_files=$(find $karma_directory -type f -name '*_spec.js' -not -path '*/helpers/*') violations="" for karma_file in $karma_files; do |