Removed cohort links

part of #4776

Author: renzon

pythonpro/cohorts/context_processors.py

@@ -3,72 +3,18 @@
 
 import pytest
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.template.defaultfilters import date
-from django.urls import reverse
 from django.utils import timezone
 from model_bakery import baker
 
 from pythonpro.cohorts import facade
-from pythonpro.cohorts.models import Cohort, LiveClass, Webinar
+from pythonpro.cohorts.models import LiveClass, Webinar
 from pythonpro.cohorts.tests.conftest import img_path
-from pythonpro.django_assertions import dj_assert_contains, dj_assert_not_contains
-
-
-@pytest.fixture
-def resp(client_with_member, cohort):
-    return client_with_member.get(reverse('cohorts:detail', kwargs={'slug': cohort.slug}))
-
-
-@pytest.fixture
-def resp_without_user(client, db):
-    image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
-                               content_type='image/png')
-    cohort = baker.make(Cohort, slug='guido-van-rossum', image=image)
-    resp = client.get(reverse('cohorts:detail', kwargs={'slug': cohort.slug}))
-    return resp
-
-
-def test_no_access(resp_without_user):
-    """Assert only logged user can acess cohort pages"""
-    assert 302 == resp_without_user.status_code
-
-
-def test_cohort_links_for_logged_user(client, django_user_model):
-    user = baker.make(django_user_model)
-    client.force_login(user)
-    image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
-                               content_type='image/png')
-    cohorts = baker.make(Cohort, 4, image=image)
-    resp = client.get(reverse('dashboard:home'))
-    for c in cohorts:
-        dj_assert_contains(resp, c.get_absolute_url())
-
-
-def test_status_code(resp):
-    assert 200 == resp.status_code
 
 
 def test_str(cohort):
     assert str(cohort) == f'Turma: {cohort.title}'
 
 
-@pytest.mark.parametrize('property_name', 'title forum_post'.split())
-def test_cohort_properties(cohort, resp, property_name):
-    dj_assert_contains(resp, getattr(cohort, property_name))
-
-
-def test_cohort_img(cohort: Cohort, resp):
-    dj_assert_contains(resp, cohort.image.url)
-
-
-def test_cohort_start(cohort: Cohort, resp):
-    dj_assert_contains(resp, date(cohort.start))
-
-
-def test_cohort_end(cohort: Cohort, resp):
-    dj_assert_contains(resp, date(cohort.end))
-
-
 @pytest.fixture
 def recorded_live_classes(cohort, fake):
     now = timezone.now()
@@ -103,38 +49,12 @@ def future_live_classes(cohort, fake):
     ]
 
 
-@pytest.fixture
-def resp_with_classes(recorded_live_classes, future_live_classes, cohort, client_with_member):
-    return client_with_member.get(reverse('cohorts:detail', kwargs={'slug': cohort.slug}))
-
-
 def test_live_classes_are_sorted(recorded_live_classes, cohort):
     recorded_live_classes.sort(key=operator.attrgetter('start'))
     db_cohort = facade.find_cohort(slug=cohort.slug)
     assert recorded_live_classes == db_cohort.classes
 
 
-@pytest.mark.freeze_time('2019-01-01 18:00:00')
-def test_live_classes_datetime(resp_with_classes, recorded_live_classes):
-    for live_class in recorded_live_classes:
-        dj_assert_contains(resp_with_classes, date(live_class.start))
-
-
-def test_live_classes_descriptions(resp_with_classes, recorded_live_classes):
-    for live_class in recorded_live_classes:
-        dj_assert_contains(resp_with_classes, live_class.description)
-
-
-def test_recorded_live_classes_urls_are_present(resp_with_classes, recorded_live_classes):
-    for live_class in recorded_live_classes:
-        dj_assert_contains(resp_with_classes, live_class.get_absolute_url())
-
-
-def test_future_live_classes_urls_are_absent(resp_with_classes, future_live_classes):
-    for live_class in future_live_classes:
-        dj_assert_not_contains(resp_with_classes, live_class.get_absolute_url())
-
-
 @pytest.fixture
 def recorded_webinars(cohort):
     now = timezone.now()
@@ -167,34 +87,7 @@ def test_future_webinars_in_cohort(recorded_webinars, future_webinars, cohort):
     assert cohort.future_webinars == future_webinars
 
 
-@pytest.fixture
-def resp_with_webnars(recorded_webinars, future_webinars, cohort, client_with_member):
-    return client_with_member.get(reverse('cohorts:detail', kwargs={'slug': cohort.slug}))
-
-
 def test_webnars_are_sorted(recorded_webinars: list, cohort):
     recorded_webinars.sort(key=operator.attrgetter('start'))
     db_cohort = facade.find_cohort(slug=cohort.slug)
     assert recorded_webinars == db_cohort.webinars
