Merge branch '156'

pypro/aperitivos/tests/test_indice.py

@@ -4,7 +4,7 @@
 from model_mommy import mommy
 
 from pypro.aperitivos.models import Video
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 
 
 @pytest.fixture

pypro/aperitivos/tests/test_video.py

@@ -3,7 +3,7 @@
 from model_mommy import mommy
 
 from pypro.aperitivos.models import Video
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 
 
 @pytest.fixture

pypro/base/templates/base/base.html

@@ -36,7 +36,7 @@
         </button>
 
         <div class="collapse navbar-collapse" id="navbarResponsive">
-            <ul class="navbar-nav ml-auto">
+            <ul class="navbar-nav mr-auto">
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -48,16 +48,24 @@
                         {% endfor %}
                     </div>
                 </li>
-                <li class="nav-item">
-                    <a class="nav-link js-scroll-trigger" href="#about">About</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link js-scroll-trigger" href="#services">Services</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link js-scroll-trigger" href="#contact">Contact</a>
-                </li>
             </ul>
+            {% if user.is_authenticated %}
+                <ul class="navbar-nav ml-auto">
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                           data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            {{ user.first_name }}
+                        </a>
+                        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                           <button type="button" class="dropdown-item">Sair</button>
+
+                        </div>
+                    </li>
+                </ul>
+            {% else %}
+                <a class="btn btn-light" href="{% url 'login' %}">Entrar</a>
+            {% endif %}
+
         </div>
     </div>
 </nav>

pypro/base/tests/test_home.py

@@ -1,7 +1,7 @@
 import pytest
 from django.urls import reverse
 
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 
 
 @pytest.fixture

pypro/base/tests/test_login.py

@@ -2,6 +2,8 @@
 from django.urls import reverse
 from model_mommy import mommy
 
+from pypro.django_assertions import assert_contains, assert_not_contains
+
 
 @pytest.fixture
 def resp(client, db):
@@ -30,3 +32,37 @@ def resp_post(client, usuario):
 def test_login_redirect(resp_post):
     assert resp_post.status_code == 302
     assert resp_post.url == reverse('modulos:indice')
+
+
+@pytest.fixture
+def resp_home(client, db):
+    return client.get(reverse('base:home'))
+
+
+def test_botao_entrar_disponivel(resp_home):
+    assert_contains(resp_home, 'Entrar')
+
+
+def test_link_entrar_disponivel(resp_home):
+    assert_contains(resp_home, reverse('login'))
+
+
+@pytest.fixture
+def resp_home_com_usuario_logado(clinet_com_usuario_logado, db):
+    return clinet_com_usuario_logado.get(reverse('base:home'))
+
+
+def test_botao_entrar_indisponivel(resp_home_com_usuario_logado):
+    assert_not_contains(resp_home_com_usuario_logado, 'Entrar')
+
+
+def test_link_entrar_indisponivel(resp_home_com_usuario_logado):
+    assert_not_contains(resp_home_com_usuario_logado, reverse('login'))
+
+
+def test_botao_sair_disponivel(resp_home_com_usuario_logado):
+    assert_contains(resp_home_com_usuario_logado, 'Sair')
+
+
+def test_nome_usuario_disponivel(resp_home_com_usuario_logado, usuario_logado):
+    assert_contains(resp_home_com_usuario_logado, usuario_logado.first_name)

pypro/conftest.py

@@ -0,0 +1,14 @@
+import pytest
+from model_mommy import mommy
+
+
+@pytest.fixture
+def usuario_logado(db, django_user_model):
+    usuario_modelo = mommy.make(django_user_model, first_name='Fulano')
+    return usuario_modelo
+
+
+@pytest.fixture
+def clinet_com_usuario_logado(usuario_logado, client):
+    client.force_login(usuario_logado)
+    return client

pypro/base/django_assertions.py → pypro/django_assertions.py

@@ -3,3 +3,4 @@
 _test_case = TestCase()
 
 assert_contains = _test_case.assertContains
+assert_not_contains = _test_case.assertNotContains

pypro/modulos/test/test_aba_de_modulos.py

@@ -2,7 +2,7 @@
 from django.urls import reverse
 from model_mommy import mommy
 
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 from pypro.modulos.models import Modulo
 
 

pypro/modulos/test/test_aula_detalhe.py

@@ -2,7 +2,7 @@
 from django.urls import reverse
 from model_mommy import mommy
 
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 from pypro.modulos.models import Modulo, Aula
 
 

pypro/modulos/test/test_modulo_detalhe.py

@@ -2,7 +2,7 @@
 from django.urls import reverse
 from model_mommy import mommy
 
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 from pypro.modulos.models import Modulo, Aula
 
 

pypro/modulos/test/test_modulos_indice.py

@@ -4,7 +4,7 @@
 from django.urls import reverse
 from model_mommy import mommy
 
-from pypro.base.django_assertions import assert_contains
+from pypro.django_assertions import assert_contains
 from pypro.modulos.models import Modulo, Aula