summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2017-06-07 16:46:11 +0000
committerClement Ho <clemmakesapps@gmail.com>2017-06-07 16:46:11 +0000
commitac608715cd4054892d76486e5bfedb70b3176e22 (patch)
treea88e9f9472d64ee72cc9cd5fd3ba119423fa4e1a
parente263e9f54fff78aac7bab86ccbf5ba237ee52a0a (diff)
parent9bb4c08a6e45feb0c6a2c83d7cf0ca5537b61e8a (diff)
downloadgitlab-ce-ac608715cd4054892d76486e5bfedb70b3176e22.tar.gz
Merge branch 'edge-cases-integration-frontend-testing' into 'master'
Update testing.md `# Frontend Testing` to include integration spec for edge cases See merge request !11784
-rw-r--r--doc/development/fe_guide/testing.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/fe_guide/testing.md b/doc/development/fe_guide/testing.md
index 0ef9fc61a61..867c83f1e72 100644
--- a/doc/development/fe_guide/testing.md
+++ b/doc/development/fe_guide/testing.md
@@ -7,7 +7,7 @@ feature tests with Capybara for e2e (end-to-end) integration testing.
Unit and feature tests need to be written for all new features.
Most of the time, you should use rspec for your feature tests.
There are cases where the behaviour you are testing is not worth the time spent running the full application,
-for example, if you are testing styling, animation or small actions that don't involve the backend,
+for example, if you are testing styling, animation, edge cases or small actions that don't involve the backend,
you should write an integration test using Jasmine.
![Testing priority triangle](img/testing_triangle.png)