Merge lp:~cjohnston/summit/cj-wrote-tests into lp:summit

[Chris Johnston]

Adds 22 tests for the new virtual meeting functionality.

[lp:~cjohnston/summit/cj-wrote-tests]

488. By Chris Johnston on 2013-02-23

More test stuff

489. By Chris Johnston on 2013-02-24

Reducing code

490. By Chris Johnston on 2013-02-24

more tests

491. By Chris Johnston on 2013-02-24

More tests

492. By Chris Johnston on 2013-02-24

more

493. By Chris Johnston on 2013-02-24

fixes from Michael

494. By Chris Johnston on 2013-02-24

save form

495. By Chris Johnston on 2013-02-26

Let us test forms

496. By Chris Johnston on 2013-02-26

Testing tests

[Michael Hall (mhall119)]

162 tests, all pass, great job

review: Approve

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2013-02-20 13:57:06 +0000
+++ summit/schedule/models/meetingmodel.py	2013-02-26 19:00:29 +0000
@@ -1,5 +1,5 @@
 # The Summit Scheduler web application
-# Copyright (C) 2008 - 2012 Ubuntu Community, Canonical Ltd
+# Copyright (C) 2008 - 2013 Ubuntu Community, Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -21,7 +21,6 @@
 
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
-from django.conf import settings
 from django.core.urlresolvers import reverse
 
 import simplejson as json
@@ -91,15 +90,31 @@
     )
 
     summit = models.ForeignKey(Summit)
-    name = NameField(max_length=100, help_text="Lowercase alphanumeric characters and dashes only.")
-    title = models.CharField(max_length=100, help_text="Alphanumeric characters and spaces are allowed")
+    name = NameField(
+        max_length=100,
+        help_text="Lowercase alphanumeric characters and dashes only."
+    )
+    title = models.CharField(
+        max_length=100,
+        help_text="Alphanumeric characters and spaces are allowed"
+    )
     description = models.TextField(max_length=2047, blank=True)
-    type = models.CharField(max_length=15, choices=TYPE_CHOICES,
-                            default=TYPE_CHOICES[0][0])
-    status = models.CharField(max_length=10, choices=STATUS_CHOICES,
-                              null=True, blank=True)
-    priority = models.IntegerField(choices=PRIORITY_CHOICES,
-                                   null=True, blank=True)
+    type = models.CharField(
+        max_length=15,
+        choices=TYPE_CHOICES,
+        default=TYPE_CHOICES[0][0]
+    )
+    status = models.CharField(
+        max_length=10,
+        choices=STATUS_CHOICES,
+        null=True,
+        blank=True
+    )
+    priority = models.IntegerField(
+        choices=PRIORITY_CHOICES,
+        null=True,
+        blank=True
+    )
     hangout_url = models.URLField(
         blank=True,
         null=True,
@@ -113,20 +128,37 @@
     # FIXME tracks must be for the same summit
     # (will require js magic in admin to refresh the boxes)
     tracks = models.ManyToManyField(Track, blank=True)
-    spec_url = models.URLField(blank=True,
-                               verbose_name="Spec URL")
-    wiki_url = models.URLField(blank=True, verify_exists=False,
-                               verbose_name="Wiki URL")
-    pad_url = models.URLField(verify_exists=False,
-                               verbose_name="Pad URL", null=True, blank=True)
+    spec_url = models.URLField(
+        blank=True,
+        verbose_name="Spec URL"
+    )
+    wiki_url = models.URLField(
+        blank=True,
+        verify_exists=False,
+        verbose_name="Wiki URL"
+    )
+    pad_url = models.URLField(
+        verify_exists=False,
+        verbose_name="Pad URL",
+        null=True,
+        blank=True
+    )
     slots = models.IntegerField(default=1)
-    override_break = models.BooleanField(default=False, verbose_name="Override Break",
-                              help_text="If this is a multi-slot meeting, should it be allowed to take place during a break")
+    override_break = models.BooleanField(
+        default=False,
+        verbose_name="Override Break",
+        help_text="If this is a multi-slot meeting, should it be"
+        "allowed to take place during a break"
+    )
     virtual_meeting = models.BooleanField(
         help_text="If virtual summit is true, this will not override it"
     )
-    approved = models.CharField(max_length=10, choices=REVIEW_CHOICES,
-                              null=True, default='PENDING')
+    approved = models.CharField(
+        max_length=10,
+        choices=REVIEW_CHOICES,
+        null=True,
+        default='PENDING'
+    )
     private = models.BooleanField(default=False)
     private_key = models.CharField(max_length=32, null=True, blank=True)
 
@@ -142,16 +174,35 @@
 
     # FIXME attendees must be for the same summit
     # (will require js magic in admin to refresh the boxes)
-    drafter = models.ForeignKey(Attendee, null=True, blank=True,
-                                related_name='drafter_set')
-    assignee = models.ForeignKey(Attendee, null=True, blank=True,
-                                 related_name='assignee_set')
-    approver = models.ForeignKey(Attendee, null=True, blank=True,
-                                 related_name='approver_set')
-    scribe = models.ForeignKey(Attendee, null=True, blank=True,
-                                 related_name='scribe_set')
-    participants = models.ManyToManyField(Attendee, blank=True,
-                                          through='Participant')
+    drafter = models.ForeignKey(
+        Attendee,
+        null=True,
+        blank=True,
+        related_name='drafter_set'
+    )
+    assignee = models.ForeignKey(
+        Attendee,
+        null=True,
+        blank=True,
+        related_name='assignee_set'
+    )
+    approver = models.ForeignKey(
+        Attendee,
+        null=True,
+        blank=True,
+        related_name='approver_set'
+    )
+    scribe = models.ForeignKey(
+        Attendee,
+        null=True,
+        blank=True,
+        related_name='scribe_set'
+    )
+    participants = models.ManyToManyField(
+        Attendee,
+        blank=True,
+        through='Participant'
+    )
     launchpad_blueprint_id = models.IntegerField(blank=True, null=True)
 
     class Meta:
@@ -169,7 +220,8 @@
             return
 
         if not self.private_key:
-            import hashlib, random
+            import hashlib
+            import random
             meeting_hash = hashlib.md5()
             meeting_hash.update(str(self.pk))
             meeting_hash.update(self.name)
@@ -185,7 +237,8 @@
         if self.pad_url is not None and self.pad_url != '':
             return self.pad_url
         elif self.private:
-            import hashlib, random
+            import hashlib
+            import random
             meeting_hash = hashlib.md5()
             meeting_hash.update(str(self.pk))
             meeting_hash.update(self.name)
@@ -362,7 +415,10 @@
             # fetch to update the title
             # Now, LP has an API, we're stopping the sceen scrape :)
             try:
-                apiurl = spec_url.replace('blueprints.launchpad.net', 'api.launchpad.net/devel') + '?ws.accept=application/json'
+                apiurl = spec_url.replace(
+                    'blueprints.launchpad.net',
+                    'api.launchpad.net/devel'
+                ) + '?ws.accept=application/json'
                 lpdata = urllib2.urlopen(apiurl)
                 data = json.load(lpdata)
                 if 'title' in data:
@@ -397,7 +453,8 @@
         if assignee:
             try:
                 self.assignee = self.summit.attendee_set.get(
-                    user__username__exact=assignee)
+                    user__username__exact=assignee
+                )
             except ObjectDoesNotExist:
                 pass
 
