From 52707f87e7faf1ae985c88b6787b688d121b538b Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Fri, 22 Apr 2016 18:03:56 +0200
Subject: adapt to protocol changes and improve error handling

---
 lib/wallet/cryptoLib.ts          | 1 +
 lib/wallet/emscriptif.ts         | 2 ++
 lib/wallet/types.ts              | 3 +++
 manifest.json                    | 2 +-
 pages/confirm-create-reserve.tsx | 5 +++--
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/wallet/cryptoLib.ts b/lib/wallet/cryptoLib.ts
index 769cb3356..967fc23c8 100644
--- a/lib/wallet/cryptoLib.ts
+++ b/lib/wallet/cryptoLib.ts
@@ -125,6 +125,7 @@ namespace RpcFunctions {
       fee_deposit: (new native.Amount(denom.fee_deposit)).toNbo(),
       fee_refresh: (new native.Amount(denom.fee_refresh)).toNbo(),
       fee_withdraw: (new native.Amount(denom.fee_withdraw)).toNbo(),
+      fee_refund: (new native.Amount(denom.fee_refund)).toNbo(),
     });
 
     let nativeSig = new native.EddsaSignature();
diff --git a/lib/wallet/emscriptif.ts b/lib/wallet/emscriptif.ts
index b03bc9bc7..4ec029e52 100644
--- a/lib/wallet/emscriptif.ts
+++ b/lib/wallet/emscriptif.ts
@@ -866,6 +866,7 @@ export interface DenominationKeyValidityPS_args {
   fee_withdraw: AmountNbo;
   fee_deposit: AmountNbo;
   fee_refresh: AmountNbo;
+  fee_refund: AmountNbo;
   denom_hash: HashCode;
 }
 
@@ -889,6 +890,7 @@ export class DenominationKeyValidityPS extends SignatureStruct {
       ["fee_withdraw", AmountNbo],
       ["fee_deposit", AmountNbo],
       ["fee_refresh", AmountNbo],
+      ["fee_refund", AmountNbo],
       ["denom_hash", HashCode]
     ];
   }
diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts
index 8aa03d82b..5045a5b9a 100644
--- a/lib/wallet/types.ts
+++ b/lib/wallet/types.ts
@@ -75,6 +75,9 @@ export class Denomination {
   @Checkable.Value(AmountJson)
   fee_refresh: AmountJson;
 
+  @Checkable.Value(AmountJson)
+  fee_refund: AmountJson;
+
   @Checkable.String
   stamp_start: string;
 
diff --git a/manifest.json b/manifest.json
index 185232f57..215f9dcba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "description": "Privacy preserving and transparent payments",
   "manifest_version": 2,
   "name": "GNU Taler Wallet (git)",
-  "version": "0.5.19",
+  "version": "0.5.20",
 
   "applications": {
     "gecko": {
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index be84fff2b..1c3bf7cbb 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -121,8 +121,9 @@ class Controller {
           console.log("get exchange info rejected");
           if (e.hasOwnProperty("httpStatus")) {
             this.statusString = `request failed with status ${this.request.status}`;
-          } else {
-            this.statusString = `unknown request error`;
+          } else if (e.hasOwnProperty("errorResponse")) {
+            let resp = e.errorResponse;
+            this.statusString = `error: ${resp.error} (${resp.hint})`;
           }
           m.endComputation();
         });
-- 
cgit v1.2.3


From c5a8773b175e29ec5b7da003596488180ec52a7d Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Mon, 25 Apr 2016 16:24:00 +0200
Subject: selenium skeleton and README

---
 selenium/README         |  7 +++++++
 selenium/wallet-test.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 selenium/README
 create mode 100644 selenium/wallet-test.py

diff --git a/selenium/README b/selenium/README
new file mode 100644
index 000000000..de99e6610
--- /dev/null
+++ b/selenium/README
@@ -0,0 +1,7 @@
+Directory containing testscases for testing the wallet with Selenium ChromeDriver.
+
+[1] Contains the ChromeDriver Pythonic documentation
+[2] Tells which fields (and which values) the 'loggingPrefs' capability expects
+
+[1] http://seleniumhq.github.io/selenium/docs/api/py/index.html
+[2] https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#loggingpreferences-json-object
diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
new file mode 100644
index 000000000..0725539a1
--- /dev/null
+++ b/selenium/wallet-test.py
@@ -0,0 +1,32 @@
+from selenium import webdriver
+import time
+
+co = webdriver.ChromeOptions()
+co.add_argument("load-extension=/home/marcello/Taler/wallet-webex")
+cap = webdriver.DesiredCapabilities.CHROME.copy()
+cap['loggingPrefs'] = {'driver': 'INFO', 'browser': 'INFO'}
+client = webdriver.Chrome(chrome_options=co, desired_capabilities=cap)
+client.get('https://taler.net')
+listener = """\
+    document.addEventListener('taler-id', function(evt){
+      window['extId'] = evt.detail.id;    
+    }); 
+    evt = new CustomEvent('taler-query-id');
+    document.dispatchEvent(evt);
+    """
+client.execute_script(listener)
+poll = """\
+    if(window.extId)
+      return window.extId;
+    else return false;
+    """
+# TODO intelligent poller needed
+time.sleep(1)
+ext_id = client.execute_script(poll)
+
+labels = ['balance']
+for l in labels:
+    client.get('chrome-extensio://' + ext_id + '/popup/popup.html#/' + l)
+for log_type in ['browser']:
+    for log in client.get_log(log_type):
+        print(log['level'] + ': ' + log['message'])
-- 
cgit v1.2.3


From 3777d850ebfb730fc309813c3effff08bda69910 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Mon, 25 Apr 2016 17:58:01 +0200
Subject: injecting bank registration script

---
 selenium/wallet-test.py | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
index 0725539a1..718fb5ccf 100644
--- a/selenium/wallet-test.py
+++ b/selenium/wallet-test.py
@@ -11,7 +11,7 @@ listener = """\
     document.addEventListener('taler-id', function(evt){
       window['extId'] = evt.detail.id;    
     }); 
-    evt = new CustomEvent('taler-query-id');
+    var evt = new CustomEvent('taler-query-id');
     document.dispatchEvent(evt);
     """
 client.execute_script(listener)
@@ -24,9 +24,33 @@ poll = """\
 time.sleep(1)
 ext_id = client.execute_script(poll)
 
+# if client has error from its activity, ptints it and returns True
+def is_error(client):
+    for log_type in ['browser']:
+        for log in client.get_log(log_type):
+            if log['level'] is 'error':
+                print(log['level'] + ': ' + log['message'])
+                return True
+
+
 labels = ['balance']
+# labels = ['balance', 'history', 'debug']
 for l in labels:
-    client.get('chrome-extensio://' + ext_id + '/popup/popup.html#/' + l)
-for log_type in ['browser']:
-    for log in client.get_log(log_type):
-        print(log['level'] + ': ' + log['message'])
+    client.get('chrome-extension://' + ext_id + '/popup/popup.html#/' + l)
+
+# TODO assert here
+is_error(client)
+
+# visit bank and trigger withdrawal
+client.get('https://bank.test.taler.net')
+client.get('https://bank.test.taler.net/accounts/register')
+
+register = """\
+    var form = document.getElementsByTagName('form');
+    form.username.value = 'test';
+    form.password.value = 'test';
+    form.submit();
+    """
+
+# TODO assert here
+client.execute_script(register)
-- 
cgit v1.2.3


From 67b37dd31ebb2ffa53c5ea169fb7c711e56785e3 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 26 Apr 2016 10:29:05 +0200
Subject: putting tests inside "unittest" classes

---
 selenium/wallet-test.py | 112 ++++++++++++++++++++++++++++++------------------
 1 file changed, 71 insertions(+), 41 deletions(-)

diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
index 718fb5ccf..6027d8e1d 100644
--- a/selenium/wallet-test.py
+++ b/selenium/wallet-test.py
@@ -1,31 +1,36 @@
 from selenium import webdriver
 import time
+import unittest
+
+
+def client_setup():
+    """Return a Chrome browser the extension's id"""
+    co = webdriver.ChromeOptions()
+    co.add_argument("load-extension=/home/marcello/wallet-webex")
+    cap = webdriver.DesiredCapabilities.CHROME.copy()
+    cap['loggingPrefs'] = {'driver': 'INFO', 'browser': 'INFO'}
+    client = webdriver.Chrome(chrome_options=co, desired_capabilities=cap)
+    client.get('https://taler.net')
+    listener = """\
+        document.addEventListener('taler-id', function(evt){
+          window['extId'] = evt.detail.id;    
+        }); 
+        var evt = new CustomEvent('taler-query-id');
+        document.dispatchEvent(evt);
+        """
+    client.execute_script(listener)
+    poll = """\
+        if(window.extId)
+          return window.extId;
+        else return false;
+        """
+    # Todo: put some delay in polling
+    ext_id = client.execute_script(poll)
+    return {'client': client, 'ext_id': ext_id}
+
 
-co = webdriver.ChromeOptions()
-co.add_argument("load-extension=/home/marcello/Taler/wallet-webex")
-cap = webdriver.DesiredCapabilities.CHROME.copy()
-cap['loggingPrefs'] = {'driver': 'INFO', 'browser': 'INFO'}
-client = webdriver.Chrome(chrome_options=co, desired_capabilities=cap)
-client.get('https://taler.net')
-listener = """\
-    document.addEventListener('taler-id', function(evt){
-      window['extId'] = evt.detail.id;    
-    }); 
-    var evt = new CustomEvent('taler-query-id');
-    document.dispatchEvent(evt);
-    """
-client.execute_script(listener)
-poll = """\
-    if(window.extId)
-      return window.extId;
-    else return false;
-    """
-# TODO intelligent poller needed
-time.sleep(1)
-ext_id = client.execute_script(poll)
-
-# if client has error from its activity, ptints it and returns True
 def is_error(client):
+    """In case of errors in the browser, print them and return True"""
     for log_type in ['browser']:
         for log in client.get_log(log_type):
             if log['level'] is 'error':
@@ -33,24 +38,49 @@ def is_error(client):
                 return True
 
 
-labels = ['balance']
-# labels = ['balance', 'history', 'debug']
-for l in labels:
-    client.get('chrome-extension://' + ext_id + '/popup/popup.html#/' + l)
 
-# TODO assert here
-is_error(client)
+class PopupTestCase(unittest.TestCase):
+    """Test wallet's popups"""
+    def setUp(self):
+        ret = client_setup()
+        self.client = ret['client']
+        self.ext_id = ret['ext_id']
+
+    def tearDown(self):
+        self.client.close()
+
+    def test_popup(self):
+        # keeping only 'balance' to get tests faster. To be
+        # extended with 'history' and 'debug'
+        labels = ['balance']
+        for l in labels:
+            self.client.get('chrome-extension://' + self.ext_id + '/popup/popup.html#/' + l)
+        self.assertNotEqual(True, is_error(self.client))
+
+class BankTestCase(unittest.TestCase):
+    """Test withdrawal (after registering a new user)"""
+    def setUp(self):
+        ret = client_setup()
+        self.client = ret['client']
+        self.ext_id = ret['ext_id']
+
+    def tearDown(self):
+        self.client.close()
+    
+
+    def test_withdrawal(self):
+        bank_url = 'http://127.0.0.1:9898'
+        self.client.get(bank_url + '/accounts/register')
 
-# visit bank and trigger withdrawal
-client.get('https://bank.test.taler.net')
-client.get('https://bank.test.taler.net/accounts/register')
+        register = """\
+            var form = document.getElementsByTagName('form')[0];
+            form.username.value = '%s';
+            form.password.value = 'test';
+            form.submit();
+            """ % str(int(time.time())) # need fresh username
 
-register = """\
-    var form = document.getElementsByTagName('form');
-    form.username.value = 'test';
-    form.password.value = 'test';
-    form.submit();
-    """
+        self.client.execute_script(register)
+        self.assertNotEqual(True, is_error(self.client))
 
-# TODO assert here
-client.execute_script(register)
+if __name__ == '__main__':
+    unittest.main()
-- 
cgit v1.2.3


From 1f70c33d25450b08a7d135fdd50e068b81fa616b Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 26 Apr 2016 15:46:08 +0200
Subject: using webdriver-provided wait facility

---
 selenium/wallet-test.py | 81 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 28 deletions(-)

diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
index 6027d8e1d..4ee396073 100644
--- a/selenium/wallet-test.py
+++ b/selenium/wallet-test.py
@@ -1,8 +1,15 @@
 from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
 import time
+import logging
 import unittest
+import json
 
 
+logger = logging.getLogger(__name__)
+
 def client_setup():
     """Return a Chrome browser the extension's id"""
     co = webdriver.ChromeOptions()
@@ -13,20 +20,17 @@ def client_setup():
     client.get('https://taler.net')
     listener = """\
         document.addEventListener('taler-id', function(evt){
-          window['extId'] = evt.detail.id;    
+          var html = document.getElementsByTagName('html')[0];
+          html.setAttribute('data-taler-wallet-id', evt.detail.id);
         }); 
+
         var evt = new CustomEvent('taler-query-id');
         document.dispatchEvent(evt);
         """
     client.execute_script(listener)
-    poll = """\
-        if(window.extId)
-          return window.extId;
-        else return false;
-        """
-    # Todo: put some delay in polling
-    ext_id = client.execute_script(poll)
-    return {'client': client, 'ext_id': ext_id}
+    client.implicitly_wait(5)
+    html = client.find_element(By.TAG_NAME, "html")
+    return {'client': client, 'ext_id': html.get_attribute('data-taler-wallet-id')}
 
 
 def is_error(client):
@@ -38,24 +42,23 @@ def is_error(client):
                 return True
 
 
-
-class PopupTestCase(unittest.TestCase):
-    """Test wallet's popups"""
-    def setUp(self):
-        ret = client_setup()
-        self.client = ret['client']
-        self.ext_id = ret['ext_id']
-
-    def tearDown(self):
-        self.client.close()
-
-    def test_popup(self):
-        # keeping only 'balance' to get tests faster. To be
-        # extended with 'history' and 'debug'
-        labels = ['balance']
-        for l in labels:
-            self.client.get('chrome-extension://' + self.ext_id + '/popup/popup.html#/' + l)
-        self.assertNotEqual(True, is_error(self.client))
+# class PopupTestCase(unittest.TestCase):
+#     """Test wallet's popups"""
+#     def setUp(self):
+#         ret = client_setup()
+#         self.client = ret['client']
+#         self.ext_id = ret['ext_id']
+# 
+#     def tearDown(self):
+#         self.client.close()
+# 
+#     def test_popup(self):
+#         # keeping only 'balance' to get tests faster. To be
+#         # extended with 'history' and 'debug'
+#         labels = ['balance']
+#         for l in labels:
+#             self.client.get('chrome-extension://' + self.ext_id + '/popup/popup.html#/' + l)
+#         self.assertNotEqual(True, is_error(self.client))
 
 class BankTestCase(unittest.TestCase):
     """Test withdrawal (after registering a new user)"""
@@ -65,7 +68,8 @@ class BankTestCase(unittest.TestCase):
         self.ext_id = ret['ext_id']
 
     def tearDown(self):
-        self.client.close()
+        pass
+        # self.client.close()
     
 
     def test_withdrawal(self):
@@ -82,5 +86,26 @@ class BankTestCase(unittest.TestCase):
         self.client.execute_script(register)
         self.assertNotEqual(True, is_error(self.client))
 
+        button = self.client.execute_script("return document.getElementById('select-exchange')")
+        button.click()
+        # Note: this further 'get()' seems needed to get the in-wallet page
+        location = self.client.execute_script("return document.location.href")
+        self.client.get(location)
+        # wallet needs time to check the exchange: thus wait until button is clickable
+        wait = WebDriverWait(self.client, 10)
+        button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
+        button.click()
+        # check if captcha is in gotten page
+        # Note, a wait for getting the inputElem below could be needed
+        inputElem = self.client.find_element(By.XPATH, "//input[@name='pin_0']")
+        self.assertNotEqual(None, inputElem)
+        # get the question
+        question = self.client.find_element(By.XPATH, "//span[@class='captcha-question']/div")
+        questionTok = question.text.split()
+        op1 = int(questionTok[2])
+        op2 = int(questionTok[4])
+        res = {'+': op1 + op2, '-': op1 - op2, u'\u00d7': op1 * op2}
+        inputElem.send_keys(res[questionTok[3]])
+
 if __name__ == '__main__':
     unittest.main()
-- 
cgit v1.2.3


From ba0ef6b6e8a51ba10ceaba02835bd46004110ccf Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 26 Apr 2016 17:24:10 +0200
Subject: still on native delayers

---
 selenium/wallet-test.py | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
index 4ee396073..9cd05fe1a 100644
--- a/selenium/wallet-test.py
+++ b/selenium/wallet-test.py
@@ -40,6 +40,7 @@ def is_error(client):
             if log['level'] is 'error':
                 print(log['level'] + ': ' + log['message'])
                 return True
+        return False
 
 
 # class PopupTestCase(unittest.TestCase):
@@ -58,7 +59,7 @@ def is_error(client):
 #         labels = ['balance']
 #         for l in labels:
 #             self.client.get('chrome-extension://' + self.ext_id + '/popup/popup.html#/' + l)
-#         self.assertNotEqual(True, is_error(self.client))
+#         self.assertFalse(is_error(self.client))
 
 class BankTestCase(unittest.TestCase):
     """Test withdrawal (after registering a new user)"""
@@ -84,21 +85,22 @@ class BankTestCase(unittest.TestCase):
             """ % str(int(time.time())) # need fresh username
 
         self.client.execute_script(register)
-        self.assertNotEqual(True, is_error(self.client))
-
-        button = self.client.execute_script("return document.getElementById('select-exchange')")
+        self.assertFalse(is_error(self.client))
+        wait = WebDriverWait(self.client, 10)
+        # WARNING, 'button' below *gets* clicked but the an error about ExpiredTimeout
+        # gets thrown and printed on the console
+        button = wait.until(EC.element_to_be_clickable((By.ID, "select-exchange")))
+        # click to confirm the amount to withdraw
         button.click()
-        # Note: this further 'get()' seems needed to get the in-wallet page
+        # Note: this further 'get()' seems needed to get the in-wallet page loaded
         location = self.client.execute_script("return document.location.href")
         self.client.get(location)
-        # wallet needs time to check the exchange: thus wait until button is clickable
-        wait = WebDriverWait(self.client, 10)
         button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
+        # This click returns the captcha page (put wait?)
         button.click()
-        # check if captcha is in gotten page
-        # Note, a wait for getting the inputElem below could be needed
+        # Note: a wait for getting the inputElem below could be needed
         inputElem = self.client.find_element(By.XPATH, "//input[@name='pin_0']")
-        self.assertNotEqual(None, inputElem)
+        self.assertIsNotNone(inputElem)
         # get the question
         question = self.client.find_element(By.XPATH, "//span[@class='captcha-question']/div")
         questionTok = question.text.split()
@@ -106,6 +108,11 @@ class BankTestCase(unittest.TestCase):
         op2 = int(questionTok[4])
         res = {'+': op1 + op2, '-': op1 - op2, u'\u00d7': op1 * op2}
         inputElem.send_keys(res[questionTok[3]])
+        form = self.client.find_element(By.TAG_NAME, "form")
+        form.submit()
+        # check if successful message exists
+        msg_succ = self.client.find_element(By.CLASS_NAME, "informational-ok")
+        self.assertNotNone(msg_succ)
 
 if __name__ == '__main__':
     unittest.main()
-- 
cgit v1.2.3


From 942a6227bae7e32db3f92886a47e00dd7c648067 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Sat, 23 Apr 2016 19:34:30 +0200
Subject: wallet style

---
 pages/confirm-contract.html       | 44 +++++++++++++++++++++++++++--------
 pages/confirm-contract.tsx        |  2 +-
 pages/confirm-create-reserve.html | 48 +++++++++++++++++++++++++++++----------
 pages/confirm-create-reserve.tsx  | 11 +++++----
 4 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html
index 6abb65c67..54d02f316 100644
--- a/pages/confirm-contract.html
+++ b/pages/confirm-contract.html
@@ -5,7 +5,6 @@
   <title>Taler Wallet: Confirm Reserve Creation</title>
 
   <link rel="stylesheet" type="text/css" href="../style/lang.css">
-  <link rel="stylesheet" type="text/css" href="../style/wallet.css">
 
   <script src="../lib/vendor/URI.js"></script>
   <script src="../lib/vendor/mithril.js"></script>
@@ -15,18 +14,45 @@
   <script src="../i18n/strings.js"></script>
   <script src="../lib/i18n.js"></script>
   <script src="../lib/module-trampoline.js"></script>
-</head>
 
-<body>
-  <header>
-    <div id="logo"></div>
-    <h1>Payment Confirmation</h1>
-  </header>
+  <style>
+    #main {
+      border: solid 1px black;
+      border-radius: 10px;
+      margin: auto;
+      max-width: 50%;
+      padding: 2em;
+    }
+
+    button.accept {
+      background-color: #5757D2;
+      border: 1px solid black;
+      border-radius: 5px;
+      margin: 1em 0;
+      padding: 0.5em;
+      font-weight: bold;
+      color: white;
+    }
+    button.linky {
+      background:none!important;
+      border:none;
+      padding:0!important;
 
-  <aside class="sidebar" id="left">
-  </aside>
+      font-family:arial,sans-serif;
+      color:#069;
+      text-decoration:underline;
+      cursor:pointer;
+    }
 
+    input.url {
+      width: 25em;
+    }
+  </style>
+</head>
+
+<body>
   <section id="main">
+    <h1>GNU Taler Wallet</h1>
     <article id="contract" class="fade"></article>
   </section>
 </body>
diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx
index 0c7419c6c..9e15841e9 100644
--- a/pages/confirm-contract.tsx
+++ b/pages/confirm-contract.tsx
@@ -87,7 +87,7 @@ export function main() {
           _.map(contract.products,
                 (p: any) => m("li",
                               `${p.description}: ${prettyAmount(p.price)}`))),
-        m("button.confirm-pay", {onclick: doPayment}, i18n`Confirm Payment`),
+        m("button.accept", {onclick: doPayment}, i18n`Confirm Payment`),
         m("p", error ? error : []),
         m(Details, contract)
       ];
diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html
index ab0a7c954..da87faf7f 100644
--- a/pages/confirm-create-reserve.html
+++ b/pages/confirm-create-reserve.html
@@ -4,8 +4,6 @@
 <head>
   <title>Taler Wallet: Select Taler Provider</title>
 
-  <link rel="stylesheet" type="text/css" href="../style/wallet.css">
-
   <script src="../lib/vendor/URI.js"></script>
   <script src="../lib/vendor/mithril.js"></script>
   <script src="../lib/vendor/system-csp-production.src.js"></script>
@@ -13,21 +11,47 @@
   <script src="../i18n/strings.js"></script>
   <script src="../lib/i18n.js"></script>
   <script src="../lib/module-trampoline.js"></script>
-</head>
 
-<body>
-  <header>
-    <div id="logo"></div>
-    <h1>Select Taler Provider</h1>
-  </header>
+  <style>
+    #main {
+      border: solid 1px black;
+      border-radius: 10px;
+      margin: auto;
+      max-width: 50%;
+      padding: 2em;
+    }
+
+    button.accept {
+      background-color: #5757D2;
+      border: 1px solid black;
+      border-radius: 5px;
+      margin: 1em 0;
+      padding: 0.5em;
+      font-weight: bold;
+      color: white;
+    }
+    button.linky {
+      background:none!important;
+      border:none;
+      padding:0!important;
 
-  <aside class="sidebar" id="left">
-  </aside>
+      font-family:arial,sans-serif;
+      color:#069;
+      text-decoration:underline;
+      cursor:pointer;
+    }
 
+    input.url {
+      width: 25em;
+    }
+
+  </style>
+</head>
+
+<body>
   <section id="main">
-    <article>
+    <h1>GNU Taler Wallet</h1>
       <div class="fade" id="exchange-selection"></div>
-    </article>
   </section>
 </body>
 
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index 1c3bf7cbb..4b4e19363 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -194,8 +194,9 @@ function view(ctrl: Controller) {
   let mx = (x, ...args) => controls.push(m(x, ...args));
 
   mx("p",
-     i18n`The bank wants to create a reserve over ${amountToPretty(
-       ctrl.amount)}.`);
+     i18n.parts`You are about to withdraw ${m("strong", amountToPretty(
+       ctrl.amount))} from your bank account into your wallet.`);
+
   mx("input",
      {
        className: "url",
@@ -205,14 +206,16 @@ function view(ctrl: Controller) {
        oninput: m.withAttr("value", ctrl.onUrlChanged.bind(ctrl)),
      });
 
-  mx("button", {
+  mx("br");
+
+  mx("button.accept", {
        onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo,
                                           ctrl.url(),
                                           ctrl.amount,
                                           ctrl.callbackUrl),
        disabled: !ctrl.isValidExchange
      },
-     "Confirm exchange selection");
+     "Accept fees and withdraw");
 
   if (ctrl.statusString) {
     mx("p", ctrl.statusString);
-- 
cgit v1.2.3


From 0a1b775b480f417bc1250c68094f99d603f42794 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 01:46:18 +0200
Subject: version

---
 manifest.json | 2 +-
 tsconfig.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 215f9dcba..f5e2c14a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "description": "Privacy preserving and transparent payments",
   "manifest_version": 2,
   "name": "GNU Taler Wallet (git)",
-  "version": "0.5.20",
+  "version": "0.5.21",
 
   "applications": {
     "gecko": {
diff --git a/tsconfig.json b/tsconfig.json
index 0ce2125c5..0e6337d86 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -33,4 +33,4 @@
     "pages/confirm-create-reserve.tsx",
     "test/tests/taler.ts"
   ]
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 5825e7b476eb4df8590c9f0646109b2fb64ab6a3 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 04:10:26 +0200
Subject: fix #4474

---
 content_scripts/notify.ts | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/content_scripts/notify.ts b/content_scripts/notify.ts
index 06ea2e92e..8e70b44c4 100644
--- a/content_scripts/notify.ts
+++ b/content_scripts/notify.ts
@@ -33,10 +33,6 @@ namespace TalerNotify {
 
   console.log("Taler injected", chrome.runtime.id);
 
-  // FIXME: only do this for test wallets?
-  // This is no security risk, since the extension ID for published
-  // extension is publicly known.
-
   function subst(url: string, H_contract) {
     url = url.replace("${H_contract}", H_contract);
     url = url.replace("${$}", "$");
@@ -45,17 +41,28 @@ namespace TalerNotify {
 
   const handlers = [];
 
-  // Hack to know when the extension is unloaded
-  let port = chrome.runtime.connect();
-
-  port.onDisconnect.addListener(() => {
-    console.log("chrome runtime disconnected, removing handlers");
-    for (let handler of handlers) {
-      document.removeEventListener(handler.type, handler.listener);
-    }
-  });
+  function init() {
+    chrome.runtime.sendMessage({type: "ping"}, () => {
+      if (chrome.runtime.lastError) {
+        console.log("extension not yet ready");
+        window.setTimeout(init, 200);
+        return;
+      }
+      console.log("got pong");
+      registerHandlers();
+      // Hack to know when the extension is unloaded
+      let port = chrome.runtime.connect();
+
+      port.onDisconnect.addListener(() => {
+        console.log("chrome runtime disconnected, removing handlers");
+        for (let handler of handlers) {
+          document.removeEventListener(handler.type, handler.listener);
+        }
+      });
+    });
+  }
 
-  registerHandlers();
+  init();
 
   function registerHandlers() {
     const $ = (x) => document.getElementById(x);
-- 
cgit v1.2.3


From b8ac91dbf9a89c7dad0a255154cf1b025c85648a Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 04:47:33 +0200
Subject: version bump

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index f5e2c14a7..9a4d1cdf5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "description": "Privacy preserving and transparent payments",
   "manifest_version": 2,
   "name": "GNU Taler Wallet (git)",
-  "version": "0.5.21",
+  "version": "0.5.22",
 
   "applications": {
     "gecko": {
-- 
cgit v1.2.3


From d0a4f9f934cea5bbb3da90ea13ccf91d9fb1c933 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 06:03:04 +0200
Subject: UI fixes

---
 lib/wallet/wallet.ts              | 22 ++++++++++++++++++++++
 lib/wallet/wxMessaging.ts         | 18 ++++++++++++++++++
 pages/confirm-contract.html       | 20 ++++++++++++++++++++
 pages/confirm-contract.tsx        | 30 ++++++++++++++++++++++++++++--
 pages/confirm-create-reserve.html | 11 +++++++++++
 pages/confirm-create-reserve.tsx  | 18 +++++++++++++++---
 6 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts
index dde7a8248..3c9f3ffed 100644
--- a/lib/wallet/wallet.ts
+++ b/lib/wallet/wallet.ts
@@ -521,6 +521,28 @@ export class Wallet {
   }
 
 
+  /**
+   * Add a contract to the wallet and sign coins,
+   * but do not send them yet.
+   */
+  checkPay(offer: Offer): Promise<any> {
+    console.log("executing checkPay");
+    return Promise.resolve().then(() => {
+      return this.getPossibleExchangeCoins(offer.contract.amount,
+                                           offer.contract.max_fee,
+                                           offer.contract.exchanges)
+    }).then((mcs) => {
+      if (Object.keys(mcs).length == 0) {
+        console.log("not confirming payment, insufficient coins");
+        return {
+          error: "coins-insufficient",
+        };
+      }
+      return {};
+    });
+  }
+
+
   /**
    * Retrieve all necessary information for looking up the contract
    * with the given hash.
diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts
index 64b16de8d..164342f4e 100644
--- a/lib/wallet/wxMessaging.ts
+++ b/lib/wallet/wxMessaging.ts
@@ -99,6 +99,24 @@ function makeHandlers(db: IDBDatabase,
 
       return wallet.confirmPay(offer);
     },
+    ["check-pay"]: function(detail, sender) {
+      let offer;
+      try {
+        offer = Offer.checked(detail.offer);
+      } catch (e) {
+        if (e instanceof Checkable.SchemaError) {
+          console.error("schema error:", e.message);
+          return Promise.resolve({
+                                   error: "invalid contract",
+                                   hint: e.message,
+                                   detail: detail
+                                 });
+        } else {
+          throw e;
+        }
+      }
+      return wallet.checkPay(offer);
+    },
     ["execute-payment"]: function(detail, sender) {
       return wallet.executePayment(detail.H_contract);
     },
diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html
index 54d02f316..ec7eab8c1 100644
--- a/pages/confirm-contract.html
+++ b/pages/confirm-contract.html
@@ -47,6 +47,26 @@
     input.url {
       width: 25em;
     }
+
+
+    button.accept:disabled {
+      background-color: #dedbe8;
+      border: 1px solid white;
+      border-radius: 5px;
+      margin: 1em 0;
+      padding: 0.5em;
+      font-weight: bold;
+      color: #2C2C2C;
+    }
+
+    .errorbox {
+      border: 1px solid;
+      display: inline-block;
+      margin: 1em;
+      padding: 1em;
+      font-weight: bold;
+      background: #FF8A8A;
+    }
   </style>
 </head>
 
diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx
index 9e15841e9..2e055d4f1 100644
--- a/pages/confirm-contract.tsx
+++ b/pages/confirm-contract.tsx
@@ -72,6 +72,7 @@ export function main() {
   console.dir(offer);
   let contract = offer.contract;
   let error = null;
+  let payDisabled = true;
 
   var Contract = {
     view(ctrl) {
@@ -87,8 +88,8 @@ export function main() {
           _.map(contract.products,
                 (p: any) => m("li",
                               `${p.description}: ${prettyAmount(p.price)}`))),
-        m("button.accept", {onclick: doPayment}, i18n`Confirm Payment`),
-        m("p", error ? error : []),
+        m("button.accept", {onclick: doPayment, disabled: payDisabled}, i18n`Confirm Payment`),
+        (error ? m("p.errorbox", error) : []),
         m(Details, contract)
       ];
     }
@@ -96,6 +97,31 @@ export function main() {
 
   m.mount(document.getElementById("contract"), Contract);
 
+  function checkPayment() {
+    chrome.runtime.sendMessage({type: 'check-pay', detail: {offer}}, (resp) => {
+      if (resp.error) {
+        console.log("check-pay error", JSON.stringify(resp));
+        switch (resp.error) {
+          case "coins-insufficient":
+            error = "You do not have enough coins of the requested currency.";
+            break;
+          default:
+            error = `Error: ${resp.error}`;
+            break;
+        }
+        payDisabled = true;
+      } else {
+        payDisabled = false;
+        error = null;
+      }
+      m.redraw();
+      window.setTimeout(checkPayment, 300);
+    });
+  }
+
+  checkPayment();
+
+
   function doPayment() {
     let d = {offer};
     chrome.runtime.sendMessage({type: 'confirm-pay', detail: d}, (resp) => {
diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html
index da87faf7f..32a29b9f7 100644
--- a/pages/confirm-create-reserve.html
+++ b/pages/confirm-create-reserve.html
@@ -45,6 +45,17 @@
       width: 25em;
     }
 
+    table {
+      border-collapse: collapse;
+    }
+
+    td {
+      border-left: 1px solid black;
+      border-right: 1px solid black;
+      text-align: center;
+      padding: 0.3em;
+    }
+
   </style>
 </head>
 
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index 4b4e19363..2c959429f 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -250,9 +250,21 @@ function view(ctrl: Controller) {
 function renderReserveCreationDetails(rci: ReserveCreationInfo) {
   let denoms = rci.selectedDenoms;
 
+  let countByPub = {};
+  let uniq = [];
+
+  denoms.forEach((x: Denomination) => {
+    let c = countByPub[x.denom_pub] || 0;
+    if (c == 0) {
+      uniq.push(x);
+    }
+    c += 1;
+    countByPub[x.denom_pub] = c;
+  });
+
   function row(denom: Denomination) {
     return m("tr", [
-      m("td", denom.pub_hash.substr(0, 5) + "..."),
+      m("td", countByPub[denom.denom_pub] + "x"),
       m("td", amountToPretty(denom.value)),
       m("td", amountToPretty(denom.fee_withdraw)),
       m("td", amountToPretty(denom.fee_refresh)),
@@ -267,13 +279,13 @@ function renderReserveCreationDetails(rci: ReserveCreationInfo) {
     m("p", `Overhead: ${overheadStr}`),
     m("table", [
       m("tr", [
-        m("th", "Key Hash"),
+        m("th", "Count"),
         m("th", "Value"),
         m("th", "Withdraw Fee"),
         m("th", "Refresh Fee"),
         m("th", "Deposit Fee"),
       ]),
-      denoms.map(row)
+      uniq.map(row)
     ])
   ];
 }
-- 
cgit v1.2.3


From 2321614c48f91bc8a95b122c7aca33bd4fb307c1 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 06:50:38 +0200
Subject: simple view

---
 pages/confirm-create-reserve.html |   5 ++
 pages/confirm-create-reserve.tsx  | 104 ++++++++++++++++++++++++++++++--------
 2 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html
index 32a29b9f7..1612340e8 100644
--- a/pages/confirm-create-reserve.html
+++ b/pages/confirm-create-reserve.html
@@ -56,6 +56,11 @@
       padding: 0.3em;
     }
 
+    span.spacer {
+      padding-left: 0.5em;
+      padding-right: 0.5em;
+    }
+
   </style>
 </head>
 
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index 2c959429f..f490451ca 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -76,31 +76,38 @@ class Controller {
   callbackUrl: string;
   wtTypes: string[];
   detailCollapsed = m.prop<boolean>(true);
+  suggestedExchangeUrl: string;
+  complexViewRequested = false;
+  urlOkay = false;
 
-  constructor(initialExchangeUrl: string,
+  constructor(suggestedExchangeUrl: string,
               amount: AmountJson,
               callbackUrl: string,
               wt_types: string[]) {
     console.log("creating main controller");
+    this.suggestedExchangeUrl = suggestedExchangeUrl;
     this.amount = amount;
     this.callbackUrl = callbackUrl;
     this.wtTypes = wt_types;
     this.timer = new DelayTimer(800, () => this.update());
-    this.url(initialExchangeUrl);
+    this.url(suggestedExchangeUrl);
     this.update();
   }
 
   private update() {
     this.timer.stop();
     const doUpdate = () => {
+      this.reserveCreationInfo = null;
       if (!this.url()) {
-        this.statusString = i18n`Please enter a URL`;
+        this.statusString = i18n`Error: URL is empty`;
+        m.redraw(true);
         return;
       }
       this.statusString = null;
       let parsedUrl = URI(this.url());
       if (parsedUrl.is("relative")) {
-        this.statusString = i18n`The URL you've entered is not valid (must be absolute)`;
+        this.statusString = i18n`Error: URL may not be relative`;
+        m.redraw(true);
         return;
       }
 
@@ -114,16 +121,15 @@ class Controller {
           this.isValidExchange = true;
           this.reserveCreationInfo = r;
           console.dir(r);
-          this.statusString = "The exchange base URL is valid!";
           m.endComputation();
         })
         .catch((e) => {
           console.log("get exchange info rejected");
           if (e.hasOwnProperty("httpStatus")) {
-            this.statusString = `request failed with status ${this.request.status}`;
+            this.statusString = `Error: request failed with status ${this.request.status}`;
           } else if (e.hasOwnProperty("errorResponse")) {
             let resp = e.errorResponse;
-            this.statusString = `error: ${resp.error} (${resp.hint})`;
+            this.statusString = `Error: ${resp.error} (${resp.hint})`;
           }
           m.endComputation();
         });
@@ -131,7 +137,7 @@ class Controller {
 
     doUpdate();
 
-    console.log("got update");
+    console.log("got update", this.url());
   }
 
   reset() {
@@ -188,8 +194,7 @@ class Controller {
   }
 }
 
-
-function view(ctrl: Controller) {
+function view(ctrl: Controller): any {
   let controls = [];
   let mx = (x, ...args) => controls.push(m(x, ...args));
 
@@ -197,16 +202,55 @@ function view(ctrl: Controller) {
      i18n.parts`You are about to withdraw ${m("strong", amountToPretty(
        ctrl.amount))} from your bank account into your wallet.`);
 
-  mx("input",
-     {
-       className: "url",
-       type: "text",
-       spellcheck: false,
-       value: ctrl.url(),
-       oninput: m.withAttr("value", ctrl.onUrlChanged.bind(ctrl)),
-     });
+  if (ctrl.complexViewRequested || !ctrl.suggestedExchangeUrl) {
+    return controls.concat(viewComplex(ctrl));
+  }
 
-  mx("br");
+  return controls.concat(viewSimple(ctrl));
+}
+
+function viewSimple(ctrl: Controller) {
+  let controls = [];
+  let mx = (x, ...args) => controls.push(m(x, ...args));
+
+  if (ctrl.statusString) {
+    mx("p", "Error: ", ctrl.statusString);
+    mx("button.linky", {
+      onclick: () => {
+        ctrl.complexViewRequested = true;
+      }
+    }, "advanced options");
+  }
+  else if (ctrl.reserveCreationInfo) {
+    mx("button.accept", {
+         onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo,
+                                            ctrl.url(),
+                                            ctrl.amount,
+                                            ctrl.callbackUrl),
+         disabled: !ctrl.isValidExchange
+       },
+       "Accept fees and withdraw");
+    mx("span.spacer");
+    mx("button.linky", {
+      onclick: () => {
+        ctrl.complexViewRequested = true;
+      }
+    }, "advanced options");
+    let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
+                                ctrl.reserveCreationInfo.withdrawFee).amount;
+    mx("p", `Withdraw cost: ${amountToPretty(totalCost)}`);
+  } else {
+    mx("p", "Please wait ...");
+  }
+
+
+  return controls;
+}
+
+
+function viewComplex(ctrl: Controller) {
+  let controls = [];
+  let mx = (x, ...args) => controls.push(m(x, ...args));
 
   mx("button.accept", {
        onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo,
@@ -216,10 +260,30 @@ function view(ctrl: Controller) {
        disabled: !ctrl.isValidExchange
      },
      "Accept fees and withdraw");
+  mx("span.spacer");
+  mx("button.linky", {
+    onclick: () => {
+      ctrl.complexViewRequested = false;
+    }
+  }, "back to simple view");
+
+  mx("br");
+
+
+  mx("input",
+     {
+       className: "url",
+       type: "text",
+       spellcheck: false,
+       value: ctrl.url(),
+       oninput: m.withAttr("value", ctrl.onUrlChanged.bind(ctrl)),
+     });
+
+  mx("br");
 
   if (ctrl.statusString) {
     mx("p", ctrl.statusString);
-  } else {
+  } else if (!ctrl.reserveCreationInfo) {
     mx("p", "Checking URL, please wait ...");
   }
 
-- 
cgit v1.2.3


From 8beee058efa6a745a981bf6bbe4c12f39559a538 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 06:52:01 +0200
Subject: bump version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 9a4d1cdf5..5ede435e9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "description": "Privacy preserving and transparent payments",
   "manifest_version": 2,
   "name": "GNU Taler Wallet (git)",
-  "version": "0.5.22",
+  "version": "0.5.23",
 
   "applications": {
     "gecko": {
-- 
cgit v1.2.3


From 90c67fc7178ad2219d37ae36d0a0b7c842de75fe Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Wed, 27 Apr 2016 10:47:01 +0200
Subject: selenium withdrawal minor fixes

---
 selenium/wallet-test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
index 9cd05fe1a..1e4410c11 100644
--- a/selenium/wallet-test.py
+++ b/selenium/wallet-test.py
@@ -76,7 +76,7 @@ class BankTestCase(unittest.TestCase):
     def test_withdrawal(self):
         bank_url = 'http://127.0.0.1:9898'
         self.client.get(bank_url + '/accounts/register')
-
+        self.client.find_element(By.TAG_NAME, "form")
         register = """\
             var form = document.getElementsByTagName('form')[0];
             form.username.value = '%s';
@@ -87,14 +87,14 @@ class BankTestCase(unittest.TestCase):
         self.client.execute_script(register)
         self.assertFalse(is_error(self.client))
         wait = WebDriverWait(self.client, 10)
-        # WARNING, 'button' below *gets* clicked but the an error about ExpiredTimeout
-        # gets thrown and printed on the console
+        button = self.client.find_element(By.ID, "select-exchange")
         button = wait.until(EC.element_to_be_clickable((By.ID, "select-exchange")))
         # click to confirm the amount to withdraw
         button.click()
         # Note: this further 'get()' seems needed to get the in-wallet page loaded
         location = self.client.execute_script("return document.location.href")
         self.client.get(location)
+        # Confirm xchg
         button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
         # This click returns the captcha page (put wait?)
         button.click()
-- 
cgit v1.2.3


From 320eac1675fd3c4b2de4d5dd404ecc413b9ea505 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Wed, 27 Apr 2016 13:54:35 +0200
Subject: selenium test not in unittest

---
 selenium/test.py        | 100 ++++++++++++++++++++++++++++++++++++++++
 selenium/wallet-test.py | 118 ------------------------------------------------
 2 files changed, 100 insertions(+), 118 deletions(-)
 create mode 100644 selenium/test.py
 delete mode 100644 selenium/wallet-test.py

diff --git a/selenium/test.py b/selenium/test.py
new file mode 100644
index 000000000..8720c79d7
--- /dev/null
+++ b/selenium/test.py
@@ -0,0 +1,100 @@
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+import time
+import logging
+
+logger = logging.getLogger(__name__)
+bank_url = 'http://127.0.0.1:9898'
+
+def client_setup():
+    """Return a dict containing the driver and the extension's id"""
+    co = webdriver.ChromeOptions()
+    co.add_argument("load-extension=/home/marcello/wallet-webex")
+    cap = webdriver.DesiredCapabilities.CHROME.copy()
+    cap['loggingPrefs'] = {'driver': 'INFO', 'browser': 'INFO'}
+    client = webdriver.Chrome(chrome_options=co, desired_capabilities=cap)
+    client.get('https://taler.net')
+    listener = """\
+        document.addEventListener('taler-id', function(evt){
+          var html = document.getElementsByTagName('html')[0];
+          html.setAttribute('data-taler-wallet-id', evt.detail.id);
+        }); 
+
+        var evt = new CustomEvent('taler-query-id');
+        document.dispatchEvent(evt);
+        """
+    client.execute_script(listener)
+    client.implicitly_wait(5)
+    html = client.find_element(By.TAG_NAME, "html")
+    return {'client': client, 'ext_id': html.get_attribute('data-taler-wallet-id')}
+
+
+def is_error(client):
+    """Return True in case of errors in the browser, False otherwise"""
+    for log_type in ['browser']:
+        for log in client.get_log(log_type):
+            if log['level'] is 'error':
+                print(log['level'] + ': ' + log['message'])
+                return True
+        return False
+
+
+def register(client):
+    """Register a new user to the bank delaying its execution until the
+    profile page is shown"""
+    client.get(bank_url + '/accounts/register')
+    client.find_element(By.TAG_NAME, "form")
+    register = """\
+        var form = document.getElementsByTagName('form')[0];
+        form.username.value = '%s';
+        form.password.value = 'test';
+        form.submit();
+        """ % str(int(time.time())) # need fresh username
+
+    client.execute_script(register)
+    # need implicit wait to be set up
+    button = client.find_element(By.ID, "select-exchange")
+    # when button is gotten, the browser is in the profile page
+    # so the function can return
+    if not is_error(client):
+        logger.info('correctly registered at bank')
+    else:
+        logger.error('User not registered at bank')
+
+
+def withdraw(client):
+    """Register and withdraw (1) KUDOS for a fresh user"""
+    register(client)
+    # trigger withdrawal button
+    button = client.find_element(By.ID, "select-exchange")
+    button.click()
+    location = client.execute_script("return document.location.href")
+    client.get(location)
+    # Confirm xchg
+    wait = WebDriverWait(client, 10)
+    button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
+    # This click returns the captcha page (put wait?)
+    button.click()
+    answer = client.find_element(By.XPATH, "//input[@name='pin_0']")
+    question = client.find_element(By.XPATH, "//span[@class='captcha-question']/div")
+    questionTok = question.text.split()
+    op1 = int(questionTok[2])
+    op2 = int(questionTok[4])
+    res = {'+': op1 + op2, '-': op1 - op2, u'\u00d7': op1 * op2}
+    answer.send_keys(res[questionTok[3]])
+    form = client.find_element(By.TAG_NAME, "form")
+    form.submit()
+    # check outcome
+    msg_succ = client.find_element(By.CLASS_NAME, "informational-ok")
+    if not msg_succ:
+        logger.error('Error in withdrawing')
+    else: logger.info('Withdrawal successful')
+
+
+
+ret = client_setup()
+client = ret['client']
+withdraw(client)
+client.close()
diff --git a/selenium/wallet-test.py b/selenium/wallet-test.py
deleted file mode 100644
index 1e4410c11..000000000
--- a/selenium/wallet-test.py
+++ /dev/null
@@ -1,118 +0,0 @@
-from selenium import webdriver
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import WebDriverWait
-import time
-import logging
-import unittest
-import json
-
-
-logger = logging.getLogger(__name__)
-
-def client_setup():
-    """Return a Chrome browser the extension's id"""
-    co = webdriver.ChromeOptions()
-    co.add_argument("load-extension=/home/marcello/wallet-webex")
-    cap = webdriver.DesiredCapabilities.CHROME.copy()
-    cap['loggingPrefs'] = {'driver': 'INFO', 'browser': 'INFO'}
-    client = webdriver.Chrome(chrome_options=co, desired_capabilities=cap)
-    client.get('https://taler.net')
-    listener = """\
-        document.addEventListener('taler-id', function(evt){
-          var html = document.getElementsByTagName('html')[0];
-          html.setAttribute('data-taler-wallet-id', evt.detail.id);
-        }); 
-
-        var evt = new CustomEvent('taler-query-id');
-        document.dispatchEvent(evt);
-        """
-    client.execute_script(listener)
-    client.implicitly_wait(5)
-    html = client.find_element(By.TAG_NAME, "html")
-    return {'client': client, 'ext_id': html.get_attribute('data-taler-wallet-id')}
-
-
-def is_error(client):
-    """In case of errors in the browser, print them and return True"""
-    for log_type in ['browser']:
-        for log in client.get_log(log_type):
-            if log['level'] is 'error':
-                print(log['level'] + ': ' + log['message'])
-                return True
-        return False
-
-
-# class PopupTestCase(unittest.TestCase):
-#     """Test wallet's popups"""
-#     def setUp(self):
-#         ret = client_setup()
-#         self.client = ret['client']
-#         self.ext_id = ret['ext_id']
-# 
-#     def tearDown(self):
-#         self.client.close()
-# 
-#     def test_popup(self):
-#         # keeping only 'balance' to get tests faster. To be
-#         # extended with 'history' and 'debug'
-#         labels = ['balance']
-#         for l in labels:
-#             self.client.get('chrome-extension://' + self.ext_id + '/popup/popup.html#/' + l)
-#         self.assertFalse(is_error(self.client))
-
-class BankTestCase(unittest.TestCase):
-    """Test withdrawal (after registering a new user)"""
-    def setUp(self):
-        ret = client_setup()
-        self.client = ret['client']
-        self.ext_id = ret['ext_id']
-
-    def tearDown(self):
-        pass
-        # self.client.close()
-    
-
-    def test_withdrawal(self):
-        bank_url = 'http://127.0.0.1:9898'
-        self.client.get(bank_url + '/accounts/register')
-        self.client.find_element(By.TAG_NAME, "form")
-        register = """\
-            var form = document.getElementsByTagName('form')[0];
-            form.username.value = '%s';
-            form.password.value = 'test';
-            form.submit();
-            """ % str(int(time.time())) # need fresh username
-
-        self.client.execute_script(register)
-        self.assertFalse(is_error(self.client))
-        wait = WebDriverWait(self.client, 10)
-        button = self.client.find_element(By.ID, "select-exchange")
-        button = wait.until(EC.element_to_be_clickable((By.ID, "select-exchange")))
-        # click to confirm the amount to withdraw
-        button.click()
-        # Note: this further 'get()' seems needed to get the in-wallet page loaded
-        location = self.client.execute_script("return document.location.href")
-        self.client.get(location)
-        # Confirm xchg
-        button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
-        # This click returns the captcha page (put wait?)
-        button.click()
-        # Note: a wait for getting the inputElem below could be needed
-        inputElem = self.client.find_element(By.XPATH, "//input[@name='pin_0']")
-        self.assertIsNotNone(inputElem)
-        # get the question
-        question = self.client.find_element(By.XPATH, "//span[@class='captcha-question']/div")
-        questionTok = question.text.split()
-        op1 = int(questionTok[2])
-        op2 = int(questionTok[4])
-        res = {'+': op1 + op2, '-': op1 - op2, u'\u00d7': op1 * op2}
-        inputElem.send_keys(res[questionTok[3]])
-        form = self.client.find_element(By.TAG_NAME, "form")
-        form.submit()
-        # check if successful message exists
-        msg_succ = self.client.find_element(By.CLASS_NAME, "informational-ok")
-        self.assertNotNone(msg_succ)
-
-if __name__ == '__main__':
-    unittest.main()
-- 
cgit v1.2.3


From 07715206e54cab23788e3167e5a77509ffd3e369 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Wed, 27 Apr 2016 14:39:39 +0200
Subject: make donations via selenium

---
 selenium/test.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/selenium/test.py b/selenium/test.py
index 8720c79d7..c0a5de742 100644
--- a/selenium/test.py
+++ b/selenium/test.py
@@ -6,7 +6,8 @@ import time
 import logging
 
 logger = logging.getLogger(__name__)
-bank_url = 'http://127.0.0.1:9898'
+bank = 'http://bank.test.taler.net'
+donations = 'http://shop.test.taler.net'
 
 def client_setup():
     """Return a dict containing the driver and the extension's id"""
@@ -41,10 +42,21 @@ def is_error(client):
         return False
 
 
+def make_donation(client):
+    """Make donation at shop.test.taler.net. Assume the wallet has coins"""
+    client.get(donations)
+    form = client.find_element(By.TAG_NAME, "form")
+    form.submit() # amount and receiver chosen
+    confirm_taler = client.find_element(By.XPATH, "//form//input[@type='button']")
+    confirm_taler.click() # Taler as payment option chosen
+    wait = WebDriverWait(client, 10)
+    confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
+    confirm_pay.click()
+
 def register(client):
     """Register a new user to the bank delaying its execution until the
     profile page is shown"""
-    client.get(bank_url + '/accounts/register')
+    client.get(bank + '/accounts/register')
     client.find_element(By.TAG_NAME, "form")
     register = """\
         var form = document.getElementsByTagName('form')[0];
@@ -93,8 +105,8 @@ def withdraw(client):
     else: logger.info('Withdrawal successful')
 
 
-
 ret = client_setup()
 client = ret['client']
 withdraw(client)
-client.close()
+make_donation(client)
+# client.close()
-- 
cgit v1.2.3


From 004a0372abd42da19690d95b25ede5b0ffe10601 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 15:06:56 +0200
Subject: get test skeleton working again

---
 package.json        |  2 +-
 test/run_tests.js   | 21 ++++-----------------
 test/tests/taler.ts | 15 ++-------------
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index e36b22776..7aaeaff26 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "gulp-zip": "^3.1.0",
     "jed": "^1.1.0",
     "map-stream": "0.0.6",
-    "mocha": "^2.3.4",
+    "mocha": "^2.4.5",
     "po2json": "git+https://github.com/mikeedwards/po2json",
     "systemjs": "^0.19.14",
     "through2": "^2.0.1",
diff --git a/test/run_tests.js b/test/run_tests.js
index f62810f7e..f6a623942 100644
--- a/test/run_tests.js
+++ b/test/run_tests.js
@@ -18,38 +18,25 @@ if ("function" !== typeof run) {
   throw Error("test must be run with 'mocha --delay ...'");
 }
 
-console.log("typeof require (here)", typeof require);
+let emsc = require("../lib/emscripten/libwrapper.js");
 
-// We might need thins in the future ...
-global.nodeRequire = function (modulePath) {
-  return require(modulePath);
-};
-
-global.require = global.nodeRequire;
-
-let data = fs.readFileSync("lib/emscripten/libwrapper.js");
-vm.runInThisContext(data);
-
-// Do it here, since it breaks 'require''
+// Do it here, since it breaks 'require'' for libwrapper
 let System = require("systemjs");
 
 System.config({
   defaultJSExtensions: true
 });
 
-let mod = System.newModule({Module: Module});
+let mod = System.newModule({Module: emsc});
 let modName = System.normalizeSync(__dirname + "/../lib/emscripten/emsc");
 console.log("registering", modName);
 System.set(modName, mod);
 
-
 System.import("./test/tests/taler.js")
   .then((t) => {
     t.declareTests(assert, context, it);
-    run();
+    setTimeout(run, 1);
   })
   .catch((e) => {
     console.error("failed to load module", e.stack);
   });
-
-
diff --git a/test/tests/taler.ts b/test/tests/taler.ts
index 14130f9af..941e8284d 100644
--- a/test/tests/taler.ts
+++ b/test/tests/taler.ts
@@ -5,20 +5,9 @@ declare var HttpMockLib;
 
 export function declareTests(assert, context, it) {
 
-  it("works!", function() {
+  it("calls native emscripten code", function() {
     let x = new Emsc.Amount({value: 42, fraction: 42, currency: "EUR"});
     let j = x.toJson();
     assert("value" in j);
   });
-
-
-  it("retries", function() {
-    let m = new HttpMockLib();
-    /*m.intercept()
-     .matchUrlContains()
-     .counterEquals(0)
-     .count()
-     .sen*/
-  })
-
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 97f3911c93c841f089f705e7edcef6a6bec45f2e Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 27 Apr 2016 15:31:15 +0200
Subject: istanbul instrumentation

---
 package.json      |  5 ++++-
 test/run_tests.js | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 7aaeaff26..f86943a13 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "wxwallet.js",
   "scripts": {
-    "test": "mocha --delay"
+    "test": "mocha --delay",
+    "test-cover": "istanbul cover -x libwrapper.js _mocha -- --delay"
   },
   "repository": {
     "type": "git",
@@ -26,6 +27,7 @@
     "gulp-tar": "^1.8.0",
     "gulp-typescript": "^2.10.0",
     "gulp-zip": "^3.1.0",
+    "istanbul-lib-instrument": "^1.0.0-alpha.6",
     "jed": "^1.1.0",
     "map-stream": "0.0.6",
     "mocha": "^2.4.5",
@@ -33,6 +35,7 @@
     "systemjs": "^0.19.14",
     "through2": "^2.0.1",
     "typescript": "^1.9.0-dev.20160225",
+    "typhonjs-istanbul-instrument-jspm": "^0.1.0",
     "vinyl": "^1.1.1"
   }
 }
diff --git a/test/run_tests.js b/test/run_tests.js
index f6a623942..88aded741 100644
--- a/test/run_tests.js
+++ b/test/run_tests.js
@@ -12,7 +12,7 @@
 let assert = require("better-assert");
 let vm = require("vm");
 let fs = require("fs");
-
+let instrument = require("typhonjs-istanbul-instrument-jspm").default;
 
 if ("function" !== typeof run) {
   throw Error("test must be run with 'mocha --delay ...'");
@@ -23,10 +23,21 @@ let emsc = require("../lib/emscripten/libwrapper.js");
 // Do it here, since it breaks 'require'' for libwrapper
 let System = require("systemjs");
 
+
 System.config({
-  defaultJSExtensions: true
+  defaultJSExtensions: true,
+  meta: {
+    './test/tests/taler.js': {
+      format: 'register'
+    },
+    './lib/wallet/*': {
+      format: 'register'
+    }
+  }
 });
 
+instrument(System);
+
 let mod = System.newModule({Module: emsc});
 let modName = System.normalizeSync(__dirname + "/../lib/emscripten/emsc");
 console.log("registering", modName);
-- 
cgit v1.2.3


From 5ea6f8dd00266e1b5cf76826f54364119a295948 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Wed, 27 Apr 2016 16:58:06 +0200
Subject: selenium tests in "/component" form + fetching baseurl from env

---
 selenium/test.py | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/selenium/test.py b/selenium/test.py
index c0a5de742..a6155321e 100644
--- a/selenium/test.py
+++ b/selenium/test.py
@@ -1,13 +1,22 @@
+#!/usr/bin/env python3
+
+"""
+Tests for the wallet. It looks for an env variable called TALER_BASEURL
+where it appends "/banks" etc. in order to find bank and shops. If not
+found, it defaults to https://test.taler.net/
+"""
+
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
+from urllib import parse
 import time
 import logging
+import os
 
 logger = logging.getLogger(__name__)
-bank = 'http://bank.test.taler.net'
-donations = 'http://shop.test.taler.net'
+taler_baseurl = os.environ['TALER_BASEURL'] if 'TALER_BASEURL' in os.environ else 'https://test.taler.net/'
 
 def client_setup():
     """Return a dict containing the driver and the extension's id"""
@@ -27,10 +36,19 @@ def client_setup():
         document.dispatchEvent(evt);
         """
     client.execute_script(listener)
-    client.implicitly_wait(5)
     html = client.find_element(By.TAG_NAME, "html")
     return {'client': client, 'ext_id': html.get_attribute('data-taler-wallet-id')}
 
+# Note that the db appears to be reset automatically by the driver
+def destroy_db(client, ext_id):
+    url = 'chrome-extension://' + ext_id + '/popup/popup.html#/debug'
+    client.get(url)
+    button = client.find_element(By.XPATH, "//div[@id='content']/button[3]")
+    button.click()
+    time.sleep(4)
+    alert = client.switch_to.alert
+    alert.accept()
+
 
 def is_error(client):
     """Return True in case of errors in the browser, False otherwise"""
@@ -44,7 +62,7 @@ def is_error(client):
 
 def make_donation(client):
     """Make donation at shop.test.taler.net. Assume the wallet has coins"""
-    client.get(donations)
+    client.get(parse.urljoin(taler_baseurl, "shop"))
     form = client.find_element(By.TAG_NAME, "form")
     form.submit() # amount and receiver chosen
     confirm_taler = client.find_element(By.XPATH, "//form//input[@type='button']")
@@ -53,10 +71,23 @@ def make_donation(client):
     confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
     confirm_pay.click()
 
+
+def buy_article(client):
+    """Buy article at blog.test.taler.net. Assume the wallet has coins"""
+    client.get(parse.urljoin(taler_baseurl, "blog"))
+    teaser = client.find_element(By.XPATH, "//ul/h3/a[1]") # Pick 'Foreword' chapter
+    teaser.click()
+    wait = WebDriverWait(client, 10)
+    confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
+    confirm_pay.click()
+
+
 def register(client):
     """Register a new user to the bank delaying its execution until the
     profile page is shown"""
-    client.get(bank + '/accounts/register')
+    client.get(parse.urljoin(taler_baseurl, "bank"))
+    register_link = client.find_element(By.XPATH, "//a[@href='/accounts/register/']")
+    register_link.click()
     client.find_element(By.TAG_NAME, "form")
     register = """\
         var form = document.getElementsByTagName('form')[0];
@@ -107,6 +138,8 @@ def withdraw(client):
 
 ret = client_setup()
 client = ret['client']
+client.implicitly_wait(10)
 withdraw(client)
 make_donation(client)
-# client.close()
+buy_article(client)
+client.close()
-- 
cgit v1.2.3


From ce87fc0b90262cb44dda780b128c1ab0afd3b609 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Thu, 28 Apr 2016 15:08:34 +0200
Subject: deploying try-catch(es) in selenium code

---
 selenium/test.py | 105 +++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 83 insertions(+), 22 deletions(-)

diff --git a/selenium/test.py b/selenium/test.py
index a6155321e..d697f73c8 100644
--- a/selenium/test.py
+++ b/selenium/test.py
@@ -10,18 +10,21 @@ from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
 from urllib import parse
+import argparse
 import time
 import logging
+import sys
 import os
 
 logger = logging.getLogger(__name__)
 taler_baseurl = os.environ['TALER_BASEURL'] if 'TALER_BASEURL' in os.environ else 'https://test.taler.net/'
 
-def client_setup():
+def client_setup(args):
     """Return a dict containing the driver and the extension's id"""
     co = webdriver.ChromeOptions()
-    co.add_argument("load-extension=/home/marcello/wallet-webex")
+    co.add_argument("load-extension=" + args.extdir)
     cap = webdriver.DesiredCapabilities.CHROME.copy()
     cap['loggingPrefs'] = {'driver': 'INFO', 'browser': 'INFO'}
     client = webdriver.Chrome(chrome_options=co, desired_capabilities=cap)
@@ -63,22 +66,44 @@ def is_error(client):
 def make_donation(client):
     """Make donation at shop.test.taler.net. Assume the wallet has coins"""
     client.get(parse.urljoin(taler_baseurl, "shop"))
-    form = client.find_element(By.TAG_NAME, "form")
+    try:
+        form = client.find_element(By.TAG_NAME, "form")
+    except NoSuchElementException:
+        logger.error('No donation form found')
+        sys.exit(1)
     form.submit() # amount and receiver chosen
-    confirm_taler = client.find_element(By.XPATH, "//form//input[@type='button']")
+    try:
+        confirm_taler = client.find_element(By.XPATH, "//form//input[@type='button']")
+    except NoSuchElementException:
+        logger.error('Could not trigger contract on donation shop')
+        sys.exit(1)
     confirm_taler.click() # Taler as payment option chosen
+    # HUNG once, an explicit get() may be needed
     wait = WebDriverWait(client, 10)
-    confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
+    try:
+        confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
+    except TimeoutException:
+        logger.error('Could not confirm payment on donation shop')
+        sys.exit(1)
     confirm_pay.click()
 
 
 def buy_article(client):
     """Buy article at blog.test.taler.net. Assume the wallet has coins"""
     client.get(parse.urljoin(taler_baseurl, "blog"))
-    teaser = client.find_element(By.XPATH, "//ul/h3/a[1]") # Pick 'Foreword' chapter
+    try:
+        teaser = client.find_element(By.XPATH, "//ul/h3/a[1]") # Pick 'Foreword' chapter
+    except NoSuchElementException:
+        logger.error('Could not choose "Foreword" chapter on blog')
+        sys.exit(1)
     teaser.click()
+    # HUNG once, an explicit get() may be needed
     wait = WebDriverWait(client, 10)
-    confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
+    try:
+        confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
+    except TimeoutException:
+        logger.error('Could not confirm payment on blog')
+        sys.exit(1)
     confirm_pay.click()
 
 
@@ -86,9 +111,18 @@ def register(client):
     """Register a new user to the bank delaying its execution until the
     profile page is shown"""
     client.get(parse.urljoin(taler_baseurl, "bank"))
-    register_link = client.find_element(By.XPATH, "//a[@href='/accounts/register/']")
+    try:
+        register_link = client.find_element(By.XPATH, "//a[@href='/accounts/register/']")
+    except NoSuchElementException:
+        logger.error("Could not find register link on bank's homepage")
+        sys.exit(1)
     register_link.click()
-    client.find_element(By.TAG_NAME, "form")
+    try:
+        client.find_element(By.TAG_NAME, "form")
+    except NoSuchElementException:
+        logger.error("Register form not found")
+        sys.exit(1)
+
     register = """\
         var form = document.getElementsByTagName('form')[0];
         form.username.value = '%s';
@@ -98,7 +132,11 @@ def register(client):
 
     client.execute_script(register)
     # need implicit wait to be set up
-    button = client.find_element(By.ID, "select-exchange")
+    try:
+        button = client.find_element(By.ID, "select-exchange")
+    except NoSuchElementException:
+        logger.error("Selecting exchange impossible")
+        sys.exit(1)
     # when button is gotten, the browser is in the profile page
     # so the function can return
     if not is_error(client):
@@ -111,35 +149,58 @@ def withdraw(client):
     """Register and withdraw (1) KUDOS for a fresh user"""
     register(client)
     # trigger withdrawal button
-    button = client.find_element(By.ID, "select-exchange")
+    try:
+        button = client.find_element(By.ID, "select-exchange")
+    except NoSuchElementException:
+        logger.error("Selecting exchange impossible")
+        sys.exit(1)
     button.click()
     location = client.execute_script("return document.location.href")
     client.get(location)
     # Confirm xchg
     wait = WebDriverWait(client, 10)
-    button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
+    try:
+        button = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[1]")))
+    except TimeoutException:
+        logger.error("Could not confirm exchange (therefore provide withdrawal needed data)")
+        sys.exit(1)
     # This click returns the captcha page (put wait?)
     button.click()
-    answer = client.find_element(By.XPATH, "//input[@name='pin_0']")
-    question = client.find_element(By.XPATH, "//span[@class='captcha-question']/div")
+    try:
+        answer = client.find_element(By.XPATH, "//input[@name='pin_0']")
+        question = client.find_element(By.XPATH, "//span[@class='captcha-question']/div")
+    except NoSuchElementException:
+        logger.error("Captcha page not gotten or malformed")
+        sys.exit(1)
     questionTok = question.text.split()
     op1 = int(questionTok[2])
     op2 = int(questionTok[4])
     res = {'+': op1 + op2, '-': op1 - op2, u'\u00d7': op1 * op2}
     answer.send_keys(res[questionTok[3]])
-    form = client.find_element(By.TAG_NAME, "form")
+    try:
+        form = client.find_element(By.TAG_NAME, "form")
+    except NoSuchElementException:
+        logger.error("Could not submit captcha answer (therefore trigger withdrawal)")
+        sys.exit(1)
     form.submit()
     # check outcome
-    msg_succ = client.find_element(By.CLASS_NAME, "informational-ok")
-    if not msg_succ:
-        logger.error('Error in withdrawing')
-    else: logger.info('Withdrawal successful')
-
-
-ret = client_setup()
+    try:
+        client.find_element(By.CLASS_NAME, "informational-ok")
+    except NoSuchElementException:
+        logger.error("Withdrawal not completed")
+        sys.exit(1)
+    logger.info("Withdrawal completed")
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--extdir', help="Folder containing the unpacked extension", metavar="EXTDIR", type=str, dest="extdir", required=True)
+args = parser.parse_args()
+ret = client_setup(args)
 client = ret['client']
 client.implicitly_wait(10)
 withdraw(client)
 make_donation(client)
 buy_article(client)
+logger.info("Test passed")
 client.close()
+sys.exit(0)
-- 
cgit v1.2.3


From 08e60506d5df6db78fe29541b751fb7bf13861d0 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 3 May 2016 11:12:12 +0200
Subject: selenium: the wallet can select amounts from the bank's dropdown

---
 selenium/test.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/selenium/test.py b/selenium/test.py
index d697f73c8..b2bece4e0 100644
--- a/selenium/test.py
+++ b/selenium/test.py
@@ -145,7 +145,7 @@ def register(client):
         logger.error('User not registered at bank')
 
 
-def withdraw(client):
+def withdraw(client, amount_value=None):
     """Register and withdraw (1) KUDOS for a fresh user"""
     register(client)
     # trigger withdrawal button
@@ -154,6 +154,13 @@ def withdraw(client):
     except NoSuchElementException:
         logger.error("Selecting exchange impossible")
         sys.exit(1)
+    if amount_value:
+        xpath = "//select/option[@value='" + str(amount_value) + "']"
+        try:
+            client.find_element(By.XPATH, xpath)
+        except NoSuchElementException:
+            logger.error("value '" + str(amount_value) + "' is not offered by this bank to withdraw, please adapt it")
+            sys.exit(1)
     button.click()
     location = client.execute_script("return document.location.href")
     client.get(location)
@@ -198,7 +205,7 @@ args = parser.parse_args()
 ret = client_setup(args)
 client = ret['client']
 client.implicitly_wait(10)
-withdraw(client)
+withdraw(client, 11)
 make_donation(client)
 buy_article(client)
 logger.info("Test passed")
-- 
cgit v1.2.3


From 048e4f8dc9cfca81907ff6562125a92f9661882c Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 3 May 2016 14:16:04 +0200
Subject: nondefault amounts to donate via selenium

---
 selenium/test.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/selenium/test.py b/selenium/test.py
index b2bece4e0..3d46585bf 100644
--- a/selenium/test.py
+++ b/selenium/test.py
@@ -42,17 +42,6 @@ def client_setup(args):
     html = client.find_element(By.TAG_NAME, "html")
     return {'client': client, 'ext_id': html.get_attribute('data-taler-wallet-id')}
 
-# Note that the db appears to be reset automatically by the driver
-def destroy_db(client, ext_id):
-    url = 'chrome-extension://' + ext_id + '/popup/popup.html#/debug'
-    client.get(url)
-    button = client.find_element(By.XPATH, "//div[@id='content']/button[3]")
-    button.click()
-    time.sleep(4)
-    alert = client.switch_to.alert
-    alert.accept()
-
-
 def is_error(client):
     """Return True in case of errors in the browser, False otherwise"""
     for log_type in ['browser']:
@@ -63,7 +52,7 @@ def is_error(client):
         return False
 
 
-def make_donation(client):
+def make_donation(client, amount_value=None):
     """Make donation at shop.test.taler.net. Assume the wallet has coins"""
     client.get(parse.urljoin(taler_baseurl, "shop"))
     try:
@@ -71,6 +60,14 @@ def make_donation(client):
     except NoSuchElementException:
         logger.error('No donation form found')
         sys.exit(1)
+    if amount_value:
+        xpath = "//select[@id='taler-donation']/option[@value='" + str(amount_value) + "']"
+        try:
+            desired_amount = client.find_element(By.XPATH, xpath)
+            desired_amount.click()
+        except NoSuchElementException:
+            logger.error("value '" + str(amount_value) + "' is not offered by this shop to donate, please adapt it")
+            sys.exit(1)
     form.submit() # amount and receiver chosen
     try:
         confirm_taler = client.find_element(By.XPATH, "//form//input[@type='button']")
@@ -78,7 +75,9 @@ def make_donation(client):
         logger.error('Could not trigger contract on donation shop')
         sys.exit(1)
     confirm_taler.click() # Taler as payment option chosen
-    # HUNG once, an explicit get() may be needed
+    # explicit get() is needed, it hangs (sometimes) otherwise
+    time.sleep(1)
+    client.get(client.current_url)
     wait = WebDriverWait(client, 10)
     try:
         confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
@@ -97,7 +96,9 @@ def buy_article(client):
         logger.error('Could not choose "Foreword" chapter on blog')
         sys.exit(1)
     teaser.click()
-    # HUNG once, an explicit get() may be needed
+    # explicit get() is needed, it hangs (sometimes) otherwise
+    time.sleep(1)
+    client.get(client.current_url)
     wait = WebDriverWait(client, 10)
     try:
         confirm_pay = wait.until(EC.element_to_be_clickable((By.XPATH, "//button[@class='accept']"))) 
@@ -157,7 +158,8 @@ def withdraw(client, amount_value=None):
     if amount_value:
         xpath = "//select/option[@value='" + str(amount_value) + "']"
         try:
-            client.find_element(By.XPATH, xpath)
+            desired_amount = client.find_element(By.XPATH, xpath)
+            desired_amount.click()
         except NoSuchElementException:
             logger.error("value '" + str(amount_value) + "' is not offered by this bank to withdraw, please adapt it")
             sys.exit(1)
@@ -205,8 +207,8 @@ args = parser.parse_args()
 ret = client_setup(args)
 client = ret['client']
 client.implicitly_wait(10)
-withdraw(client, 11)
-make_donation(client)
+withdraw(client, 10)
+make_donation(client, 6.0)
 buy_article(client)
 logger.info("Test passed")
 client.close()
-- 
cgit v1.2.3


From dc83b85e85110eb7ed2e96ecdbcbb90b5a5620aa Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Tue, 3 May 2016 15:05:58 +0200
Subject: selenium: adding function to switch between 'test' and 'demo' base
 URLs, used to introduce currency mismatches when testing errors management

---
 selenium/test.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/selenium/test.py b/selenium/test.py
index 3d46585bf..14140e953 100644
--- a/selenium/test.py
+++ b/selenium/test.py
@@ -17,9 +17,10 @@ import time
 import logging
 import sys
 import os
+import re
 
 logger = logging.getLogger(__name__)
-taler_baseurl = os.environ['TALER_BASEURL'] if 'TALER_BASEURL' in os.environ else 'https://test.taler.net/'
+taler_baseurl = os.environ.get('TALER_BASEURL', 'https://test.taler.net/')
 
 def client_setup(args):
     """Return a dict containing the driver and the extension's id"""
@@ -52,6 +53,17 @@ def is_error(client):
         return False
 
 
+def switch_base():
+    """If 'test' is in TALER_BASEURL, then make it be 'demo', and viceversa.
+    Used to trig currency mismatch errors. It assumes that the https://{test,demo}.taler.net
+    layout is being used"""
+    global taler_baseurl
+    url = parse.urlparse(taler_baseurl)
+    if url[1] == 'test.taler.net':
+        taler_baseurl = "https://demo.taler.net"
+    if url[1] == 'demo.taler.net':
+        taler_baseurl = "https://test.taler.net"
+
 def make_donation(client, amount_value=None):
     """Make donation at shop.test.taler.net. Assume the wallet has coins"""
     client.get(parse.urljoin(taler_baseurl, "shop"))
@@ -208,6 +220,7 @@ ret = client_setup(args)
 client = ret['client']
 client.implicitly_wait(10)
 withdraw(client, 10)
+switch_base() # inducing error
 make_donation(client, 6.0)
 buy_article(client)
 logger.info("Test passed")
-- 
cgit v1.2.3