diff options
| -rw-r--r-- | qa/README.md | 30 | ||||
| -rw-r--r-- | qa/qa/runtime/user.rb | 2 |
2 files changed, 24 insertions, 8 deletions
diff --git a/qa/README.md b/qa/README.md index e0ebb53a2e9..1cfbbdd9d42 100644 --- a/qa/README.md +++ b/qa/README.md @@ -1,10 +1,10 @@ -## Integration tests for GitLab +# GitLab QA - Integration tests for GitLab This directory contains integration tests for GitLab. -It is part of [GitLab QA project](https://gitlab.com/gitlab-org/gitlab-qa). +It is part of the [GitLab QA project](https://gitlab.com/gitlab-org/gitlab-qa). -## What GitLab QA is? +## What is it? GitLab QA is an integration tests suite for GitLab. @@ -20,18 +20,34 @@ against any existing instance. ## How can I use it? You can use GitLab QA to exercise tests on any live instance! For example, the -follow call would login to the local GitLab instance and run all specs in +following call would login to a local [GDK] instance and run all specs in `qa/specs/features`: ``` -GITLAB_USERNAME='root' GITLAB_PASSWORD='5iveL!fe' bin/qa Test::Instance http://localhost +bin/qa Test::Instance http://localhost:3000 ``` -You can also supply a specific tests to run as another parameter. For example, to +### Running specific tests + +You can also supply specific tests to run as another parameter. For example, to test the EE license specs, you can run: ``` -EE_LICENSE="<YOUR LICENSE KEY>" GITLAB_USERNAME='root' GITLAB_PASSWORD='5iveL!fe' bin/qa Test::Instance http://localhost qa/ee +EE_LICENSE="<YOUR LICENSE KEY>" bin/qa Test::Instance http://localhost qa/ee +``` + +### Overriding the authenticated user + +Unless told otherwise, the QA tests will run as the default `root` user seeded +by the GDK. + +If you need to authenticate as a different user, you can provide the +`GITLAB_USERNAME` and `GITLAB_PASSWORD` environment variables: + +``` +GITLAB_USERNAME=jsmith GITLAB_PASSWORD=password bin/qa Test::Instance https://gitlab.example.com ``` All [supported environment variables are here](https://gitlab.com/gitlab-org/gitlab-qa#supported-environment-variables). + +[GDK]: https://gitlab.com/gitlab-org/gitlab-development-kit/ diff --git a/qa/qa/runtime/user.rb b/qa/qa/runtime/user.rb index 12ceda015f0..60027c89ab1 100644 --- a/qa/qa/runtime/user.rb +++ b/qa/qa/runtime/user.rb @@ -8,7 +8,7 @@ module QA end def password - ENV['GITLAB_PASSWORD'] || 'test1234' + ENV['GITLAB_PASSWORD'] || '5iveL!fe' end end end |