@@ -406,7 +463,8 @@
         if approver:
             try:
                 self.approver = self.summit.attendee_set.get(
-                    user__username__exact=approver)
+                    user__username__exact=approver
+                )
             except ObjectDoesNotExist:
                 pass
 
@@ -422,18 +480,21 @@
 
             try:
                 attendee = self.summit.attendee_set.get(
-                    user__username__exact=username)
+                    user__username__exact=username
+                )
 
                 try:
                     participant = self.participant_set.get(
-                        attendee=attendee)
+                        attendee=attendee
+                    )
                 except ObjectDoesNotExist:
                     participant = self.participant_set.create(
-                        attendee=attendee)
+                        attendee=attendee
+                    )
                 except:
                     participant = self.participant_set.filter(
-                        attendee=attendee)[0]
-
+                        attendee=attendee
+                    )[0]
 
                 participant.from_launchpad = True
                 if required:
@@ -444,11 +505,15 @@
             except ObjectDoesNotExist:
                 pass
 
-        self.participant_set.filter(from_launchpad=True).filter(~models.Q(attendee__user__username__in=from_lp)).delete()
+        self.participant_set.filter(
+            from_launchpad=True
+        ).filter(
+            ~models.Q(attendee__user__username__in=from_lp)
+        ).delete()
 
         self.save()
 
-    def check_schedule(self, slot, room, with_interested = False):
+    def check_schedule(self, slot, room, with_interested=False):
         """Check whether we can schedule this meeting in the given slot
         and room."""
         missing = set()
@@ -456,7 +521,8 @@
         slots = [slot]
         if self.slots > 1:
             slots.extend(s for s
-                         in self.summit.slot_set.filter(start_utc__gte=slot.end_utc).order_by('start_utc')
+                         in self.summit.slot_set.filter(
+                             start_utc__gte=slot.end_utc).order_by('start_utc')
                          if s.start.date() == slot.start.date())
         if len(slots) < self.slots:
             raise Meeting.SchedulingError("Insufficient slots available")
@@ -470,16 +536,23 @@
                 continue
             if this_slot.type not in ('open', 'plenary'):
                 raise Meeting.SchedulingError("Slot not available")