-
-
-@pytest.mark.freeze_time('2019-01-01 18:00:00')
-def test_webnars_datetime(resp_with_webnars, recorded_webinars):
-    for webnar in recorded_webinars:
-        dj_assert_contains(resp_with_webnars, date(webnar.start))
-
-
-@pytest.mark.parametrize('property_name', 'speaker speaker_title title'.split())
-def test_webnars_vimeo(resp_with_webnars, recorded_webinars, property_name):
-    for webnar in recorded_webinars:
-        dj_assert_contains(resp_with_webnars, getattr(webnar, property_name))
-
-
-def test_recorded_webnars_url_are_present(resp_with_webnars, recorded_webinars):
-    for webnar in recorded_webinars:
-        dj_assert_contains(resp_with_webnars, webnar.get_absolute_url())
-
-
-def test_future_webnars_url_are_absent(resp_with_webnars, future_webinars):
-    for webnar in future_webinars:
-        dj_assert_not_contains(resp_with_webnars, webnar.get_absolute_url())

pythonpro/cohorts/templates/cohorts/cohort_detail.html

@@ -7,5 +7,4 @@
     path('webinarios/', views.webinars, name='webinars'),
     path('webinarios/<slug:slug>/', views.webinar, name='webinar'),
     path('aulas/<int:pk>/', views.live_class, name='live_class'),
-    path('<slug:slug>/', views.detail, name='detail'),
 ]

pythonpro/cohorts/tests/test_cohorts.py

@@ -6,11 +6,6 @@
 from pythonpro.memberkit import facade as memberkit_facade
 
 
-@login_required
-def detail(request, slug):
-    return render(request, 'cohorts/cohort_detail.html', {'cohort': facade.find_cohort(slug=slug)})
-
-
 @login_required
 def webinars(request):
     return render(request, 'cohorts/webinars.html', {'webinars': facade.find_recorded_webinars()})

pythonpro/cohorts/urls.py

@@ -59,24 +59,8 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
                 {% if user.is_authenticated %}
-                    <li class="nav-item dropdown">
-                        <a class="nav-link dropdown-toggle" href="#" id="navbarCohorts" role="button"
-                           data-toggle="dropdown"
-                           aria-haspopup="true" aria-expanded="false">
-                            Turmas
-                        </a>
-                        <div class="dropdown-menu bg-dark border-light" aria-labelledby="navbarCohorts">
-                            {% for cohort in ALL_COHORTS %}
-                                <a class="dropdown-item text-light"
-                                   href="{{ cohort.get_absolute_url }}">{{ cohort.title }}</a>
-                                {% if not forloop.last %}
-                                    <div class="dropdown-divider"></div>
-                                {% endif %}
-                            {% endfor %}
-                        </div>
-                    </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="https://plataforma.dev.pro.br">Curso</a>
+                        <a class="nav-link" href="https://plataforma.dev.pro.br">Cursos</a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="{% url 'cohorts:webinars' %}">Webinários</a>

pythonpro/cohorts/views.py

@@ -38,12 +38,6 @@ def test_status_code_not_logged(resp_not_logged):
     assert resp_not_logged.status_code == 200
 
 
-def test_module_index_link_not_logged(resp_not_logged):
-    """ Assert module index link is present when user is not logged """
-    url = reverse('modules:index')
-    dj_assert_contains(resp_not_logged, f'href="{url}"')
-
-
 def test_module_link_not_logged(modules, resp_not_logged):
     """ Assert module links are not present when user is not logged """
     for module in modules:
@@ -53,12 +47,6 @@ def test_module_link_not_logged(modules, resp_not_logged):
             dj_assert_not_contains(resp_not_logged, f'href="{module.get_absolute_url()}"')
 
 
-def test_module_index_link_logged(resp):
-    """ Assert module index link is present when user is logged """
-    url = reverse('modules:index')
-    dj_assert_contains(resp, f'href="{url}"')
-
-
 def test_present_attrs(modules, resp_not_logged):
     for module in modules:
         dj_assert_contains(resp_not_logged, module.title)

pythonpro/core/templates/core/base.html

@@ -151,7 +151,6 @@
                 'django.contrib.messages.context_processors.messages',
                 'pythonpro.core.context_processors.global_settings',
                 'pythonpro.modules.context_processors.global_settings',
-                'pythonpro.cohorts.context_processors.global_settings',
                 'pythonpro.analytics.context_processors.posthog_configurations',
             ],
         },