diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 00:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 00:09:21 +0300 |
| commit | 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 (patch) | |
| tree | 2abe2661b10cf6281bc03855b3053a072c64fbbf /qa | |
| parent | c43ba2677f41ad0b5fc6f3af6baf4266c70dfcb3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Dockerfile | 2 | ||||
| -rw-r--r-- | qa/README.md | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 126d9fbc591..155a9761a6f 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,5 +1,5 @@ FROM ruby:2.6-stretch -LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>" +LABEL maintainer="GitLab Quality Department <quality@gitlab.com>" ENV DEBIAN_FRONTEND noninteractive ## diff --git a/qa/README.md b/qa/README.md index cdc84da1c5e..c7c6e535963 100644 --- a/qa/README.md +++ b/qa/README.md @@ -44,6 +44,14 @@ Note: GitLab QA uses [Selenium WebDriver](https://www.seleniumhq.org/) via the browser to use. You will need to have Chrome (or Chromium) and [chromedriver](https://chromedriver.chromium.org/) installed / in your `$PATH`. +### Writing tests + +- [Writing tests from scratch tutorial](../doc/development/testing_guide/end_to_end/quick_start_guide.md) + - [Best practices](../doc/development/testing_guide/best_practices.md) + - [Using page objects](../doc/development/testing_guide/end_to_end/page_objects.md) + - [Guidelines](../doc/development/testing_guide/index.md) + - [Tests with special setup for local environemnts](../doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md) + ### Run the end-to-end tests in a local development environment Follow the GDK instructions to [prepare](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/prepare.md) @@ -77,13 +85,6 @@ Once you have the license file you can export it as an environment variable and export EE_LICENSE=$(cat /path/to/gitlab_license) ``` -### Writing tests - -- [Writing tests from scratch tutorial](../doc/development/testing_guide/end_to_end/quick_start_guide.md) - - [Best practices](../doc/development/testing_guide/best_practices.md) - - [Using page objects](../doc/development/testing_guide/end_to_end/page_objects.md) - - [Guidelines](../doc/development/testing_guide/index.md) - ### Running specific tests You can also supply specific tests to run as another parameter. For example, to |