-            if this_slot.type == 'plenary' and self.type not in ('plenary', 'talk', 'special'):
+            if this_slot.type == 'plenary' and self.type not in (
+                'plenary',
+                'talk',
+                'special'
+            ):
                 raise Meeting.SchedulingError(
-                    "Not a plenary event, talk or special event")
+                    "Not a plenary event, talk or special event"
+                )
 
             # Check that the room is not already in use
             try:
                 existing = room.agenda_set.get(slot=this_slot)
                 if existing.meeting != self:
-                    raise Meeting.SchedulingError("Room is in use by %s"
-                                                  % existing.meeting)
+                    raise Meeting.SchedulingError(
+                        "Room is in use by %s"
+                        % existing.meeting
+                    )
             except ObjectDoesNotExist:
                 pass
 
@@ -496,8 +569,10 @@
                 for agenda in prev_slot.agenda_set.filter(room=room):
                     if agenda.meeting != self \
                             and agenda.meeting.slots >= (distance - breaks):
-                        raise Meeting.SchedulingError("Room is in use by %s"
-                                                      % agenda.meeting)
+                        raise Meeting.SchedulingError(
+                            "Room is in use by %s"
+                            % agenda.meeting
+                        )
 
             # Check that the room is available
             if not room.available(this_slot):
@@ -505,15 +580,21 @@
 
             if self.requires_dial_in:
                 if not room.has_dial_in:
-                    raise Meeting.SchedulingError("Room has no dial-in capability")
+                    raise Meeting.SchedulingError(
+                        "Room has no dial-in capability"
+                    )
 
             # Work out who is busy in this slot
             busy = set()
             for agenda in this_slot.agenda_set.all():
                 if agenda.meeting != self:
-                    busy.update([a.pk for a in agenda.meeting.required_attendees])
+                    busy.update(
+                        [a.pk for a in agenda.meeting.required_attendees]
+                    )
                     if with_interested:
-                        busy.update([a.pk for a in agenda.meeting.get_participants_by_level('INTERESTED')])
+                        busy.update(
+                            [a.pk for a in agenda.meeting.get_participants_by_level('INTERESTED')]
+                        )
             slot_num = all_slots.index(this_slot)
             for i in range(slot_num, 0, -1):
                 distance = 2 + slot_num - i
@@ -524,9 +605,13 @@
                 for agenda in prev_slot.agenda_set.all():
                     if agenda.meeting != self \
                             and agenda.meeting.slots >= distance:
-                        busy.update([a.pk for a in agenda.meeting.required_attendees])
+                        busy.update(
+                            [a.pk for a in agenda.meeting.required_attendees]
+                        )
                         if with_interested:
-                            busy.update([a.pk for a in agenda.meeting.get_participants_by_level('INTERESTED')])
+                            busy.update(
+                                [a.pk for a in agenda.meeting.get_participants_by_level('INTERESTED')]
+                            )
             # Check that all required attendees are free in this slot
             for attendee in self.required_attendees:
                 if not attendee.available(this_slot):
@@ -544,12 +629,21 @@
             def check_not_same_track(other_slot, relative_position):
                 type_exceptions = ('presentation', 'plenary', 'talk')
                 if other_slot is not None and self.type not in type_exceptions:
-                    for agenda in other_slot.agenda_set.filter(room__exact=room).exclude(
-                            meeting__exact=self).filter(meeting__tracks__in=self.tracks.all()):
+                    for agenda in other_slot.agenda_set.filter(
+                        room__exact=room
+                    ).exclude(
+                        meeting__exact=self
+                    ).filter(
+                        meeting__tracks__in=self.tracks.all()
+                    ):
                         if agenda.meeting.tracks.filter(
-                                pk__in=self.tracks.all()).exclude(allow_adjacent_sessions=True).count() > 0:
+                            pk__in=self.tracks.all()
+                        ).exclude(
+                            allow_adjacent_sessions=True
+                        ).count() > 0:
                             raise Meeting.SchedulingError(
-                                "Same track in the %s slot" % relative_position)
+                                "Same track in the %s slot" % relative_position
+                            )
 
             check_not_same_track(this_slot.previous(), "previous")
             check_not_same_track(this_slot.next(), "next")
@@ -583,21 +677,38 @@
         """Try to schedule this meeting in one of the given rooms."""
         today = datetime.now()
         for room in rooms:
-            for slot in self.summit.slot_set.filter(type__exact='open',start_utc__gt=today):
+            for slot in self.summit.slot_set.filter(
+                type__exact='open',
+                start_utc__gt=today
+            ):
                 try:
                     room.agenda_set.get(slot=slot)
                 except room.agenda_set.model.DoesNotExist:
                     try:
