From cca40627b0afa2efc85ef7f5f1a1060a221ff2a2 Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Tue, 8 May 2018 18:33:41 +0200
Subject: js: more testing

--

* Tests: Under certain circumstances, some data change during
  encrypt-decrypt. Committing the current state so the problem can be
  discussed.

* Fixes:
  - disconnecting the test ports after tests are complete
  - fixed passing of the error message from gpgme-json
---
 lang/js/src/gpgmejs.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lang/js/src/gpgmejs.js')

diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 9475b2b0..c1a01377 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -170,18 +170,19 @@ function putData(message, data){
     if (!data){
         return gpgme_error('PARAM_WRONG');
     } else if (data instanceof Uint8Array){
-        let decoder = new TextDecoder('utf8');
         message.setParameter('base64', true);
-        message.setParameter ('data', decoder.decode(data));
+        message.setParameter ('data', btoa(data));
     } else if (typeof(data) === 'string') {
         message.setParameter('base64', false);
         message.setParameter('data', data);
-    } else if ( typeof(data) === 'object' && data.hasOwnProperty(getText)){
+    } else if ( typeof(data) === 'object' && data.hasOwnProperty('getText')){
         let txt = data.getText();
         if (txt instanceof Uint8Array){
-            let decoder = new TextDecoder('utf8');
             message.setParameter('base64', true);
-            message.setParameter ('data', decoder.decode(txt));
+            message.setParameter ('data', btoa(txt));
+        }
+        else {
+            return gpgme_error('PARAM_WRONG');
         }
     } else {
         return gpgme_error('PARAM_WRONG');
-- 
cgit v1.2.3