Fixed python3 bugs and more cli tests

maximilianhurl · maximilianhurl · commit b079c7f9f185 · 2016-02-03T09:42:36.000Z
diff --git a/coreapi/commandline.py b/coreapi/commandline.py
@@ -1,3 +1,4 @@
+from coreapi.compat import json_load_bytes, force_bytes
 import click
 import coreapi
 import json
@@ -277,14 +278,14 @@ def get_credentials():
     if not os.path.isfile(credentials_path):
         return {}
     store = open(credentials_path, 'rb')
-    credentials = json.loads(store.read())
+    credentials = json_load_bytes(store.read())
     store.close()
     return credentials
 
 
 def set_credentials(credentials):
     store = open(credentials_path, 'wb')
-    store.write(json.dumps(credentials))
+    store.write(force_bytes(json.dumps(credentials)))
     store.close
 
 
@@ -334,14 +335,14 @@ def get_headers():
     if not os.path.isfile(headers_path):
         return {}
     headers_file = open(headers_path, 'rb')
-    headers = json.loads(headers_file.read())
+    headers = json_load_bytes(headers_file.read())
     headers_file.close()
     return headers
 
 
 def set_headers(headers):
     headers_file = open(headers_path, 'wb')
-    headers_file.write(json.dumps(headers))
+    headers_file.write(force_bytes(json.dumps(headers)))
     headers_file.close()
 
 
@@ -394,14 +395,14 @@ def get_bookmarks():
     if not os.path.isfile(bookmarks_path):
         return {}
     bookmarks_file = open(bookmarks_path, 'rb')
-    bookmarks = json.loads(bookmarks_file.read())
+    bookmarks = json_load_bytes(bookmarks_file.read())
     bookmarks_file.close()
     return bookmarks
 
 
 def set_bookmarks(bookmarks):
     bookmarks_file = open(bookmarks_path, 'wb')
-    bookmarks_file.write(json.dumps(bookmarks))
+    bookmarks_file.write(force_bytes(json.dumps(bookmarks)))
     bookmarks_file.close()
 
 
diff --git a/coreapi/compat.py b/coreapi/compat.py
@@ -1,5 +1,7 @@
 # coding: utf-8
 
+import json
+
 __all__ = [
     'urlparse', 'string_types',
     'COMPACT_SEPARATORS', 'VERBOSE_SEPARATORS'
@@ -25,3 +27,7 @@ def force_bytes(string):
     if isinstance(string, string_types):
         return string.encode('utf-8')
     return string
+
+
+def json_load_bytes(bytes):
+    return json.loads(bytes.decode('utf-8') or '{}')
diff --git a/tests/test_commandline.py b/tests/test_commandline.py
@@ -127,6 +127,57 @@ def test_cli_history(cli):
     assert result.output == '<Document "http://2.com">\n'
 
 
+# Credentials
+
+def test_cli_credentials(cli):
+    result = cli('credentials', 'show')
+    assert result.output == 'Credentials\n'
+
+    result = cli('credentials', 'add', 'http://1.com', 'Token 123cat')
+    assert result.output == 'Added credentials\nhttp://1.com "Token 123cat"\n'
+
+    result = cli('credentials', 'show')
+    assert result.output == 'Credentials\nhttp://1.com "Token 123cat"\n'
+
+
+# Bookmarks
+
+def test_cli_bookmarks(cli):
+    set_response(Document('http://example.com', 'Example'))
+    cli('get', 'http://example.com')
+
+    result = cli('bookmarks', 'add', 'example')
+    assert result.output == 'Added bookmark\nexample\n'
+
+    result = cli('bookmarks', 'show')
+    assert result.output == 'Bookmarks\nexample <Example "http://example.com">\n'
+
+    result = cli('bookmarks', 'get', 'example')
+    assert result.output == '<Example "http://example.com">\n'
+
+    result = cli('bookmarks', 'remove', 'example')
+    assert result.output == 'Removed bookmark\nexample\n'
+
+    result = cli('bookmarks', 'show')
+    assert result.output == 'Bookmarks\n'
+
+
+# Headers
+
+def test_cli_headers(cli):
+    result = cli('headers', 'add', 'Cache-Control', 'public')
+    assert result.output == 'Added header\nCache-Control: public\n'
+
+    result = cli('headers', 'show')
+    assert result.output == 'Headers\nCache-Control: public\n'
+
+    result = cli('headers', 'remove', 'Cache-Control')
+    assert result.output == 'Removed header\nCache-Control\n'
+
+    result = cli('headers', 'show')
+    assert result.output == 'Headers\n'
+
+
 # Test dotted path notation maps to list of keys correctly.
 
 def test_dotted_path_notation():