-                        missing = self.check_schedule(slot, room, with_interested)
+                        missing = self.check_schedule(
+                            slot,
+                            room,
+                            with_interested
+                        )
                         if len(missing):
-                            raise Meeting.SchedulingError("Required people not available: %s"
-                                                          % ', '.join(m.user.username for m in missing))
+                            raise Meeting.SchedulingError(
+                                "Required people not available: %s"
+                                % ', '.join(m.user.username for m in missing)
+                            )
 
                         print "Schedule %s in %s at %s" % (self, room, slot)
                         room.agenda_set.create(
-                            slot=slot, meeting=self, auto=True)
+                            slot=slot,
+                            meeting=self,
+                            auto=True
+                        )
                         return True
                     except Meeting.SchedulingError, e:
-                        print "-- could not schedule %s in %s at %s (%s)" % (self, room, slot, e)
+                        print "-- could not schedule %s in %s at %s (%s)" % (
+                            self,
+                            room,
+                            slot,
+                            e
+                        )
 
         return False

=== modified file 'summit/schedule/models/participantmodel.py'
--- summit/schedule/models/participantmodel.py	2012-07-12 18:36:38 +0000
+++ summit/schedule/models/participantmodel.py	2013-02-26 19:00:29 +0000
@@ -1,5 +1,5 @@
 # The Summit Scheduler web application
-# Copyright (C) 2008 - 2012 Ubuntu Community, Canonical Ltd
+# Copyright (C) 2008 - 2013 Ubuntu Community, Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -25,24 +25,30 @@
 
 
 HELP_TEXT = {
-    "attendee": ("Be sure to choose the attendee from the correct "
+    "attendee": (
+        "Be sure to choose the attendee from the correct "
         "event. If the person is not listed for the event in question "
         "then they are not known to be attending yet, and have to "
-        "sign up to attend."),
-    "required": ("The person is required to attend the session. "
+        "sign up to attend."
+    ),
+    "required": (
+        "The person is required to attend the session. "
         "If this is set the scheduler will attempt to ensure that "
         "the person is able to attend. If it is not checked then "
         "the scheduler won't consider the person when deciding "
-        "where the meeting can go on the schedule."),
-    "from_launchpad": ("Set to indicate the participant comes from "
+        "where the meeting can go on the schedule."
+    ),
+    "from_launchpad": (
+        "Set to indicate the participant comes from "
         "a subscription to the Launchpad blueprint. Don't set this "
         "if you are adding the participant, as they may end up "
-        "getting deleted if you do."),
+        "getting deleted if you do."
+    ),
 }
 
 
 class Participant(models.Model):
-    
+
     PARTICIPATION_CHOICES = (
         (u'ATTENDING', u'Attending'),
         (u'INTERESTED', u'Very interested in attending'),
@@ -50,12 +56,18 @@
     )
 
     meeting = models.ForeignKey(Meeting)
-    attendee = models.ForeignKey(Attendee,
-            help_text=HELP_TEXT["attendee"])
-    participation = models.CharField(max_length=32, choices=PARTICIPATION_CHOICES,
-            null=True, blank=False, default='ATTENDING')
-    from_launchpad = models.BooleanField(default=False,
-            help_text=HELP_TEXT["from_launchpad"])
+    attendee = models.ForeignKey(Attendee, help_text=HELP_TEXT["attendee"])
+    participation = models.CharField(
+        max_length=32,
+        choices=PARTICIPATION_CHOICES,
+        null=True,
+        blank=False,
+        default='ATTENDING'
+    )
+    from_launchpad = models.BooleanField(
+        default=False,
+        help_text=HELP_TEXT["from_launchpad"]
+    )
 
     class Meta:
         app_label = 'schedule'

=== modified file 'summit/schedule/models/roommodel.py'
--- summit/schedule/models/roommodel.py	2012-02-06 18:25:01 +0000
+++ summit/schedule/models/roommodel.py	2013-02-26 19:00:29 +0000
@@ -51,8 +51,13 @@
                                    verbose_name="End (UTC)")
     icecast_url = models.URLField(blank=True, verify_exists=False,
                                   verbose_name="Icecast URL")
-    irc_channel = models.CharField(max_length=50, verbose_name="IRC Channel", blank=True, help_text="Please enter the IRC channel without the #")
-    
+    irc_channel = models.CharField(
+        max_length=50,
+        verbose_name="IRC Channel",
+        blank=True,
+        help_text="Please enter the IRC channel without the #"
+    )
+
     # Whether the room has dial-in capability
     has_dial_in = models.BooleanField(default=False)
 

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2013-02-21 23:10:17 +0000
+++ summit/schedule/models/summitmodel.py	2013-02-26 19:00:29 +0000
@@ -1,5 +1,5 @@
 # The Summit Scheduler web application
