codeforlife-portal 1.0.0.post.dev485__tar.gz → 1.0.0.post.dev489__tar.gz

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post.dev485
+Version: 1.0.0.post.dev489
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/codeforlife_portal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post0.dev485
+Version: 1.0.0.post0.dev489
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/codeforlife_portal.egg-info/SOURCES.txt

@@ -555,6 +555,7 @@ portal/templates/redesign/teach_new/onboarding_students.html
 portal/templates/redesign/teach_new/teacher_dismiss_students_new.html
 portal/templates/redesign/teach_new/teacher_edit_class_new.html
 portal/templates/redesign/teach_new/teacher_edit_student_new.html
+portal/templates/redesign/teach_new/teacher_move_all_classes_new.html
 portal/templates/redesign/teach_new/teacher_move_class_new.html
 portal/templates/redesign/teach_new/teacher_move_students_new.html
 portal/templates/redesign/teach_new/teacher_move_students_to_class_new.html
@@ -650,6 +651,7 @@ portal/tests/pageObjects/portal/teach/edit_student_page.py
 portal/tests/pageObjects/portal/teach/edit_student_password_page.py
 portal/tests/pageObjects/portal/teach/move_class_page.py
 portal/tests/pageObjects/portal/teach/move_class_page_new.py
+portal/tests/pageObjects/portal/teach/move_classes_page_new.py
 portal/tests/pageObjects/portal/teach/move_students_disambiguate_page.py
 portal/tests/pageObjects/portal/teach/move_students_disambiguate_page_new.py
 portal/tests/pageObjects/portal/teach/move_students_page.py

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/_version.py

@@ -11,8 +11,8 @@ version_json = '''
 {
  "dirty": false,
  "error": null,
- "full-revisionid": "3668346e26acc734fb77e588bca50a346f433b09",
- "version": "1.0.0.post.dev485"
+ "full-revisionid": "5c6dfcb91e3b082431a8c5faadf19023a2a583fa",
+ "version": "1.0.0.post.dev489"
 }
 '''  # END VERSION_JSON
 

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/static/portal/sass/styles.scss

@@ -15,12 +15,19 @@ $color-quote-text: $color-teacher-blue;
 $color-quote-name: $color-text-grey;
 //Buttons
 $color-button-primary-action-general-play: $color-teacher-blue;
+$color-button-primary-action-general-play-hover: #002284;
 $color-button-primary-action-general-educate: $color-student-orange;
+$color-button-primary-action-general-educate-hover: #c15b00;
 $color-button-primary-action-positive: #7ed321;
+$color-button-primary-action-positive-hover: #2dbf00;
 $color-button-primary-action-negative: #ff637d;
+$color-button-primary-action-negative-hover: #d32a46;
 $color-button-primary-action-danger: #f00;
+$color-button-primary-action-danger-hover: #df0531;
 $color-button-primary-action-navigation: $color-text-grey;
+$color-button-primary-action-navigation-hover: #000;
 $color-button-primary-action-setup: #fab300;
+$color-button-primary-action-setup-hover: #ff9500;
 $color-button-secondary-border-light: #fff;
 $color-button-secondary-border-dark: $color-text-grey;
 $color-button-border-teacher: $color-teacher-blue;
@@ -335,6 +342,10 @@ button,
   background-color: transparent;
   border-bottom: 6px solid $color-background-secondary;
   border-radius: 0;
+
+  &:hover {
+    font-weight: 600;
+  }
 }
 
 .button--menu--disabled {
@@ -390,42 +401,74 @@ button,
 .button--primary--general-play {
   background: $color-button-primary-action-general-play;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-general-play-hover;
+  }
 }
 
 .button--primary--general-educate {
   background: $color-button-primary-action-general-educate;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-general-educate-hover;
+  }
 }
 
 .button--primary--positive {
   background: $color-button-primary-action-positive;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-positive-hover;
+  }
 }
 
 .button--primary--negative {
   background: $color-button-primary-action-negative;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-negative-hover;
+  }
 }
 
 .button--primary--danger,
 .ui-dialog-buttonset button {
   background: $color-button-primary-action-danger;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-danger-hover;
+  }
 }
 
 .button--primary--navigation {
   background: $color-button-primary-action-navigation;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-navigation-hover;
+  }
 }
 
 .button--primary--setup {
   background: $color-button-primary-action-setup;
   color: $color-text-secondary;
+
+  &:hover {
+    background: $color-button-primary-action-setup-hover;
+  }
 }
 
 .button--secondary {
   background-color: transparent;
   border: 1px solid;
+
+  &:hover {
+    border: 2px solid;
+  }
 }
 
 .button--secondary--light {
@@ -446,6 +489,10 @@ button,
   }
 }
 
