mirror of
https://github.com/httpie/cli.git
synced 2025-06-26 20:41:49 +02:00
Fixed tests.
This commit is contained in:
parent
b7e0473d6c
commit
6a1f0248e1
@ -5,13 +5,15 @@ import unittest
|
|||||||
import argparse
|
import argparse
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
|
|
||||||
|
|
||||||
TESTS_ROOT = os.path.dirname(__file__)
|
TESTS_ROOT = os.path.dirname(__file__)
|
||||||
sys.path.insert(0, os.path.abspath(os.path.join(TESTS_ROOT, '..')))
|
sys.path.insert(0, os.path.realpath(os.path.join(TESTS_ROOT, '..')))
|
||||||
from httpie import __main__
|
from httpie import __main__
|
||||||
from httpie import cli
|
from httpie import cli
|
||||||
|
|
||||||
|
|
||||||
|
TEST_FILE = os.path.join(TESTS_ROOT, 'file.txt')
|
||||||
|
|
||||||
|
|
||||||
TERMINAL_COLOR_CHECK = '\x1b['
|
TERMINAL_COLOR_CHECK = '\x1b['
|
||||||
|
|
||||||
|
|
||||||
@ -46,7 +48,8 @@ class TestItemParsing(BaseTest):
|
|||||||
self.kv = cli.KeyValueType(
|
self.kv = cli.KeyValueType(
|
||||||
cli.SEP_HEADERS,
|
cli.SEP_HEADERS,
|
||||||
cli.SEP_DATA,
|
cli.SEP_DATA,
|
||||||
cli.SEP_DATA_RAW_JSON
|
cli.SEP_DATA_RAW_JSON,
|
||||||
|
cli.SEP_FILES,
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_invalid_items(self):
|
def test_invalid_items(self):
|
||||||
@ -56,7 +59,7 @@ class TestItemParsing(BaseTest):
|
|||||||
lambda: self.kv(item))
|
lambda: self.kv(item))
|
||||||
|
|
||||||
def test_valid_items(self):
|
def test_valid_items(self):
|
||||||
headers, data = cli.parse_items([
|
headers, data, files = cli.parse_items([
|
||||||
self.kv('string=value'),
|
self.kv('string=value'),
|
||||||
self.kv('header:value'),
|
self.kv('header:value'),
|
||||||
self.kv('list:=["a", 1, {}, false]'),
|
self.kv('list:=["a", 1, {}, false]'),
|
||||||
@ -64,6 +67,7 @@ class TestItemParsing(BaseTest):
|
|||||||
self.kv('eh:'),
|
self.kv('eh:'),
|
||||||
self.kv('ed='),
|
self.kv('ed='),
|
||||||
self.kv('bool:=true'),
|
self.kv('bool:=true'),
|
||||||
|
self.kv('test-file@%s' % TEST_FILE),
|
||||||
])
|
])
|
||||||
self.assertDictEqual(headers, {
|
self.assertDictEqual(headers, {
|
||||||
'header': 'value',
|
'header': 'value',
|
||||||
@ -76,6 +80,7 @@ class TestItemParsing(BaseTest):
|
|||||||
"list": ["a", 1, {}, False],
|
"list": ["a", 1, {}, False],
|
||||||
"obj": {"a": "b"}
|
"obj": {"a": "b"}
|
||||||
})
|
})
|
||||||
|
self.assertIn('test-file', files)
|
||||||
|
|
||||||
|
|
||||||
class TestHTTPie(BaseTest):
|
class TestHTTPie(BaseTest):
|
||||||
@ -127,7 +132,7 @@ class TestFileUpload(BaseTest):
|
|||||||
|
|
||||||
def test_upload_ok(self):
|
def test_upload_ok(self):
|
||||||
r = http('--form', 'POST', 'http://httpbin.org/post',
|
r = http('--form', 'POST', 'http://httpbin.org/post',
|
||||||
'test-file@%s' % os.path.join(TESTS_ROOT, 'file.txt'))
|
'test-file@%s' % TEST_FILE)
|
||||||
self.assertIn('"test-file": "__test_file_content__', r)
|
self.assertIn('"test-file": "__test_file_content__', r)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user