diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-20 12:16:52 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-20 12:16:52 +0300 |
| commit | 233b6e0dd93d66fabdaad23a10c3cc20bd721a8c (patch) | |
| tree | 50343de680df088bf4b9dbf1b4b1d369765d8c23 /doc | |
| parent | 7e6a17a280558af5b51a81a741a5ddf98d7ab2d3 (diff) | |
| parent | 75b2df681bdf7a7d2cb7c1a9089cc746b2f9a9f2 (diff) | |
Merge branch 'docs-update-qa-e2e-vs-unit-specs' into 'master'
Update QA docs: clarify spec vs. specs/features and use end-to-end instead of integration
See merge request gitlab-org/gitlab-ce!25413
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/testing_guide/testing_levels.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/development/testing_guide/testing_levels.md b/doc/development/testing_guide/testing_levels.md index 070b6477a7a..a7a3459719b 100644 --- a/doc/development/testing_guide/testing_levels.md +++ b/doc/development/testing_guide/testing_levels.md @@ -159,6 +159,10 @@ Every new feature should come with a [test plan]. > See [end-to-end tests](end_to_end_tests.md) for more information. +Note that `qa/spec` contains unit tests of the QA framework itself, not to be +confused with the application's [unit tests](#unit-tests) or +[end-to-end tests](#black-box-tests-at-the-system-level-aka-end-to-end-tests). + [multiple pieces]: ../architecture.md#components [GitLab Shell]: https://gitlab.com/gitlab-org/gitlab-shell [GitLab Workhorse]: https://gitlab.com/gitlab-org/gitlab-workhorse |