From 64d40aa4bea0a16fee12b25fec6eaae1f260792e Mon Sep 17 00:00:00 2001 From: Steven Loria Date: Sat, 7 Dec 2013 18:55:07 -0600 Subject: [PATCH] Add WebTest and some tests --- {{cookiecutter.repo_name}}/README.rst | 8 ++ .../requirements/dev.txt | 1 + .../public/views.py | 4 +- .../templates/_layouts/nav.html | 2 +- .../templates/public/register.html | 4 +- .../tests/factories.py | 1 + .../tests/test_models.py | 2 +- .../tests/webtest_tests.py | 108 ++++++++++++++++++ 8 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/webtest_tests.py diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst index db9fb5d..cb7f504 100644 --- a/{{cookiecutter.repo_name}}/README.rst +++ b/{{cookiecutter.repo_name}}/README.rst @@ -25,3 +25,11 @@ To open the interactive shell, run :: python manage.py shell By default, you will have access to ``app`` and ``db``. + + +Running Tests +------------- + +To run all tests, run :: + + python manage.py test diff --git a/{{cookiecutter.repo_name}}/requirements/dev.txt b/{{cookiecutter.repo_name}}/requirements/dev.txt index d339fdc..67594ae 100644 --- a/{{cookiecutter.repo_name}}/requirements/dev.txt +++ b/{{cookiecutter.repo_name}}/requirements/dev.txt @@ -5,6 +5,7 @@ nose Flask-Testing factory-boy>=2.2.1 +Flask-WebTest>=0.0.6 # Management script Flask-Script diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py index ea55b96..3b09cd1 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/public/views.py @@ -43,12 +43,10 @@ def logout(): def register(): form = RegisterForm(request.form, csrf_enabled=False) if form.validate_on_submit(): - new_user = User(username=form.username.data, + new_user = User.create(username=form.username.data, email=form.email.data, password=form.password.data, active=True) - db.session.add(new_user) - db.session.commit() flash("Thank you for registering. You can now log in.", 'success') return redirect(url_for('public.home')) else: diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html index 9e37955..d4c3554 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html @@ -29,7 +29,7 @@ -
+ {{ form.hidden_tag() }}
{{ form.username(placeholder="Username", class_="form-control") }} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html index 7074793..7c2bb07 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/public/register.html @@ -4,7 +4,7 @@

Register


- + {{ form.hidden_tag() }}
{{form.username.label}} @@ -27,4 +27,4 @@

Already registered? Click here to login.

{% endblock %} -{% endraw %} \ No newline at end of file +{% endraw %} diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py index 6c15162..9416e96 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/factories.py @@ -13,3 +13,4 @@ class UserFactory(SQLAlchemyModelFactory): username = Sequence(lambda n: "user{0}".format(n)) email = Sequence(lambda n: "user{0}@example.com".format(n)) password = PostGenerationMethodCall("set_password", 'example') + active = True diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py index 1e620fa..1ea3f6f 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/test_models.py @@ -16,7 +16,7 @@ class TestUser(DbTestCase): assert_true(user.email) assert_true(user.created_at) assert_false(user.is_admin) - assert_false(user.active) + assert_true(user.active) assert_true(user.check_password("myprecious")) def test_check_password(self): diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/webtest_tests.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/webtest_tests.py new file mode 100644 index 0000000..d428e42 --- /dev/null +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/tests/webtest_tests.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- +'''Functional tests using WebTest. + +See: http://webtest.readthedocs.org/ +''' +from flask import url_for +from flask.ext.webtest import TestApp +from nose.tools import * # PEP8 asserts + +from ..user.models import User +from .base import DbTestCase +from .factories import UserFactory + + +class TestLoggingIn(DbTestCase): + + def setUp(self): + self.w = TestApp(self.app) + self.user = UserFactory(password="myprecious") + self.user.save() + + def test_can_log_in(self): + # Goes to homepage + res = self.w.get("/") + # Fills out login form in navbar + form = res.forms['loginForm'] + form['username'] = self.user.username + form['password'] = 'myprecious' + # Submits + res = form.submit().follow() + assert_equal(res.status_code, 200) + + def test_sees_error_message_if_password_is_incorrect(self): + # Goes to homepage + res = self.w.get("/") + # Fills out login form, password incorrect + form = res.forms['loginForm'] + form['username'] = self.user.username + form['password'] = 'wrong' + # Submits + res = form.submit() + # sees error + assert_in("Invalid password", res) + + def test_sees_error_message_if_username_doesnt_exist(self): + # Goes to homepage + res = self.w.get("/") + # Fills out login form, password incorrect + form = res.forms['loginForm'] + form['username'] = 'unknown' + form['password'] = 'myprecious' + # Submits + res = form.submit() + # sees error + assert_in("Unknown user", res) + + +class TestRegistering(DbTestCase): + + def setUp(self): + self.w = TestApp(self.app) + + def test_can_register(self): + # Goes to homepage + res = self.w.get("/") + # Clicks Create Account button + res = res.click("Create account") + # Fills out the form + form = res.forms["registerForm"] + form['username'] = 'foobar' + form['email'] = 'foo@bar.com' + form['password'] = 'secret' + form['confirm'] = 'secret' + # Submits + res = form.submit().maybe_follow() + assert_equal(res.status_code, 200) + # A new user was created + assert_equal(len(User.query.all()), 1) + + def test_sees_error_message_if_passwords_dont_match(self): + # Goes to registration page + res = self.w.get(url_for("public.register")) + # Fills out form, but passwords don't match + form = res.forms["registerForm"] + form['username'] = 'foobar' + form['email'] = 'foo@bar.com' + form['password'] = 'secret' + form['confirm'] = 'secrets' + # Submits + res = form.submit() + # sees error message + assert_in("Passwords must match", res) + + def test_sees_error_message_if_user_already_registered(self): + user = UserFactory(active=True) # A registered user + user.save() + # Goes to registration page + res = self.w.get(url_for("public.register")) + # Fills out form, but + form = res.forms["registerForm"] + form['username'] = user.username + form['email'] = 'foo@bar.com' + form['password'] = 'secret' + form['confirm'] = 'secret' + # Submits + res = form.submit() + # sees error + assert_in("Username already registered", res)