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
2 changes: 1 addition & 1 deletion pythonpro/core/templates/core/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html lang="pt-br">
<head>
<meta charset="UTF-8">
<title>Python Pro</title>
<title>{% block title %}Python Pro{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}"/>
<link rel="stylesheet" href="{% static 'css/default.css' %}"/>
Expand Down
10 changes: 9 additions & 1 deletion pythonpro/promos/admin.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
from django.contrib import admin

# Register your models here.
from pythonpro.promos.models import Video


class VideoAdmin(admin.ModelAdmin):
list_display = ['title']


admin.site.register(Video, VideoAdmin)
23 changes: 23 additions & 0 deletions pythonpro/promos/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 2.0.1 on 2018-01-17 16:02

from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Video',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=100)),
('vimeo_id', models.CharField(max_length=100)),
('slug', models.SlugField(max_length=100, unique=True)),
],
),
]
7 changes: 6 additions & 1 deletion pythonpro/promos/models.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
from django.db import models

# Create your models here.

class Video(models.Model):
title = models.CharField(max_length=100)
vimeo_id = models.CharField(max_length=100)
slug = models.SlugField(max_length=100, unique=True)
4 changes: 3 additions & 1 deletion pythonpro/promos/templates/promos/video_detail.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{% extends 'core/base.html' %}
{% load static %}
{% block title %}{{ video.title }}{% endblock %}
{% block body %}
<div class="container mt-5">
<div class="row">
<div class="col text-center">
<iframe src="https://player.vimeo.com/video/251224475" width="640" height="360" frameborder="0"
<h1>{{ video.title }}</h1>
<iframe src="https://player.vimeo.com/video/{{ video.vimeo_id }}" width="640" height="360" frameborder="0"
webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
</div>
</div>
Expand Down
32 changes: 27 additions & 5 deletions pythonpro/promos/tests/test_views.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import pytest

from django.urls import reverse
from model_mommy import mommy

from pythonpro.promos.models import Video


@pytest.fixture
def video_resp(client, transactional_db):
def video_resp(client, video):
return client.get(
reverse(viewname='promos:video', args=('motivacao',)),
reverse(viewname='promos:video', args=(video.slug,)),
)


@pytest.fixture
def video(transactional_db):
return mommy.make(Video)


def test_video_status(video_resp):
assert 200 == video_resp.status_code

Expand All @@ -24,7 +31,6 @@ def test_ty_status(client):
@pytest.mark.parametrize(
'content',
[
'<iframe src="https://player.vimeo.com/video/251224475"',
'<form class="form-inline justify-content-center" '
'action="https://python.us17.list-manage.com/subscribe/post?u=ff7c56095f83f9c254edd749e&amp;id=a88d1dd555"',
'method="post"',
Expand All @@ -33,5 +39,21 @@ def test_ty_status(client):
'<button type="submit"'
]
)
def test_content(content, video_resp, dj_assert_contains):
def test_video_lead_form(content, video_resp, dj_assert_contains):
dj_assert_contains(video_resp, content)


def test_video_title(video, video_resp, dj_assert_contains):
dj_assert_contains(video_resp, f'<title>{video.title}</title>')


def test_video_h1(video, video_resp, dj_assert_contains):
dj_assert_contains(video_resp, f'<h1>{video.title}</h1>')


def test_video_iframe(video, video_resp, dj_assert_contains):
dj_assert_contains(video_resp, f'<iframe src="https://player.vimeo.com/video/{video.vimeo_id}"')


def test_video_context(video, video_resp):
assert video == video_resp.context['video']
6 changes: 4 additions & 2 deletions pythonpro/promos/views.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from django.shortcuts import render


# Create your views here.
from pythonpro.promos.models import Video


def video(request, slug):
return render(request, 'promos/video_detail.html', {})
video = Video.objects.filter(slug__exact=slug).get()
return render(request, 'promos/video_detail.html', {'video': video})


def thanks(request):
Expand Down
3 changes: 2 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ pytest==3.3.2
pytest-cov==2.5.1
pytest-django==3.1.2
freezegun==0.3.9
pytest-freezegun==0.2.0
pytest-freezegun==0.2.0
model-mommy==1.5.0