[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-backoffice] branch master updated (ac581d9 -> e7393a
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-backoffice] branch master updated (ac581d9 -> e7393a4) |
Date: |
Tue, 09 Jan 2018 13:25:16 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a change to branch master
in repository backoffice.
from ac581d9 up to test track_order() and get a XMLHttpRequest not found
new b3d7a53 testing /history
new 6f9e061 testing the javascript license page
new e7393a4 testing /track/transfer and checking response body is left
untouched
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
talerbackoffice/backoffice/backoffice.py | 7 +------
talerbackoffice/tests.py | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/talerbackoffice/backoffice/backoffice.py
b/talerbackoffice/backoffice/backoffice.py
index e59d0e6..646dc64 100644
--- a/talerbackoffice/backoffice/backoffice.py
+++ b/talerbackoffice/backoffice/backoffice.py
@@ -63,6 +63,7 @@ def index():
def javascript_licensing():
return flask.render_template("templates/javascript.html")
+
@app.route("/history")
def history():
qs = get_query_string().decode("utf-8")
@@ -73,12 +74,6 @@ def history():
return flask.jsonify(resp.json()), resp.status_code
address@hidden("/backoffice")
-def track():
- response =
flask.make_response(flask.render_template("templates/backoffice.html"))
- return response
-
-
@app.route("/track/transfer")
def track_transfer():
qs = get_query_string().decode("utf-8")
diff --git a/talerbackoffice/tests.py b/talerbackoffice/tests.py
index 82269a1..3e33435 100644
--- a/talerbackoffice/tests.py
+++ b/talerbackoffice/tests.py
@@ -23,5 +23,36 @@ class BackofficeTestCase(unittest.TestCase):
soup.find("select").option.contents[0])
self.assertEqual(response.status_code, 200)
+ @patch("requests.get")
+ def test_track_transfer(self, mocked_get):
+ ret = MagicMock()
+ ret.status_code = 200
+ ret.json.return_value = {}
+ mocked_get.return_value = ret
+ response = self.app.get("/track/transfer?para1=1¶2=2")
+ mocked_get.assert_called_with(
+ "http://backend.example.com/track/transfer",
+ params=dict(para1='1', para2='2'))
+ # check data is returned verbatim from the backend
+ self.assertEqual(response.data, b'{}\n')
+
+
+ @patch("requests.get")
+ def test_history(self, mocked_get):
+ ret = MagicMock()
+ ret.status_code = 200
+ ret.json.return_value = {}
+ mocked_get.return_value = ret
+ response = self.app.get("/history?para1=1¶2=2")
+ mocked_get.assert_called_with(
+ "http://backend.example.com/history",
+ params=dict(para1='1', para2='2'))
+ self.assertEqual(response.data, b'{}\n')
+
+ def test_javascript_license_page(self):
+ response = self.app.get("/javascript")
+ soup = BeautifulSoup(response.data, "html.parser")
+ self.assertEqual(soup.body.table["id"], "jslicense-labels1")
+
if __name__ == "__main__":
unittest.main()
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-backoffice] branch master updated (ac581d9 -> e7393a4),
gnunet <=