From ea3e3a98e590256400385be8528b5abd1d44b2b5 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 8 May 2013 14:52:40 +0200
Subject: [PATCH] added small page about acceptance testing

---
 developer_manual/app/app/acceptancetesting.rst   | 7 +++++++
 developer_manual/app/appframework/index.rst      | 1 +
 developer_manual/app/appframework/javascript.rst | 1 -
 developer_manual/app/index.rst                   | 7 +++++--
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 developer_manual/app/app/acceptancetesting.rst
 delete mode 100644 developer_manual/app/appframework/javascript.rst

diff --git a/developer_manual/app/app/acceptancetesting.rst b/developer_manual/app/app/acceptancetesting.rst
new file mode 100644
index 000000000..679deacf5
--- /dev/null
+++ b/developer_manual/app/app/acceptancetesting.rst
@@ -0,0 +1,7 @@
+Acceptance Tests
+================
+
+https://github.com/cucumber/cucumber/wiki/Given-When-Then
+http://www.elabs.se/blog/15-you-re-cuking-it-wrong
+https://github.com/cucumber/cucumber/wiki/Cucumber-Backgrounder
+https://github.com/jnicklas/capybara#capybara
\ No newline at end of file
diff --git a/developer_manual/app/appframework/index.rst b/developer_manual/app/appframework/index.rst
index dca62637b..4cb9853ca 100644
--- a/developer_manual/app/appframework/index.rst
+++ b/developer_manual/app/appframework/index.rst
@@ -18,6 +18,7 @@ App Developement (App Framework)
    css
    angularsetup
    angular
+   ../app/acceptancetesting
    unittesting
    middleware
    externalapi
diff --git a/developer_manual/app/appframework/javascript.rst b/developer_manual/app/appframework/javascript.rst
deleted file mode 100644
index e1b6b9c24..000000000
--- a/developer_manual/app/appframework/javascript.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../app/javascript.rst
\ No newline at end of file
diff --git a/developer_manual/app/index.rst b/developer_manual/app/index.rst
index d3a9962da..3a99ad1cb 100644
--- a/developer_manual/app/index.rst
+++ b/developer_manual/app/index.rst
@@ -56,9 +56,12 @@ HTML and inclusion of JavaScript and CSS
 JavaScript & CSS
 ~~~~~~~~~~~~~~~~
 * :doc:`app/static`
-* :doc:`app/javascript`
 * :doc:`app/css`
 
+Testing
+~~~~~~~
+* :doc:`app/acceptancetesting`
+
 API Documentation
 ~~~~~~~~~~~~~~~~~
 * `ownCloud App API <http://api.owncloud.org/namespaces/OCP.html>`_
@@ -100,7 +103,6 @@ HTML and inclusion of JavaScript and CSS
 JavaScript & CSS
 ~~~~~~~~~~~~~~~~
 * :doc:`appframework/static`
-* :doc:`appframework/javascript`
 * :doc:`general/angular` | :doc:`appframework/angularsetup` | :doc:`appframework/angular`
 * :doc:`appframework/css`
 
@@ -113,6 +115,7 @@ Hook before or after controller execution
 Testing
 ~~~~~~~
 * :doc:`appframework/unittesting`
+* :doc:`app/acceptancetesting`
 
 API Documentation
 ~~~~~~~~~~~~~~~~~