Skip to content

Commit

Permalink
Converted application module into a package.
Browse files Browse the repository at this point in the history
See the [Larger Applications
pattern](http://flask.pocoo.org/docs/patterns/packages/) of the Flask
documentation for more details.
  • Loading branch information
artisonian committed May 15, 2010
1 parent f208918 commit 38353df
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 10 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FlaskEngine v0.1.0
FlaskEngine v0.2.0
===

A replica of [Flaskr](http://flask.pocoo.org/docs/tutorial/ "Flaskr - Flask Tutorial"), using [MongoEngine](http://hmarr.com/mongoengine/ "MongoEngine Docs") for persistence.
Expand All @@ -21,6 +21,7 @@ Then point your browser at http://127.0.0.1:5000/

## TODO

* Combine `runserver.py` and `runtests.py` into a single `manage.py` script.
* Add support for editing and deleting entries.
* Add support for Markdown extensions.
* Add license.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions runserver.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from flaskengine import app
app.run(debug=True)
4 changes: 4 additions & 0 deletions runtests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import unittest
import tests

unittest.TextTestRunner(verbosity=2).run(tests.alltests)
4 changes: 4 additions & 0 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import unittest
import test_application

alltests = unittest.TestSuite([test_application.suite])
21 changes: 12 additions & 9 deletions flaskr_test.py → tests/test_application.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import os
import flaskr
import flaskengine
import unittest
import mongoengine

class FlaskrTestCase(unittest.TestCase):

def setUp(self):
flaskr.DATABASE = 'flaskengine_test'
self.app = flaskr.app.test_client()
self.db = flaskr.connect_db()
flaskengine.DATABASE = 'flaskengine_test'
self.app = flaskengine.app.test_client()
self.db = flaskengine.connect_db()

def tearDown(self):
self.db.connection.drop_database(flaskr.DATABASE)
self.db.connection.drop_database(flaskengine.DATABASE)

def login(self, username, password):
return self.app.post('/login', data=dict(
Expand All @@ -27,17 +27,17 @@ def test_empty_db(self):
assert 'No entries so far' in response.data

def test_login_logout(self):
response = self.login(flaskr.USERNAME, flaskr.PASSWORD)
response = self.login(flaskengine.USERNAME, flaskengine.PASSWORD)
assert 'You have been logged in' in response.data
response = self.logout()
assert 'You have been logged out' in response.data
response = self.login(flaskr.USERNAME + 'X', flaskr.PASSWORD)
response = self.login(flaskengine.USERNAME + 'X', flaskengine.PASSWORD)
assert 'Invalid username' in response.data
response = self.login(flaskr.USERNAME, flaskr.PASSWORD + 'X')
response = self.login(flaskengine.USERNAME, flaskengine.PASSWORD + 'X')
assert 'Invalid password' in response.data

def test_messages(self):
self.login(flaskr.USERNAME, flaskr.PASSWORD)
self.login(flaskengine.USERNAME, flaskengine.PASSWORD)
response = self.app.post('/add', data=dict(
title='<Hello>',
text='**HTML** allowed here'
Expand All @@ -47,5 +47,8 @@ def test_messages(self):
assert '<strong>HTML</strong> allowed here' in response.data


suite = unittest.TestLoader().loadTestsFromTestCase(FlaskrTestCase)


if __name__ == '__main__':
unittest.main()

0 comments on commit 38353df

Please sign in to comment.