Merge branch 'docs/fix-dev-doc' into 'master'

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

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/