+.home-icon:hover {
+  color: $color-background-primary;
+}
+
 .button--secondary--no-border {
   border-color: transparent;
   color: $color-text-tertiary;
@@ -1216,10 +1263,23 @@ td {
   border: 2px solid $color-text-secondary;
 }
 
+.secondary-table {
+  table,
+  th,
+  td {
+    border: 2px solid $color-background-tint-primary;
+  }
+}
+
 .header-primary {
   th {
     background-color: $color-table-header-primary;
   }
+
+  td {
+    background-color: $color-background-secondary;
+  }
+
 }
 
 .header-secondary {

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/templates/redesign/base_new.html

@@ -86,7 +86,7 @@
         <div class="menu__left-side col-sm-6 col-sm-offset-2">
             <button class="hamburger" data-toggle="collapse" data-target="#menu-items"></button>
             <a href="{% url 'home_new' %}"><img class="logo-horizontal" src='{% static "portal/img_new/logo-horizontal.png" %}'></a>
-            <a href="{% url 'home_new' %}" class="button--regular button--secondary button--secondary--no-border home-icon"><div class="glyphicon glyphicon-home"></div></a>
+            <a href="{% url 'home_new' %}" class="button--regular button--secondary--no-border home-icon"><div class="glyphicon glyphicon-home"></div></a>
             {% block leftMenuButtons %}
             {% if user|is_logged_in %}
                 {% if user|is_logged_in_as_teacher %}

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/templates/redesign/teach_new/dashboard.html

@@ -77,18 +77,22 @@
         {% else %}
             <h4 class="col-sm-6 col-center">You can see which other teachers in your school or club are registered here. Should you need to leave the
                 school or club, you can do so below.</h4>
+            <form method="post" action="{% url 'organisation_leave_new' %}">
+                {% csrf_token %}
+                <button id="leave_organisation_button" class="button--regular button--secondary button--secondary--dark"
+                        type="submit">Leave school or club</button>
+            </form>
         {% endif %}
     </section>
 
+    {% if is_admin %}
     <div class="background col-sm-7 col-center">
         <h3>These teachers are already part of your school or club</h3>
         <table id="teachers_table" class="header-primary data-primary">
             <tr>
                 <th><p class="body-text">Name</p></th>
                 <th><p class="body-text">Administrator status</p></th>
-                {% if is_admin %}
-                    <th colspan="3"><p class="body-text">Status actions</p></th>
-                {% endif %}
+                <th colspan="3"><p class="body-text">Status actions</p></th>
             </tr>
             {% for coworker in coworkers %}
             <tr>
@@ -96,7 +100,7 @@
                     {% if coworker.new_user == user %}<b>(you)</b>{% endif %}</p></td>
                 <td><p class="small-text">{% if coworker.is_admin %}Administrator{% else %}Standard Teacher{% endif %}{% if coworker.is_admin or is_admin %}
                     ({{ coworker.new_user.email|emaildomain }}){% endif %}</p></td>
-                {% if coworker.new_user != user and is_admin %}
+                {% if coworker.new_user != user %}
                     <td class="cell-center">
                         <button id="kick_button" class="button--small button--primary--danger"
                                 onclick="showRemoveConfirmation('{% url 'organisation_kick_new' coworker.id %}', '{{ coworker.new_user.first_name|striptags | escapejs }}')">
@@ -116,52 +120,72 @@
                                 onclick="showDisable2FAConfirmation('{% url 'teacher_disable_2FA_new' coworker.id %}', '{{ coworker.new_user.first_name|striptags | escapejs}}')">
                             Disable 2FA</button>{% endif %}</td>
                 {% else %}
-                    {% if is_admin %}
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    {% endif %}
+                    <td></td>
+                    <td></td>
+                    <td></td>
                 {% endif %}
             </tr>
             {% endfor %}
         </table>
-        {% if is_admin %}
-            <p class="body-text">Select &lsquo;Remove&rsquo; to delete a teacher from your school or club. You will be able to move any existing classes assigned to that
-                teacher to other teachers in your school or club.</p>
-            <p class="body-text">If another teacher is having problems with their Two Factor Authentication, you can disable it for them by selecting &lsquo;Disable 2FA&rsquo;.
-                We strongly recommend that administrators who are using 2FA ensure there is another administrator who will be able to disable their 2FA should they have problems
-                with their smartphone or tablet.</p>
-        {% endif %}
+        <p class="body-text">Select &lsquo;Remove&rsquo; to delete a teacher from your school or club. You will be able to move any existing classes assigned to that
+            teacher to other teachers in your school or club.</p>
+        <p class="body-text">If another teacher is having problems with their Two Factor Authentication, you can disable it for them by selecting &lsquo;Disable 2FA&rsquo;.
+            We strongly recommend that administrators who are using 2FA ensure there is another administrator who will be able to disable their 2FA should they have problems
+            with their smartphone or tablet.</p>
     </div>
-
-    <div id="requests">
-        <div class="background col-sm-7 col-center">
-            <h3>These teachers have requested to join your school or club</h3>
-            {% if join_requests %}
-                <table id="request_table" class="header-primary data-primary">
-                    <tr>
-                        <th><p class="body-text">Name</p></th>
-                        <th><p class="body-text">Email address</p></th>
-                        <th colspan="2"><p class="body-text">Actions</p></th>
-                    </tr>
-                    {% for join_request in join_requests %}
+    {% else %}
+    <div class="background background--primary secondary-table">
+        <div class="col-sm-7 col-center">
+            <h3>These teachers are already part of your school or club</h3>
+            <table class="header-primary">
+                <tr>
+                    <th><p class="body-text">Name</p></th>
+                    <th><p class="body-text">Administrator status</p></th>
+                </tr>
+                {% for coworker in coworkers %}
+                <tr>
+                    <td><p class="small-text">{{ coworker.title }} {{ coworker.new_user.first_name }} {{ coworker.new_user.last_name }}
+                        {% if coworker.new_user == user %}<b>(you)</b>{% endif %}</p></td>
+                    <td><p class="small-text">{% if coworker.is_admin %}Administrator{% else %}Standard Teacher{% endif %}{% if coworker.is_admin or is_admin %}
+                        ({{ coworker.new_user.email|emaildomain }}){% endif %}</p></td>
+                </tr>
+                {% endfor %}
+            </table>
+        </div>
+    </div>
+    {% endif %}
+
+    {% if is_admin %}
+        {% if join_requests %}
+        <div id="requests">
+            <div class="background col-sm-7 col-center">
+                <h3>These teachers have requested to join your school or club</h3>
+                {% if join_requests %}
+                    <table id="request_table" class="header-primary data-primary">
                         <tr>
-                            <td><p class="small-text">{{ join_request.title }} {{ join_request.new_user.first_name }} {{ join_request.new_user.last_name }}</p></td>
-                            <td><p class="small-text">{{ join_request.new_user.email }}</p></td>
-                            <td class="cell-center">
-                                <a id="allow_button" class="button button--small button--primary--positive"
-                                        href="{% url 'organisation_allow_join_new' join_request.id %}">Allow</a></td>
-                            <td class="cell-center">
-                                <a id="deny_button" class="button button--small button--primary--danger"
-                                        href="{% url 'organisation_deny_join_new' join_request.id %}">Deny</a></td>
+                            <th><p class="body-text">Name</p></th>
+                            <th><p class="body-text">Email address</p></th>
+                            <th colspan="2"><p class="body-text">Actions</p></th>
                         </tr>
-                    {% endfor %}
-                </table>
-            {% else %}
-                <p class="body-text">No teachers have currently requested to join your school or club.</p>
-            {% endif %}
+                        {% for join_request in join_requests %}
+                            <tr>
+                                <td><p class="small-text">{{ join_request.title }} {{ join_request.new_user.first_name }} {{ join_request.new_user.last_name }}</p></td>
+                                <td><p class="small-text">{{ join_request.new_user.email }}</p></td>
+                                <td class="cell-center">
+                                    <a id="allow_button" class="button button--small button-primary button--primary--positive"
+                                            href="{% url 'organisation_allow_join_new' join_request.id %}">Allow</a></td>
+                                <td class="cell-center">
+                                    <a id="deny_button" class="button button--small button-primary button--primary--danger"
+                                            href="{% url 'organisation_deny_join_new' join_request.id %}">Deny</a></td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                {% else %}
+                    <p class="body-text">No teachers have currently requested to join your school or club.</p>
+                {% endif %}
+            </div>
         </div>
-    </div>
+        {% endif %}
 
     <div id="school-details" class="background background--primary">
         <div class="col-sm-7 col-center">
@@ -184,6 +208,7 @@
             </form>
         </div>
     </div>
+    {% endif %}
 </div>
 
 <div id="classes">

codeforlife-portal-1.0.0.post.dev489/portal/templates/redesign/teach_new/teacher_move_all_classes_new.html

@@ -0,0 +1,81 @@
+{% extends 'redesign/teach_new/base_logged_in.html' %}
+{% load static %}
+{% load app_tags %}
+
+{% block dashboard %}
+<a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
+{% endblock dashboard %}
+
+{% block subNav %}
+{{ block.super }}
+<div class="sticky-subnav sub-nav sub-nav--hidden sub-nav--teacher">
+    <a href="{% url 'dashboard' %}#school" class="button button--regular button--secondary button--secondary--light">Your school</a>
+    <a href="{% url 'dashboard' %}#classes" class="button button--regular button--secondary button--secondary--light">Classes</a>
+    <a href="{% url 'dashboard' %}#account" class="button button--regular button--secondary button--secondary--light">Your Account</a>
+</div>
+
+<section class="banner banner--teacher row">
+    <h1 class="col-sm-8 col-sm-offset-2 banner__text--primary">Welcome back, {{ user|make_into_username }}</h1>
+</section>
+<div class="sub-nav sub-nav--teacher">
+    <div class="col-sm-12">
+        <a href="{% url 'dashboard' %}#school" class="button button--regular button--secondary button--secondary--light">Your school</a>
+        <a href="{% url 'dashboard' %}#classes" class="button button--regular button--secondary button--secondary--light">Classes</a>
+        <a href="{% url 'dashboard' %}#account" class="button button--regular button--secondary button--secondary--light">Your Account</a>
+    </div>
+</div>
+{% endblock subNav %}
+
+{% block content %}
+
+<div id="move_all_classes_page"></div>
+
+<section class="background col-sm-6 col-center">
+    <h2>Move all classes for teacher {{ original_teacher.new_user|make_into_username }}</h2><br>
+
+    <h4>Move all classes assigned to teacher {{ original_teacher.new_user.first_name }}
+        {{ original_teacher.new_user.last_name }} to other teachers in {{ original_teacher.school.name }}.</h4>
+</section>
+
+<div class="background background--primary secondary-table">
+    <div class="col-sm-6 col-center">
+        <h4><strong>Move all classes</strong></h4>
+
+        <p class="body-text">Select teachers to take over the classes from the lists below.</p>
+
+        <form method='post'>
+            {% csrf_token %}
+            <table class="header-primary">
+                <tr>
+                    <th><p class="body-text">Class</p></th>
+                    <th><p class="body-text">New Teacher</p></th>
+                </tr>
+                {% for class in classes %}
+                <tr>
+                    <td><p class="small-text">{{ class.name }} ({{ class.access_code }})</p></td>
+                    <td>
+                        <select class='wide' name='{{ class.access_code }}'>
+                            {% for teacher in teachers %}
+                            <option value='{{ teacher.id }}'>{{ teacher.title }} {{ teacher.new_user.first_name }}
+                                {{ teacher.new_user.last_name }}</option>
+                            {% endfor %}
+                        </select>
+                    </td>
+                </tr>
+                {% endfor %}
+            </table>
+            <div class="background button-group">
+                <a class="button button--regular button--secondary button--secondary--dark" href="{% url 'dashboard' %}">Cancel</a>
+                <button type='submit' id="move_classes_button" class="button--regular button--primary--navigation">{{ submit_button_text }}</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function(){
+        toggleStickySubnav($('.banner').outerHeight());
+    });
+</script>
+
+{% endblock %}

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/tests/pageObjects/portal/teach/dashboard_page_new.py

@@ -36,6 +36,8 @@
 # identified as the original program.
 from teach_base_page_new import TeachBasePage
 from class_page_new import TeachClassPage
+from move_classes_page_new import TeachMoveClassesPage
+from onboarding_organisation_page import OnboardingOrganisationPage
 from selenium.webdriver.support.ui import Select
 
 import time
@@ -163,17 +165,6 @@ class TeachDashboardPage(TeachBasePage):
     def is_teacher_non_admin(self):
         return "Make admin" in self.browser.find_element_by_id('teachers_table').text
 
-    def have_classes(self):
-        return self.element_exists_by_id('classes_table')
-
-    def does_not_have_classes(self):
-        return self.element_does_not_exist_by_id('classes_table')
-
-    def does_class_exist(self, name, access_code):
-        return self.have_classes() and \
-               (name in self.browser.find_element_by_id('classes_table').text) and \
-               (access_code in self.browser.find_element_by_id('classes_table').text)
-
     def click_kick_button(self):
         self.browser.find_element_by_id('kick_button').click()
 
@@ -189,6 +180,14 @@ class TeachDashboardPage(TeachBasePage):
 
         return self
 
+    def leave_organisation_with_students(self):
+        self._click_leave_button()
+
+        return TeachMoveClassesPage(self.browser)
+
+    def _click_leave_button(self):
+        self.browser.find_element_by_id('leave_organisation_button').click()
+
     def is_dialog_showing(self):
         return self.browser.find_element_by_xpath("//div[contains(@class,'ui-dialog')]").is_displayed()
 
@@ -197,5 +196,10 @@ class TeachDashboardPage(TeachBasePage):
 
         return self
 
+    def confirm_kick_with_students_dialog(self):
+        self._click_confirm()
+
+        return TeachMoveClassesPage(self.browser)
+
     def _click_confirm(self):
         self.browser.find_element_by_xpath("//button[contains(text(),'Confirm')]").click()

codeforlife-portal-1.0.0.post.dev489/portal/tests/pageObjects/portal/teach/move_classes_page_new.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# Code for Life
+#
+# Copyright (C) 2016, Ocado Innovation Limited
+#
+# 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/>.
+#
+# ADDITIONAL TERMS – Section 7 GNU General Public Licence
+#
+# This licence does not grant any right, title or interest in any “Ocado” logos,
+# trade names or the trademark “Ocado” or any other trademarks or domain names
+# owned by Ocado Innovation Limited or the Ocado group of companies or any other
+# distinctive brand features of “Ocado” as may be secured from time to time. You
+# must not distribute any modification of this program using the trademark
+# “Ocado” or claim any affiliation or association with Ocado or its employees.
+#
+# You are not authorised to use the name Ocado (or any of its trade names) or
+# the names of any author or contributor in advertising or for publicity purposes
+# pertaining to the distribution of this program, without the prior written
+# authorisation of Ocado.
+#
+# Any propagation, distribution or conveyance of this program must include this
+# copyright notice and these terms. You must not misrepresent the origins of this
+# program; modified versions of the program must be marked as such and not
+# identified as the original program.
+import dashboard_page_new
+import onboarding_organisation_page
+
+from teach_base_page_new import TeachBasePage
+
+
+class TeachMoveClassesPage(TeachBasePage):
+    def __init__(self, browser):
+        super(TeachMoveClassesPage, self).__init__(browser)
+
+        assert self.on_correct_page('move_all_classes_page')
+
+    def move_and_kick(self):
+        self.browser.find_element_by_id('move_classes_button').click()
+        return dashboard_page_new.TeachDashboardPage(self.browser)
+
+    def move_and_leave(self):
+        self.browser.find_element_by_id('move_classes_button').click()
+        return onboarding_organisation_page.OnboardingOrganisationPage(self.browser)

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/tests/test_organisation_new.py

@@ -213,6 +213,98 @@ class TestOrganisation(BaseTest, BasePage):
 
         assert page.is_not_teacher_in_school(new_last_name)
 
+    def test_move_classes_and_kick(self):
+        email_1, password_1 = signup_teacher_directly()
+        name, postcode = create_organisation_directly(email_1)
+        _, class_name_1, access_code_1 = create_class_directly(email_1)
+        create_school_student_directly(access_code_1)
+
+        title, first_name, last_name, email_2, password_2 = generate_details()
+
+        new_last_name = "New Teacher"
+
+        selenium.get(self.live_server_url + "/portal/redesign/home")
+        page = HomePage(selenium) \
+            .go_to_signup_page() \
+            .signup(title, first_name, new_last_name, email_2, password_2, password_2)
+
+        page = email_utils.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
+        mail.outbox = []
+
+        page = page.login_no_school(email_2, password_2).join_organisation(name)
+
+        page = page \
+            .logout() \
+            .go_to_login_page() \
+            .login(email_1, password_1)
+
+        page = page.accept_join_request()
+
+        assert page.is_teacher_in_school(new_last_name)
+
+        _, class_name_2, access_code_2 = create_class_directly(email_2)
+        create_school_student_directly(access_code_2)
+
+        page = page.click_kick_button().confirm_kick_with_students_dialog()
+
+        assert page.__class__.__name__ == 'TeachMoveClassesPage'
+
+        page = page.move_and_kick()
+
+        assert page.is_not_teacher_in_school(new_last_name)
+
+    def test_leave_organisation(self):
+        email_1, password_1 = signup_teacher_directly()
+        name, postcode = create_organisation_directly(email_1)
+        _, class_name_1, access_code_1 = create_class_directly(email_1)
+        create_school_student_directly(access_code_1)
+
+        title, first_name, last_name, email_2, password_2 = generate_details()
+
+        new_last_name = "New Teacher"
+
+        selenium.get(self.live_server_url + "/portal/redesign/home")
+        page = HomePage(selenium) \
+            .go_to_signup_page() \
+            .signup(title, first_name, new_last_name, email_2, password_2, password_2)
+
+        page = email_utils.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
+        mail.outbox = []
+
+        page = page.login_no_school(email_2, password_2).join_organisation(name)
+
+        page = page \
+            .logout() \
+            .go_to_login_page() \
+            .login(email_1, password_1)
+
+        page = page.accept_join_request()
+
+        assert page.is_teacher_in_school(new_last_name)
+
+        _, class_name_2, access_code_2 = create_class_directly(email_2)
+        create_school_student_directly(access_code_2)
+
+        page = page \
+            .logout() \
+            .go_to_login_page() \
+            .login(email_2, password_2)
+
+        page = page.leave_organisation_with_students()
+
+        assert page.__class__.__name__ == 'TeachMoveClassesPage'
+
+        page = page.move_and_leave()
+
+        assert page.__class__.__name__ == 'OnboardingOrganisationPage'
+
+        page = page \
+            .logout() \
+            .go_to_login_page() \
+            .login(email_1, password_1)
+
+        assert page.is_not_teacher_in_school(new_last_name)
+
     def test_toggle_admin(self):
         email_1, password_1 = signup_teacher_directly()
         email_2, password_2 = signup_teacher_directly()

{codeforlife-portal-1.0.0.post.dev485 → codeforlife-portal-1.0.0.post.dev489}/portal/urls.py

@@ -69,7 +69,7 @@ from game.views.level import play_default_level
 from portal.views.email_new import verify_email as verify_email_new, change_email
 from portal.views.home_new import login_view, logout_view as logout_view_new, register_view, contact as contact_new
 from portal.views.organisation_new import organisation_fuzzy_lookup as organisation_fuzzy_lookup_new, \
-    organisation_manage as organisation_manage_new
+    organisation_manage as organisation_manage_new, organisation_leave as organisation_leave_new
 from portal.views.teacher.teach_new import teacher_classes as teacher_classes_new, teacher_class as teacher_class_new, \
     teacher_view_class, teacher_edit_class as teacher_edit_class_new, teacher_move_class as teacher_move_class_new, \
     teacher_edit_student as teacher_edit_student_new, teacher_student_reset as teacher_student_reset_new, \
@@ -245,6 +245,7 @@ urlpatterns = patterns(
     url(r'^redesign/teach/dashboard/disable_2FA/(?P<pk>[0-9]+)/$', teacher_disable_2FA_new, name='teacher_disable_2FA_new'),
     url(r'^redesign/teach/dashboard/allow_join/(?P<pk>[0-9]+)/$', organisation_allow_join_new, name='organisation_allow_join_new'),
     url(r'^redesign/teach/dashboard/deny_join/(?P<pk>[0-9]+)/$', organisation_deny_join_new, name='organisation_deny_join_new'),
+    url(r'^redesign/teach/dashboard/school/leave/$', organisation_leave_new, name='organisation_leave_new'),
     url(r'^redesign/teach/class/(?P<access_code>[A-Z0-9]+)/$', teacher_view_class, name='view_class'),
     url(r'^redesign/teach/class/delete/(?P<access_code>[A-Z0-9]+)/$', teacher_delete_class_new, name='teacher_delete_class_new'),
     url(r'^redesign/teach/class/(?P<access_code>[A-Z0-9]+)/students/delete/$', teacher_delete_students_new, name='teacher_delete_students_new'),