-# Copyright (C) 2008 - 2012 Ubuntu Community, Canonical Ltd
+# Copyright (C) 2008 - 2013 Ubuntu Community, Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as

=== modified file 'summit/schedule/models/trackmodel.py'
--- summit/schedule/models/trackmodel.py	2012-12-06 22:24:06 +0000
+++ summit/schedule/models/trackmodel.py	2013-02-26 19:00:29 +0000
@@ -28,7 +28,12 @@
     summit = models.ForeignKey(Summit)
     title = models.CharField(max_length=100)
     slug = models.CharField(max_length=100, null=True, blank=False)
-    color = models.CharField(max_length=6, null=False, blank=False, default='FFFFFF')
+    color = models.CharField(
+        max_length=6,
+        null=False,
+        blank=False,
+        default='FFFFFF'
+    )
     description = models.TextField(max_length=1000, blank=False, null=True)
     allow_adjacent_sessions = models.BooleanField(default=False)
 

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-02-21 23:10:17 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-02-26 19:00:29 +0000
@@ -72,7 +72,9 @@
     <h2>{{ meeting.title }}</h2>
     <div id="description">
         {{ meeting.description|markdown:'safe' }}
+        {% if required %}
         <h3><a href="{{ meeting.hangout_url }}">Join the Hangout on Air</a></h3>
+        {% endif %}
     </div>
 
 </section>

=== modified file 'summit/schedule/tests/__init__.py'
--- summit/schedule/tests/__init__.py	2013-02-22 01:22:19 +0000
+++ summit/schedule/tests/__init__.py	2013-02-26 19:00:29 +0000
@@ -15,3 +15,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from tests import *
+from test_virtual import *

