From e8b3bdcd20f7890a7412ad30b7cae4796da5b234 Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holger@nahrstaedt.de>
Date: Fri, 1 Jun 2018 09:56:11 +0200
Subject: [PATCH] Fix steemconnect unit test; prepare release 0.19.34

---
 README.rst                      |  7 +++++++
 tests/beem/test_steemconnect.py | 29 ++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index ba14e60a..65dca1c2 100644
--- a/README.rst
+++ b/README.rst
@@ -138,6 +138,13 @@ before transmitting the packed file. Please check the hash-sum after downloading
 
 Changelog
 =========
+0.19.34
+-------
+* Several bug fixes (including issue #17)
+* missing steem_instance fixed
+* update_account_profile fixed
+* update_account_metadata added
+
 0.19.33
 -------
 * Several bug fixes (including issue #13 and #16)
diff --git a/tests/beem/test_steemconnect.py b/tests/beem/test_steemconnect.py
index bd22895d..818ae1ec 100644
--- a/tests/beem/test_steemconnect.py
+++ b/tests/beem/test_steemconnect.py
@@ -10,7 +10,6 @@ import unittest
 from parameterized import parameterized
 import random
 import json
-from six import PY2
 from pprint import pprint
 from beem import Steem, exceptions
 from beem.amount import Amount
@@ -65,10 +64,16 @@ class Testcases(unittest.TestCase):
             "test1", 1.000, "STEEM", memo="test")
         sc2 = SteemConnect(steem_instance=bts)
         url = sc2.url_from_tx(tx)
-        if PY2:
-            self.assertEqual(url, 'https://v2.steemconnect.com/sign/transfer?from=test&memo=test&to=test1&amount=1.000+STEEM')
-        else:
-            self.assertEqual(url, 'https://v2.steemconnect.com/sign/transfer?from=test&to=test1&amount=1.000+STEEM&memo=test')
+        url_test = 'https://v2.steemconnect.com/sign/transfer?from=test&to=test1&amount=1.000+STEEM&memo=test'
+        self.assertEqual(len(url), len(url_test))
+        self.assertEqual(len(url.split('?')), 2)
+        self.assertEqual(url.split('?')[0], url_test.split('?')[0])
+
+        url_parts = (url.split('?')[1]).split('&')
+        url_test_parts = (url_test.split('?')[1]).split('&')
+
+        self.assertEqual(len(url_parts), 4)
+        self.assertEqual(len(list(set(url_parts).intersection(set(url_test_parts)))), 4)
 
     @parameterized.expand([
         ("non_appbase"),
@@ -81,7 +86,13 @@ class Testcases(unittest.TestCase):
             bts = self.appbase
         sc2 = SteemConnect(steem_instance=bts)
         url = sc2.get_login_url("localhost", scope="login,vote")
-        if PY2:
-            self.assertEqual(url, 'https://v2.steemconnect.com/oauth2/authorize?client_id=None&scope=login,vote&redirect_uri=localhost')
-        else:
-            self.assertEqual(url, 'https://v2.steemconnect.com/oauth2/authorize?client_id=None&redirect_uri=localhost&scope=login,vote')
+        url_test = 'https://v2.steemconnect.com/oauth2/authorize?client_id=None&redirect_uri=localhost&scope=login,vote'
+        self.assertEqual(len(url), len(url_test))
+        self.assertEqual(len(url.split('?')), 2)
+        self.assertEqual(url.split('?')[0], url_test.split('?')[0])
+
+        url_parts = (url.split('?')[1]).split('&')
+        url_test_parts = (url_test.split('?')[1]).split('&')
+
+        self.assertEqual(len(url_parts), 3)
+        self.assertEqual(len(list(set(url_parts).intersection(set(url_test_parts)))), 3)
-- 
GitLab