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

1 files changed, 9 insertions, 5 deletions

diff --git a/qa/README.md b/qa/README.md
index 5e32496ea9f..7709db36f8e 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -1,21 +1,25 @@
-# GitLab QA - Integration tests for GitLab
+# GitLab QA - End-to-end tests for GitLab
 
-This directory contains integration tests for GitLab.
+This directory contains [end-to-end tests](doc/development/testing_guide/end_to_end_tests.md)
+for GitLab. It includes the test framework and the tests themselves.
+
+The tests can be found in `qa/specs/features` (not to be confused with the unit
+tests for the test framework, which are in `spec/`).
 
 It is part of the [GitLab QA project](https://gitlab.com/gitlab-org/gitlab-qa).
 
 ## What is it?
 
-GitLab QA is an integration tests suite for GitLab.
+GitLab QA is an end-to-end tests suite for GitLab.
 
-These are black-box and entirely click-driven integration tests you can run
+These are black-box and entirely click-driven end-to-end tests you can run
 against any existing instance.
 
 ## How does it work?
 
 1. When we release a new version of GitLab, we build a Docker images for it.
 1. Along with GitLab Docker Images we also build and publish GitLab QA images.
-1. GitLab QA project uses these images to execute integration tests.
+1. GitLab QA project uses these images to execute end-to-end tests.
 
 ## Validating GitLab views / partials / selectors in merge requests