diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-10-12 09:35:10 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-10-12 09:35:10 +0000 |
| commit | 10d41a9c3122ebd8ceb0cf4333d9e8f581ad62c3 (patch) | |
| tree | afedffea025434fd3a0212b93e8796c5963340ad | |
| parent | 4448b911602f6d6f784f8692898f31e536864ab4 (diff) | |
| parent | 9e5cb67e9db6c30f550697eabb3fd3a891be3a0d (diff) | |
| download | gitlab-ce-10d41a9c3122ebd8ceb0cf4333d9e8f581ad62c3.tar.gz | |
Merge branch 'docs/fix-dev-doc' into 'master'
Fix a missing link and create a separate "Testing guides" section
See merge request gitlab-org/gitlab-ce!14819
| -rw-r--r-- | doc/development/README.md | 6 | ||||
| -rw-r--r-- | doc/development/testing_guide/index.md | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/development/README.md b/doc/development/README.md index e2d0c6c2056..36096842344 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -21,7 +21,6 @@ ## Backend guides -- [Testing standards and style guidelines](testing_guide/index.md) - [API styleguide](api_styleguide.md) Use this styleguide if you are contributing to the API. - [Sidekiq guidelines](sidekiq_style_guide.md) for working with Sidekiq workers @@ -67,6 +66,11 @@ - [Ordering table columns](ordering_table_columns.md) - [Verifying database capabilities](verifying_database_capabilities.md) +## Testing guides + +- [Testing standards and style guidelines](testing_guide/index.md) +- [Frontend testing standards and style guidelines](testing_guide/frontend_testing.md) + ## Documentation guides - [Documentation styleguide](doc_styleguide.md): Use this styleguide if you are diff --git a/doc/development/testing_guide/index.md b/doc/development/testing_guide/index.md index 38b1fe1a193..8045bbad7ba 100644 --- a/doc/development/testing_guide/index.md +++ b/doc/development/testing_guide/index.md @@ -84,6 +84,7 @@ test should be re-implemented using RSpec instead. [^1]: /ci/yaml/README.html#dependencies +[rails]: http://rubyonrails.org/ [RSpec]: https://github.com/rspec/rspec-rails#feature-specs [Capybara]: https://github.com/teamcapybara/capybara [Karma]: http://karma-runner.github.io/ |