Commit 0bf5ac48 authored by Serge S. Koval's avatar Serge S. Koval

Unit test fixes

parent 53c68c72
...@@ -14,4 +14,4 @@ venv ...@@ -14,4 +14,4 @@ venv
*.sqlite *.sqlite
*.sublime-* *.sublime-*
.coverage .coverage
__pycache__
...@@ -30,6 +30,7 @@ class MockView(base.BaseView): ...@@ -30,6 +30,7 @@ class MockView(base.BaseView):
else: else:
return False return False
class MockMethodView(base.BaseView): class MockMethodView(base.BaseView):
@base.expose('/') @base.expose('/')
def index(self): def index(self):
...@@ -39,10 +40,13 @@ class MockMethodView(base.BaseView): ...@@ -39,10 +40,13 @@ class MockMethodView(base.BaseView):
class API1(MethodView): class API1(MethodView):
def get(self, cls): def get(self, cls):
return cls.render('method.html', request=request, name='API1') return cls.render('method.html', request=request, name='API1')
def post(self, cls): def post(self, cls):
return cls.render('method.html', request=request, name='API1') return cls.render('method.html', request=request, name='API1')
def put(self, cls): def put(self, cls):
return cls.render('method.html', request=request, name='API1') return cls.render('method.html', request=request, name='API1')
def delete(self, cls): def delete(self, cls):
return cls.render('method.html', request=request, name='API1') return cls.render('method.html', request=request, name='API1')
...@@ -50,9 +54,11 @@ class MockMethodView(base.BaseView): ...@@ -50,9 +54,11 @@ class MockMethodView(base.BaseView):
class API2(MethodView): class API2(MethodView):
def get(self, cls): def get(self, cls):
return cls.render('method.html', request=request, name='API2') return cls.render('method.html', request=request, name='API2')
def post(self, cls): def post(self, cls):
return cls.render('method.html', request=request, name='API2') return cls.render('method.html', request=request, name='API2')
def test_baseview_defaults(): def test_baseview_defaults():
view = MockView() view = MockView()
eq_(view.name, None) eq_(view.name, None)
...@@ -189,15 +195,15 @@ def test_call(): ...@@ -189,15 +195,15 @@ def test_call():
eq_(rv.status_code, 200) eq_(rv.status_code, 200)
rv = client.get('/admin/mockview/') rv = client.get('/admin/mockview/')
eq_(rv.data, 'Success!') eq_(rv.data, b'Success!')
rv = client.get('/admin/mockview/test/') rv = client.get('/admin/mockview/test/')
eq_(rv.data, 'Success!') eq_(rv.data, b'Success!')
# Check authentication failure # Check authentication failure
view.allow_call = False view.allow_call = False
rv = client.get('/admin/mockview/') rv = client.get('/admin/mockview/')
eq_(rv.data, 'Failure!') eq_(rv.data, b'Failure!')
def test_permissions(): def test_permissions():
...@@ -244,16 +250,17 @@ def test_delayed_init(): ...@@ -244,16 +250,17 @@ def test_delayed_init():
client = app.test_client() client = app.test_client()
rv = client.get('/admin/mockview/') rv = client.get('/admin/mockview/')
eq_(rv.data, 'Success!') eq_(rv.data, b'Success!')
def test_multi_instances_init(): def test_multi_instances_init():
app = Flask(__name__) app = Flask(__name__)
admin = base.Admin(app) _ = base.Admin(app)
class ManageIndex(base.AdminIndexView): class ManageIndex(base.AdminIndexView):
pass pass
manage = base.Admin(app, index_view=ManageIndex(url='/manage', endpoint='manage'))
_ = base.Admin(app, index_view=ManageIndex(url='/manage', endpoint='manage'))
@raises(Exception) @raises(Exception)
...@@ -262,6 +269,7 @@ def test_double_init(): ...@@ -262,6 +269,7 @@ def test_double_init():
admin = base.Admin(app) admin = base.Admin(app)
admin.init_app(app) admin.init_app(app)
def test_nested_flask_views(): def test_nested_flask_views():
app = Flask(__name__) app = Flask(__name__)
admin = base.Admin(app) admin = base.Admin(app)
...@@ -272,19 +280,20 @@ def test_nested_flask_views(): ...@@ -272,19 +280,20 @@ def test_nested_flask_views():
client = app.test_client() client = app.test_client()
rv = client.get('/admin/mockmethodview/_api/1') rv = client.get('/admin/mockmethodview/_api/1')
assert rv.data == 'GET - API1' print('"', rv.data, '"')
eq_(rv.data, b'GET - API1')
rv = client.put('/admin/mockmethodview/_api/1') rv = client.put('/admin/mockmethodview/_api/1')
assert rv.data == 'PUT - API1' eq_(rv.data, b'PUT - API1')
rv = client.post('/admin/mockmethodview/_api/1') rv = client.post('/admin/mockmethodview/_api/1')
assert rv.data == 'POST - API1' eq_(rv.data, b'POST - API1')
rv = client.delete('/admin/mockmethodview/_api/1') rv = client.delete('/admin/mockmethodview/_api/1')
assert rv.data == 'DELETE - API1' eq_(rv.data, b'DELETE - API1')
rv = client.get('/admin/mockmethodview/_api/2') rv = client.get('/admin/mockmethodview/_api/2')
assert rv.data == 'GET - API2' eq_(rv.data, b'GET - API2')
rv = client.post('/admin/mockmethodview/_api/2') rv = client.post('/admin/mockmethodview/_api/2')
assert rv.data == 'POST - API2' eq_(rv.data, b'POST - API2')
rv = client.delete('/admin/mockmethodview/_api/2') rv = client.delete('/admin/mockmethodview/_api/2')
assert rv.status_code == 405 eq_(rv.status_code, 405)
rv = client.put('/admin/mockmethodview/_api/2') rv = client.put('/admin/mockmethodview/_api/2')
assert rv.status_code == 405 eq_(rv.status_code, 405)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment