Teste et corrige l'affichage de quelques éléments de la sidebar des contenus #6599
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
philippemilink
added
the
Bloquant
philippemilink
changed the title
Arnaud-D
requested changes
Apr 6, 2024
Comment on lines
+26
to
+37
| {% if public_actions.show_identical_draft_version_message %} | ||
| <li class="inactive"> | ||
| <span class="ico-after pin disabled"> | ||
| {{ public_actions.messages|get_item:"draft_is_same" }} | ||
| </span> | ||
| </li> | ||
| {% endif %} | ||
|
|
||
| {% if public_actions.show_more_recent_draft_version_link %} | ||
| <li> | ||
| <a href="{{ public_content_object.get_absolute_url_online }}" class="ico-after online blue"> | ||
| {% trans "Voir la page publique" %} | ||
| <a href="{{ object.get_absolute_url }}" class="ico-after online blue"> | ||
| {{ public_actions.messages|get_item:"draft_is_more_recent" }} |
There was a problem hiding this comment.
Je pense que cette mention devrait être tout en haut, avec "Voir la version brouillon". Comme ça pointe vers la même page, il faudrait peut-être transformer ça juste en note d'information (grisée).
C'est peut être aussi le signe qu'il faudrait une section "Version brouillon", comme on a "Version publique".
Je pense qu'être un peu ordonné à ce niveau-là peut améliorer la navigation et la compréhension de l'éditeur.
Faudra ranger la logique d'affichage en Python du bon côté aussi.
Comment on lines
+33
to
+154
| result = self.client.post( | ||
| reverse("content:edit", args=[article.pk, article.slug]), | ||
| { | ||
| "title": article.title, | ||
| "description": article.description, | ||
| "introduction": "Modified introduction", | ||
| "conclusion": "Modified conclusion", | ||
| "type": article.type, | ||
| "subcategory": article.subcategory.first().pk, | ||
| "last_hash": versioned.compute_hash(), | ||
| }, | ||
| follow=False, | ||
| ) | ||
| self.assertEqual(result.status_code, 302) | ||
| article.refresh_from_db() # the previous request changes sha_draft | ||
| # Public page: | ||
| public_page = self.client.get(article.get_absolute_url_online()) | ||
| self.assertNotContains(public_page, "Modified introduction") | ||
| self.assertNotContains(public_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(public_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertContains(public_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertContains(public_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(public_page, ValidationActions.messages["validation_is_same"]) | ||
| # Draft page: | ||
| draft_page = self.client.get(reverse("content:view", args=[article.pk, article.slug]), follow=False) | ||
| self.assertContains(draft_page, "Modified introduction") | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(draft_page, ValidationActions.messages["validation_is_same"]) | ||
|
|
||
| # Ask validation: | ||
| request_validation(article) | ||
| # Public page: | ||
| public_page = self.client.get(article.get_absolute_url_online()) | ||
| self.assertNotContains(public_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(public_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertContains(public_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertContains(public_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(public_page, ValidationActions.messages["validation_is_same"]) | ||
| # Draft page: | ||
| draft_page = self.client.get(reverse("content:view", args=[article.pk, article.slug]), follow=False) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["export_content"]) | ||
| self.assertContains(draft_page, ValidationActions.messages["validation_is_same"]) | ||
| # Validation page: | ||
| validation_page = self.client.get( | ||
| reverse("content:validation-view", args=[article.pk, article.slug]), follow=False | ||
| ) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(validation_page, ValidationActions.messages["validation_is_same"]) | ||
|
|
||
| # Now a new draft version, to have different version from validation: | ||
| versioned = article.load_version() | ||
| result = self.client.post( | ||
| reverse("content:edit", args=[article.pk, article.slug]), | ||
| { | ||
| "title": article.title, | ||
| "description": article.description, | ||
| "introduction": "Modified introduction again", | ||
| "conclusion": "Modified conclusion", | ||
| "type": article.type, | ||
| "subcategory": article.subcategory.first().pk, | ||
| "last_hash": versioned.compute_hash(), | ||
| }, | ||
| follow=False, | ||
| ) | ||
| self.assertEqual(result.status_code, 302) | ||
| article.refresh_from_db() # the previous request changes sha_draft | ||
| # Public page: | ||
| public_page = self.client.get(article.get_absolute_url_online()) | ||
| self.assertNotContains(public_page, "Modified introduction") | ||
| self.assertNotContains(public_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(public_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertContains(public_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertContains(public_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(public_page, ValidationActions.messages["validation_is_same"]) | ||
| # Draft page: | ||
| draft_page = self.client.get(reverse("content:view", args=[article.pk, article.slug]), follow=False) | ||
| self.assertContains(draft_page, "Modified introduction") | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertNotContains(draft_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(draft_page, ValidationActions.messages["validation_is_same"]) | ||
| # Validation page: | ||
| validation_page = self.client.get( | ||
| reverse("content:validation-view", args=[article.pk, article.slug]), follow=False | ||
| ) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["draft_is_same"]) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["public_is_same"]) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["draft_is_more_recent"]) | ||
| self.assertNotContains(validation_page, PublicActionsState.messages["export_content"]) | ||
| self.assertNotContains(validation_page, ValidationActions.messages["validation_is_same"]) |
There was a problem hiding this comment.
Pas fan de ce test. J'ai été confronté à d'autres tests avec une séquence longue de ce type (il y en a plein dans le module tutorialv2). Je les ai trouvé dur à faire évoluer.
Je préfère qu'on teste chaque route/vue indépendamment, quitte à faire des fonctions auxilaires pour atteindre les états cibles (par exemple avoir un tuto en validation, avoir un tuto publié avec une version brouillon plus récente, etc.), tester si nécessaire des préconditions pour vérifier qu'on est bien dans l'état souhaité avant le test, puis tester ensuite ce qu'on veut effectivement tester unitairement.
Ici, ça voudrait dire tester séparément la page brouillon, la page publique, etc, éventuellement avec différents sous cas. Il y a un embryon dans ce fichier : tests_contentvalidationview.py. Le contenu d'une page n'est qu'un test particulier parmi d'autres pour la vue de validation.
Malheureusement, le reste des tests du module ne semble pas structuré dans ce sens, mais on devrait tendre vers ça à mon avis.
Comment on lines
+4
to
+8
| def request_validation(content): | ||
| """Emulate a proper validation request.""" | ||
| ValidationFactory(content=content, status="PENDING") | ||
| content.sha_validation = content.sha_draft | ||
| content.save() |
There was a problem hiding this comment.
Pour info, je n'avais pas osé mettre cette fonction utilitaire en dehors du fichier de test spécifique où elle a été écrite, parce que je ne suis pas sûr que la manière d'émuler une validation soit suffisante dans d'autres tests que ceux que j'avais considéré à l'époque.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #6596
Cette PR fait plusieurs choses :
display/config.pyContrôle qualité
Faire manuellement ce que fait le test ajouté.
Jouer avec les différents états possibles d'un contenu, afficher les différentes pages et s'assurer qu'il n'y a pas d'éléments incohérents dans la barre latérale (je ne dis pas que cette PR règle tous ces problèmes, ne pas hésiter à rapporter les éventuelles incohérences observées).