diff --git a/docs/standards/javascript.md b/docs/standards/javascript.md index 9302746f..9655571e 100644 --- a/docs/standards/javascript.md +++ b/docs/standards/javascript.md @@ -161,7 +161,7 @@ CiviCRM's testing regimen includes: * (Linting) [JSHint](/standards/javascript.md#coding-standards) * (Unit testing) [Karma and Jasmine](/testing/karma.md) - * (End-to-end testing, for AngularJS) [Protractor and Jasmine](/testing/protractor.md) + * (Deprecated; end-to-end testing) [QUnit](/testing/qunit.md) ## Javascript in Markup diff --git a/docs/testing/index.md b/docs/testing/index.md index 9fb76f45..ab3e1bbe 100644 --- a/docs/testing/index.md +++ b/docs/testing/index.md @@ -63,11 +63,11 @@ Depending on the scope of the test and the relevant language, one chooses among PHPUnit
- Codeception
+ Selenium - Protractor
+ QUnit diff --git a/docs/testing/qunit.md b/docs/testing/qunit.md index 6e5043e1..67aa31ff 100644 --- a/docs/testing/qunit.md +++ b/docs/testing/qunit.md @@ -1,8 +1,8 @@ !!! caution "QUnit for CiviCRM is deprecated" This documentation explains the existing QUnit tests. However, the - functionality overlaps a lot with [Karma](/testing/karma.md) and - [Protractor](/testing/protractor.md). Karma and Protractor have more + functionality overlaps a lot with [Karma](/testing/karma.md) . Karma and Protractor have more powerful test-runners and better support for AngularJS, so the QUnit-CiviCRM suite is deprecated. diff --git a/mkdocs.yml b/mkdocs.yml index a3e44b92..d3112d55 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -186,11 +186,11 @@ pages: - Continuous Integration: testing/continuous-integration.md - PHP: - PHPUnit Tests: testing/phpunit.md - - Codeception Tests: testing/codeception.md + # - Codeception Tests: testing/codeception.md - Selenium Tests: testing/selenium.md - Javascript: - Karma Tests: testing/karma.md - - Protractor Tests: testing/protractor.md + # - Protractor Tests: testing/protractor.md - QUnit Tests: testing/qunit.md - Other: - Upgrade Tests: testing/upgrades.md