Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactorise le templatetag "joinby" #4653

Merged
merged 16 commits into from
Oct 24, 2017
Merged

Conversation

rezemika
Copy link
Contributor

Q R
Type de modification correction de bug / évolution
Ticket(s) (issue(s)) concerné(s) Aucun

Cette PR refactorise le templatetag "joinby" afin d'améliorer son rendu. Elle change son fonctionnement, et la doc et le template qui l'utilisait sont modifiés également. Elle fait suite à une remarque de @artragis ici, et elle améliore au passage la gestion des multi-auteurs dans les citations. Désolé pour les commits de merge disgracieux.

QA

  • Code relu et approuvé
  • La citation marche correctement

Ce commit refactorise le templatetag "joinby" et en modifie l'utilisation. La documentation et le template qui l'utilise ("templates/tutorialv2/view/content_online.html") sont donc mis à jour en même temps.
Ce commit refactorise le templatetag "joinby" et en modifie l'utilisation. La documentation et le template qui l'utilise ("templates/tutorialv2/view/content_online.html") sont donc mis à jour en même temps.
Copy link
Contributor

@motet-a motet-a left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ça me semble facile d’écrire un petit test pour ça :-)

@rezemika
Copy link
Contributor Author

Oui, je bosse dessus en ce moment même. Tu pense que devrais le rajouter à cette PR ou dans une autre ? :)

@motet-a
Copy link
Contributor

motet-a commented Sep 22, 2017

Dans cette PR c’est très bien.

@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 23, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 23, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 23, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 23, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 23, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 23, 2017
@@ -56,3 +57,48 @@ def test_remove_url_scheme(self):
for element in oracle:
# as we are not in py3 we do not have subTest method. so we use a bare for loop.
self.assertEquals(remove_url_scheme(element.given), element.expected)


class TemplateTagsTest(TestCase):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Faut surtout tester les cas particuliers qui risquent de planter, comme joinby([]).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah oui, bien vu. Cependant, ce cas est prévu par le " if not values: return '' ". ;)

@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 26, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 26, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 26, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 26, 2017
@zestedesavoir zestedesavoir deleted a comment from coveralls Sep 26, 2017
@coveralls
Copy link

coveralls commented Sep 30, 2017

Coverage Status

Coverage increased (+0.02%) to 89.772% when pulling b8df3cf on rezemika:improve-joinby into 92a049d on zestedesavoir:dev.

@zestedesavoir zestedesavoir deleted a comment from coveralls Oct 24, 2017
@coveralls
Copy link

coveralls commented Oct 24, 2017

Coverage Status

Coverage increased (+0.02%) to 89.809% when pulling c55b4cb on rezemika:improve-joinby into 7cefc52 on zestedesavoir:dev.

@rezemika
Copy link
Contributor Author

Désolé pour le retard, j'avais un peu oublié cette PR.

@artragis
Copy link
Member

par contre va falloir faire un rebase, il y a des conflits

@artragis artragis merged commit db37016 into zestedesavoir:dev Oct 24, 2017
@rezemika rezemika deleted the improve-joinby branch October 24, 2017 10:52
@motet-a motet-a added this to the Version de développement milestone Oct 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants