Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pythonpro/cohorts/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
from pythonpro import settings
from pythonpro.cohorts.models import Cohort, Webinar

img_path = path.join(settings.BASE_DIR, 'pythonpro', 'core', 'static', 'img', 'instructors', 'renzo-nuccitelli.png')
img_path = path.join(settings.BASE_DIR, 'pythonpro', 'core', 'static', 'img', 'instructors', 'renzo-nuccitelli.jpeg')


@pytest.fixture
def cohort(client, django_user_model):
user = mommy.make(django_user_model)
image = SimpleUploadedFile(name='renzo-nuccitelli.png', content=open(img_path, 'rb').read(),
image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
content_type='image/png')
cohort = mommy.make(Cohort, slug='guido-van-rossum', title='Guido van Rossum', students=[user], image=image)
return cohort
Expand All @@ -23,7 +23,7 @@ def cohort(client, django_user_model):
@pytest.fixture
def webinars(cohort):
now = datetime.utcnow()
image = SimpleUploadedFile(name='renzo-nuccitelli.png', content=open(img_path, 'rb').read(),
image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
content_type='image/png')
return [
mommy.make(Webinar, cohort=cohort, vimeo_id=str(i), image=image, start=now + timedelta(days=i)) for i in
Expand Down
6 changes: 3 additions & 3 deletions pythonpro/cohorts/tests/test_cohorts.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def resp(client_with_member, cohort):

@pytest.fixture
def resp_without_user(client, db):
image = SimpleUploadedFile(name='renzo-nuccitelli.png', content=open(img_path, 'rb').read(),
image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
content_type='image/png')
cohort = mommy.make(Cohort, slug='guido-van-rossum', image=image)
resp = client.get(reverse('cohorts:detail', kwargs={'slug': cohort.slug}), secure=True)
Expand All @@ -35,7 +35,7 @@ def test_no_access(resp_without_user):
def test_cohort_links_for_logged_user(client, django_user_model):
user = mommy.make(django_user_model)
client.force_login(user)
image = SimpleUploadedFile(name='renzo-nuccitelli.png', content=open(img_path, 'rb').read(),
image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
content_type='image/png')
cohorts = mommy.make(Cohort, 4, image=image)
resp = client.get('/', secure=True)
Expand All @@ -45,7 +45,7 @@ def test_cohort_links_for_logged_user(client, django_user_model):

@pytest.mark.django_db
def test_cohort_links_not_avaliable_for_no_user(client):
image = SimpleUploadedFile(name='renzo-nuccitelli.png', content=open(img_path, 'rb').read(),
image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
content_type='image/png')
cohorts = mommy.make(Cohort, 4, image=image)
resp = client.get('/', secure=True)
Expand Down
2 changes: 1 addition & 1 deletion pythonpro/cohorts/tests/test_webinar_detail.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

@pytest.fixture
def webinar(cohort) -> Webinar:
image = SimpleUploadedFile(name='renzo-nuccitelli.png', content=open(img_path, 'rb').read(),
image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
content_type='image/png')
return mommy.make(Webinar, cohort=cohort, image=image)

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed pythonpro/core/static/img/profile.jpeg
Binary file not shown.
2 changes: 1 addition & 1 deletion pythonpro/core/templates/core/instructors.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h5 class="card-title text-center">Luciano Ramalho</h5>
<h5 class="card-title text-center">Renzo Nuccitelli</h5>
<p class="card-text">
<img class="img-thumbnail float-right ml-1"
src="{% static 'img/instructors/renzo-nuccitelli.png' %}"
src="{% static 'img/instructors/renzo-nuccitelli.jpeg' %}"
alt="Instrutor Renzo Nuccitelli">Engenheiro de Computação formado pelo ITA.
Especialista em
programação web. Hoje é Diretor de Tecnologia na Pricez.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ <h1 class='text-light font-weight-bold'>Chegou a hora de ir além do básico!</h
<h2 class='font-weight-bold mb-5'>Olá! Eu me chamo Renzo Nuccitelli,</h2>

<div class='text-center d-block d-lg-none d-xl-none'>
<img src='{% static "img/profile.jpeg" %}' class="img-fluid" width="300px">
<img src='{% static 'img/instructors/renzo-nuccitelli-300.jpeg' %}' class="img-fluid" width="300px" alt="Foto de Renzo Nuccitelli" />
</div>

<img src='{% static "img/profile.jpeg" %}'
class="img-fluid float-right ml-3 mb-3 d-none d-sm-block d-md-block" width="300px">
<img src='{% static 'img/instructors/renzo-nuccitelli-300.jpeg' %}'
class="img-fluid float-right ml-3 mb-3 d-none d-sm-block d-md-block" width="300px" alt="Foto de Renzo Nuccitelli" />

<p>
Sou programador há 13 anos. Já fui diretor de tecnologia em duas empresas
Expand Down