=== added file 'summit/schedule/tests/test_virtual.py'
--- summit/schedule/tests/test_virtual.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/tests/test_virtual.py	2013-02-26 19:00:29 +0000
@@ -0,0 +1,572 @@
+# The Summit Scheduler web application
+# Copyright (C) 2008 - 2013 Ubuntu Community, Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import datetime
+
+from django import test as djangotest
+from django.core.urlresolvers import reverse
+from django.contrib.auth.models import User
+from django.test.client import Client
+
+from model_mommy import mommy as factory
+
+from summit.schedule.models import (
+    Summit,
+    Slot,
+    Attendee,
+    Meeting,
+    Track,
+    Room,
+    Lead,
+    Participant,
+    Agenda,
+)
+
+
+class VirtualSummitTestCase(djangotest.TestCase):
+    """
+    Tests for the virtual meeting display
+    """
+
+    c = Client()
+
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        week = datetime.timedelta(days=5)
+        self.summit = factory.make_one(
+            Summit,
+            name='uds-virt',
+            virtual_summit=True,
+            date_start=now,
+            date_end=now + week,
+        )
+
+        self.slot = factory.make_one(
+            Slot,
+            start_utc=now+one_hour,
+            end_utc=now+(2*one_hour),
+            type='open',
+            summit=self.summit
+        )
+        self.track = factory.make_one(Track, summit=self.summit)
+        self.room = factory.make_one(
+            Room,
+            summit=self.summit,
+            type='open',
+            irc_channel='test-channel',
+        )
+
+        self.meeting1 = factory.make_one(
+            Meeting,
+            summit=self.summit,
+            name='meeting-non-virt',
+            private=False,
+            requires_dial_in=False,
+            spec_url='',
+            pad_url='http://pad.com/1'
+        )
+        self.meeting1.tracks = [self.track]
+
+        self.user1 = factory.make_one(
+            User,
+            username='testuser',
+            first_name='Test',
+            last_name='User',
+            is_active=True,
+            is_superuser=False,
+        )
+        self.user1.set_password('password')
+        self.user1.save()
+        self.attendee1 = factory.make_one(
+            Attendee,
+            summit=self.summit,
+            user=self.user1,
+            start_utc=now,
+            end_utc=now+week
+        )
+
+        self.agenda1 = factory.make_one(
+            Agenda,
+            slot=self.slot,
+            meeting=self.meeting1,
+            room=self.room
+        )
+
+    def tearDown(self):
+        self.client.logout()
+
+    def login(self):
+        logged_in = self.c.login(
+            username='testuser',
+            password='password')
+        self.assertTrue(logged_in)
+
+    def view_and_save_edit_meeting_hangout_form(self):
+        """
+        Tests that a user with proper permissions can save the
+        edit_meeting_hangout form
+        """
+        # View the edit meeting hangout form
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'schedule/edit_hangout.html')
+
+        # Define data to fill our the form
+        hangout_url = 'http://hangouturl.com'
+        broadcast_url = 'http://broadcasturl.com'
+
+        # Post the form
+        post = self.c.post(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            data={
+                'broadcast_url': broadcast_url,
+                'hangout_url': hangout_url,
+            }
+        )
+
+        # A successful post should redirect to the meeting page
+        response = self.view_virtual_meeting_page()
+        redirect_url = reverse(
+            'summit.schedule.views.meeting',
+            args=rev_args
+        )
+        self.assertEqual(post.status_code, 302)
+        self.assertRedirects(
+            post,
+            redirect_url,
+        )
+        redirect_responseonse = self.c.get(redirect_url)
+
+        # Verify that the new data appears on the meeting page
+        self.assertEqual(redirect_responseonse.status_code, 200)
+        self.assertIn(broadcast_url, redirect_responseonse.content)
+        self.assertIn(hangout_url, redirect_responseonse.content)
+        self.assertIn('Join the Hangout on Air', redirect_responseonse.content)
+
+    def view_virtual_meeting_page(self):
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.meeting',
+                args=rev_args
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'schedule/virtual_meeting.html')
+        self.assertTemplateNotUsed(response, 'schedule/meeting.html')
+
+        return response
+
+    def test_virtual_mtg_true_display_virtual_page(self):
+        """
+        Tests that a meeting with virtual_summit=True and virtual_meeting=True
+        displays the virtual meeting page.
+        """
+
+        self.meeting1.virtual_meeting = True
+        self.meeting1.save()
+
+        response = self.view_virtual_meeting_page()
+
+    def test_virtual_mtg_false_display_virtual_page(self):
+        """
+        Tests that a meeting with virtual_summit=True and virtual_meeting=False
+        displays the virtual meeting page.
+        """
+
+        self.meeting1.virtual_meeting = False
+        self.meeting1.save()
+        response = self.view_virtual_meeting_page()
+
+    def test_lead_has_edit_meeting_hangout_link(self):
+        """
+        Tests that the track lead for the meeting has the link to add the
+        hangout URLs
+        """
+
+        self.lead = factory.make_one(
+            Lead,
+            summit=self.summit,
+            track=self.track,
+            lead=self.attendee1,
+        )
+
+        self.login()
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.view_virtual_meeting_page()
+        self.assertIn(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            response.content
+        )
+        self.assertIn('Edit Hangout Details', response.content)
+
+    def test_drafter_has_edit_meeting_hangout_link(self):
+        """
+        Tests that the meeting drafter has the link to add hangout URLs
+        """
+
+        self.meeting1.drafter = self.attendee1
+        self.meeting1.save()
+
+        self.login()
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.view_virtual_meeting_page()
+        self.assertContains(
+            response,
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            1
+        )
+        self.assertContains(response, 'Edit Hangout Details', 1)
+
+    def test_manager_has_edit_meeting_hangout_link(self):
+        """
+        Tests that a Summit Manager has the link to add hangout URLs
+        """
+
+        self.summit.managers.add(self.user1)
+
+        self.login()
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.view_virtual_meeting_page()
+        self.assertIn(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            response.content
+        )
+        self.assertIn('Edit Hangout Details', response.content)
+
+    def test_scheduler_has_edit_meeting_hangout_link(self):
+        """
+        Tests that a Summit Scheduler has the link to add hangout URLs
+        """
+
+        self.summit.schedulers.add(self.user1)
+
+        self.login()
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.view_virtual_meeting_page()
+        self.assertIn(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            response.content
+        )
+        self.assertIn('Edit Hangout Details', response.content)
+
+    def test_regular_user_does_not__have_edit_meeting_hangout_link(self):
+        """
+        Tests that a regular Summit user is not able to see the edit the
+        hangout link
+        """
+
+        self.login()
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.view_virtual_meeting_page()
+        self.assertContains(
+            response,
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            0
+        )
+        self.assertContains(response, 'Edit Hangout Details', 0)
+
+    def test_non_logged_in_user_does_not_have_edit_meeting_hangout_link(self):
+        """
+        Tests that a non-logged in user is not able to see the edit the hangout
+        link
+        """
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.view_virtual_meeting_page()
+        self.assertContains(
+            response,
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+            0
+        )
+        self.assertContains(response, 'Edit Hangout Details', 0)
+
+    def test_lead_can_edit_meeting_hangout(self):
+        """
+        Tests that the track lead for the meeting can add the hangout URLs
+        """
+
+        self.lead = factory.make_one(
+            Lead,
+            summit=self.summit,
+            track=self.track,
+            lead=self.attendee1,
+        )
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='REQUIRED'
+        )
+
+        self.login()
+
+        self.view_and_save_edit_meeting_hangout_form()
+
+    def test_drafter_can_edit_meeting_hangout(self):
+        """
+        Tests that the meeting drafter can add hangout URLs
+        """
+
+        self.meeting1.drafter = self.attendee1
+        self.meeting1.save()
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='REQUIRED'
+        )
+        self.login()
+
+        self.view_and_save_edit_meeting_hangout_form()
+
+    def test_manager_can_edit_meeting_hangout(self):
+        """
+        Tests that a Summit Manager can add hangout URLs
+        """
+
+        self.summit.managers.add(self.user1)
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='REQUIRED'
+        )
+        self.login()
+
+        self.view_and_save_edit_meeting_hangout_form()
+
+    def test_scheduler_can_edit_meeting_hangout(self):
+        """
+        Tests that a Summit Scheduler can add hangout URLs
+        """
+
+        self.summit.schedulers.add(self.user1)
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='REQUIRED'
+        )
+        self.login()
+
+        self.view_and_save_edit_meeting_hangout_form()
+
+    def test_regular_user_can_not_edit_meeting_hangout(self):
+        """
+        Tests that a regular Summit user is not able to edit the hangout
+        links
+        """
+
+        self.login()
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+        )
+        self.assertEqual(response.status_code, 302)
+        redirect_args = [self.summit.name, ]
+        redirect_url = reverse(
+            'summit.schedule.views.summit',
+            args=redirect_args
+        )
+        self.assertEqual(
+            response['Location'],
+            'http://testserver' + redirect_url,
+        )
+
+    def test_non_logged_in_user_can_not_edit_meeting_hangout(self):
+        """
+        Tests that a non-logged in user is not able to edit the hangout
+        links
+        """
+
+        rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.edit_meeting_hangout',
+                args=rev_args
+            ),
+        )
+        self.assertEqual(response.status_code, 302)
+        redirect_url = reverse(
+            'summit.schedule.views.edit_meeting_hangout',
+            args=rev_args
+        )
+        self.assertEqual(
+            response['Location'],
+            'http://testserver/openid/login?next=' + redirect_url,
+        )
+
+    def test_webchat(self):
+        """
+        Tests that the webchat client is displayed on the virtual meeting page
+        with the proper room
+        """
+
+        response = self.view_virtual_meeting_page()
+        self.assertIn(
+            'http://webchat.freenode.net?channels=' +
+            self.room.irc_channel +
+            '&uio=Mj10cnVlJjQ9dHJ1ZSY5PXRydWUmMTA9' +
+            'dHJ1ZSYxMz1mYWxzZSYxND1mYWxzZQbf',
+            response.content
+        )
+
+    def test_hangout_broadcast_url(self):
+        """
+        Tests that the hangout broadcast is displayed on the page
+        """
+
+        self.meeting1.broadcast_url = 'http://broadcasturl.com'
+        self.meeting1.save()
+
+        response = self.view_virtual_meeting_page()
+        self.assertIn(self.meeting1.broadcast_url, response.content)
+
+    def test_participant_essential_join_url(self):
+        """
+        Tests that a participant who is essential is shown the link to join
+        the hangout
+        """
+
+        self.meeting1.hangout_url = 'http://hangouturl.com'
+        self.meeting1.save()
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='REQUIRED'
+        )
+
+        self.login()
+
+        response = self.view_virtual_meeting_page()
+        self.assertIn(self.meeting1.hangout_url, response.content)
+        self.assertIn('Join the Hangout on Air', response.content)
+
+    def test_interested_participant_no_join_url(self):
+        """
+        Tests that a non-essential participant is not shown the link to join
+        the hangout
+        """
+
+        self.meeting1.hangout_url = 'http://hangouturl.com'
+        self.meeting1.save()
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='INTERESTED'
+        )
+
+        self.login()
+
+        response = self.view_virtual_meeting_page()
+        self.assertNotIn(self.meeting1.hangout_url, response.content)
+        self.assertNotIn('Join the Hangout on Air', response.content)
+
+    def test_attending_participant_no_join_url(self):
+        """
+        Tests that a non-essential (attending) participant is not shown
+        the link to join the hangout
+        """
+
+        self.meeting1.hangout_url = 'http://hangouturl.com'
+        self.meeting1.save()
+
+        self.participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee1,
+            participation='ATTENDING'
+        )
+
+        self.login()
+
+        response = self.view_virtual_meeting_page()
+        self.assertNotIn(self.meeting1.hangout_url, response.content)
+        self.assertNotIn('Join the Hangout on Air', response.content)
+
+    def test_non_participant_no_join_url(self):
+        """
+        Tests that a participant not attending the meeting is not shown the
+        link to join the hangout
+        """
+
+        self.meeting1.hangout_url = 'http://hangouturl.com'
+        self.meeting1.save()
+
+        self.login()
+
+        response = self.view_virtual_meeting_page()
+        self.assertNotIn(self.meeting1.hangout_url, response.content)
+        self.assertNotIn('Join the Hangout on Air', response.content)
+
+    def test_not_logged_in_no_join_url(self):
+        """
+        Tests that a non-essential participant is not shown the link to join
+        the hangout
+        """
+
+        self.meeting1.hangout_url = 'http://hangouturl.com'
+        self.meeting1.save()
+
+        response = self.view_virtual_meeting_page()
+        self.assertNotIn(self.meeting1.hangout_url, response.content)
+        self.assertNotIn('Join the Hangout on Air', response.content)
+
+    def test_etherpad(self):
+        """
+        Tests that the etherpad client is displayed on the virtual meeting page
+        """
+
+        response = self.view_virtual_meeting_page()
+        self.assertIn(self.meeting1.pad_url, response.content)

