Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Addition of groups, travis and frontend #14

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
removing hidden macro
  • Loading branch information
mmilkin committed Feb 9, 2016
commit 72ee2a6c6b61c213a5c2ab4a3b35512c988daac7
3 changes: 0 additions & 3 deletions studygroup/templates/wtf_macro.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,9 @@
{% macro form_errors(form, hiddens=True) %}
{%- if form.errors %}
{%- for fieldname, errors in form.errors.items() %}
{%- if bootstrap_is_hidden_field(form[fieldname]) and hiddens or
not bootstrap_is_hidden_field(form[fieldname]) and hiddens != 'only' %}
{%- for error in errors %}
<p class="error">{{error}}</p>
{%- endfor %}
{%- endif %}
{%- endfor %}
{%- endif %}
{%- endmacro %}
60 changes: 30 additions & 30 deletions tests/test_membership.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,36 +71,36 @@ def test_show_group_post(self):
self.assert200(resp)
self.assertIn('Members: 2', resp.data)

# def test_bad_group(self):
# self.login(self.alice_id)
# data = {}
#
# resp = self.client.post(
# url_for('group.show_group', id=self.group.id),
# data=data
# )
# self.assert404(resp)
# self.assertIn('This field is required.', resp.data)
#
# def test_existing_membership(self):
# self.login(self.alice_id)
# membership = Membership(
# user_id=self.alice_id,
# group_id=self.group.id
# )
# db.session.add(membership)
# db.session.commit()
#
# data = {
# 'group_id': self.group.id,
# }
#
# resp = self.client.post(
# url_for('group.show_group', id=self.group.id),
# data=data
# )
# self.assert200(resp)
# self.assertIn('This member is already in this group', resp.data)
def test_bad_group(self):
self.login(self.alice_id)
data = {}

resp = self.client.post(
url_for('group.show_group', id=self.group.id),
data=data
)
self.assert200(resp)
self.assertIn('This field is required.', resp.data)

def test_existing_membership(self):
self.login(self.alice_id)
membership = Membership(
user_id=self.alice_id,
group_id=self.group.id
)
db.session.add(membership)
db.session.commit()

data = {
'group_id': self.group.id,
}

resp = self.client.post(
url_for('group.show_group', id=self.group.id),
data=data
)
self.assert200(resp)
self.assertIn('This member is already in this group', resp.data)


class MembershipFormTest(StudyGroupTestCase):
Expand Down