summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-03-19 09:23:05 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-03-19 09:23:05 +0000
commitd0eee137d8bce05c11f848df6c32c5596e56c6eb (patch)
treea822be2c67265d5358ef8fe8e321bcc070a62ab6
parent57c5cb568c36e4c6ff609bc6e50c421b3d46a697 (diff)
parent88dffa45ce279729dc8c1cf0653b91d3bd9f7967 (diff)
downloadgitlab-ce-d0eee137d8bce05c11f848df6c32c5596e56c6eb.tar.gz
Merge branch 'tc-package-qa-rename-docs' into 'master'
Rename `package-qa` in docs See merge request gitlab-org/gitlab-ce!17842
-rw-r--r--doc/development/testing_guide/end_to_end_tests.md2
-rw-r--r--qa/README.md2
-rw-r--r--qa/qa/page/README.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/testing_guide/end_to_end_tests.md b/doc/development/testing_guide/end_to_end_tests.md
index 5b4f6511f04..d10a797a142 100644
--- a/doc/development/testing_guide/end_to_end_tests.md
+++ b/doc/development/testing_guide/end_to_end_tests.md
@@ -22,7 +22,7 @@ You can find these nightly pipelines at [GitLab QA pipelines page][gitlab-qa-pip
It is possible to run end-to-end tests (eventually being run within a
[GitLab QA pipeline][gitlab-qa-pipelines]) for a merge request by triggering
-the `package-qa` manual action, that should be present in a merge request
+the `package-and-qa` manual action, that should be present in a merge request
widget.
Manual action that starts end-to-end tests is also available in merge requests
diff --git a/qa/README.md b/qa/README.md
index 3a99a30d379..a4b4398645e 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -26,7 +26,7 @@ and corresponding views / partials / selectors in CE / EE.
Whenever `qa:selectors` job fails in your merge request, you are supposed to
fix [page objects](qa/page/README.md). You should also trigger end-to-end tests
-using `package-qa` manual action, to test if everything works fine.
+using `package-and-qa` manual action, to test if everything works fine.
## How can I use it?
diff --git a/qa/qa/page/README.md b/qa/qa/page/README.md
index 83710606d7c..d38223f690d 100644
--- a/qa/qa/page/README.md
+++ b/qa/qa/page/README.md
@@ -40,7 +40,7 @@ the time it would take to build packages and test everything.
That is why when someone changes `t.text_field :login` to
`t.text_field :username` in the _new session_ view we won't know about this
change until our GitLab QA nightly pipeline fails, or until someone triggers
-`package-qa` action in their merge request.
+`package-and-qa` action in their merge request.
Obviously such a change would break all tests. We call this problem a _fragile
tests problem_.