=== modified file 'summit/schedule/tests/tests.py'
--- summit/schedule/tests/tests.py	2013-02-22 01:22:19 +0000
+++ summit/schedule/tests/tests.py	2013-02-26 19:00:29 +0000
@@ -1728,7 +1728,12 @@
         self.assertEquals(0, self.private_meeting.agenda_set.count())
 
         # Private rooms should not ever be autoscheduled
-        self.assertEquals(0, Agenda.objects.filter(room__type='private').count())
+        self.assertEquals(
+            0,
+            Agenda.objects.filter(
+                room__type='private'
+            ).count()
+        )
 
     def test_no_available_private_room(self):
         '''
@@ -1989,7 +1994,8 @@
         )
 
     def tearDown(self):
-        # Cached requests cause render.py to return old data, so clear the cache
+        # Cached requests cause render.py to return old data.
+        # Let's clear the cache
         if hasattr(cache, 'clear'):
             cache.clear()
         # Older django didn't have .clear, but locmem cache did have ._cull

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-02-21 23:10:17 +0000
+++ summit/schedule/views.py	2013-02-26 19:00:29 +0000
@@ -1,5 +1,5 @@
 # The Summit Scheduler web application
-# Copyright (C) 2008 - 2012 Ubuntu Community, Canonical Ltd
+# Copyright (C) 2008 - 2013 Ubuntu Community, Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -464,8 +464,12 @@
     tracks = meeting.tracks.all()
     user_is_attending = attendee is not None and attendee in meeting.attendees
     user_is_participating = attendee is not None and attendee in [p.attendee for p in participants if not p.from_launchpad]
-
-    if attendee == meeting.drafter:
+    required = False
+
+    if attendee is not None and attendee in meeting.required_attendees:
+        required = True
+
+    if attendee is not None and attendee == meeting.drafter:
         drafter = True
     else:
         drafter = False
@@ -478,6 +482,7 @@
         'attendees': attendees,
         'user_is_attending': user_is_attending,
         'user_is_participating': user_is_participating,
+        'required': required,
         'tracks': tracks,
         'ETHERPAD_HOST': summit.etherpad,
         'summit_organizer': summit.is_organizer(attendee),
@@ -661,8 +666,11 @@
     context = {
         'past_summit': pastsummit,
     }
-    return render_to_response("schedule/past_summit.html", context,
-                          context_instance=RequestContext(request))
+    return render_to_response(
+        "schedule/past_summit.html",
+        context,
+        context_instance=RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -695,8 +703,11 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/create_meeting.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/create_meeting.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -721,8 +732,11 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/propose_meeting.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/propose_meeting.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -755,8 +769,11 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/org_edit_meeting.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/org_edit_meeting.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -783,8 +800,11 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/edit_meeting.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/edit_meeting.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -818,8 +838,11 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/edit_hangout.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/edit_hangout.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_required
@@ -877,8 +900,11 @@
         'summit': summit,
         'form': form,
     }
-    return render_to_response('schedule/meeting_review.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/meeting_review.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_required
@@ -902,8 +928,11 @@
         'drafter': drafter,
         'attendee': attendee,
     }
-    return render_to_response("schedule/mine.html", context,
-                              context_instance=RequestContext(request))
+    return render_to_response(
+        "schedule/mine.html",
+        context,
+        context_instance=RequestContext(request)
+    )
 
 
 @summit_required
@@ -968,8 +997,11 @@
         'meeting.title': meeting.title,
         'meeting': meeting,
     }
-    return render_to_response('schedule/attend.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/attend.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_required
@@ -1054,8 +1086,11 @@
         'meeting': meeting,
         'attendee': attendee,
     }
-    return render_to_response('schedule/org_attend.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/org_attend.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -1081,8 +1116,11 @@
         'meeting.title': meeting.title,
         'meeting': meeting,
     }
-    return render_to_response('schedule/delete_confirm.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/delete_confirm.html',
+        context,
+        RequestContext(request)
+    )
 
 
 @summit_attendee_required
@@ -1114,5 +1152,8 @@
         'summit': summit
     }
 
-    return render_to_response('schedule/confirm_deletion.html',
-                          context, RequestContext(request))
+    return render_to_response(
+        'schedule/confirm_deletion.html',
+        context,
+        RequestContext(request)
+    )