From 5ae9695bcf02787d97a303352ffa317e146a10c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com> Date: Thu, 11 May 2023 13:07:50 +0200 Subject: [PATCH] fix --- app/models/communication/website/menu.rb | 2 +- app/models/communication/website/menu/item.rb | 5 ---- .../communication/website/dependency_test.rb | 29 +++++++++---------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/models/communication/website/menu.rb b/app/models/communication/website/menu.rb index a92deff4e..c21afe4f2 100644 --- a/app/models/communication/website/menu.rb +++ b/app/models/communication/website/menu.rb @@ -53,7 +53,7 @@ class Communication::Website::Menu < ApplicationRecord end def dependencies - items + [] end def references diff --git a/app/models/communication/website/menu/item.rb b/app/models/communication/website/menu/item.rb index 84e1e45e9..400f59c0b 100644 --- a/app/models/communication/website/menu/item.rb +++ b/app/models/communication/website/menu/item.rb @@ -33,7 +33,6 @@ # class Communication::Website::Menu::Item < ApplicationRecord include Sanitizable - include WithDependencies include WithPosition include WithTree include WithUniversity @@ -118,10 +117,6 @@ class Communication::Website::Menu::Item < ApplicationRecord } end - def dependencies - [menu] - end - def has_about? kind_page? || kind_diploma? || diff --git a/test/models/communication/website/dependency_test.rb b/test/models/communication/website/dependency_test.rb index ce703c6f4..80872a8b1 100644 --- a/test/models/communication/website/dependency_test.rb +++ b/test/models/communication/website/dependency_test.rb @@ -23,57 +23,56 @@ class Communication::Website::DependencyTest < ActiveSupport::TestCase block = page.blocks.create(position: 1, published: true, template_kind: :organization_chart) block.data = "{ \"elements\": [ { \"id\": \"#{arnaud.id}\" } ] }" block.save - + page = page.reload - + assert_equal 9, page.recursive_dependencies.count - + # On modifie le target du block Delayed::Job.destroy_all block.data = "{ \"elements\": [ { \"id\": \"#{olivia.id}\" } ] }" block.save # On vérifie qu'on appelle bien la méthode destroy_obsolete_git_files sur le site de la page assert(destroy_obsolete_git_files_job) - + assert_equal 9, page.recursive_dependencies.count - + # Vérifie qu'on a bien une tâche de nettoyage si le block est supprimé Delayed::Job.destroy_all block.destroy assert(destroy_obsolete_git_files_job) end - + def test_change_website_dependencies dependencies_before_count = website_with_github.recursive_dependencies.count - + # On modifie l'about du website en ajoutant une école website_with_github.update(about: default_school) refute(destroy_obsolete_git_files_job) delta = website_with_github.recursive_dependencies.count - dependencies_before_count assert_equal 12, delta - + Delayed::Job.destroy_all - + # On enlève l'about du website website_with_github.update(about: nil) - + # On vérifie qu'on appelle bien la méthode destroy_obsolete_git_files sur le site assert(destroy_obsolete_git_files_job) - + end + # TODO : Utile? def test_change_menu_item_dependencies menu = communication_website_menus(:primary_menu) item = menu.items.create(university: default_university, website: website_with_github, kind: :blank, title: 'Test') - assert_equal 2, item.recursive_dependencies.count - + item.kind = :page item.about = communication_website_pages(:page_with_no_dependency) item.save - assert_equal 2, item.recursive_dependencies.count - + # Comme les menu items ne répondent pas à is_direct_object? du coup aucune tâche de nettoyage n'est ajoutée item.destroy refute(destroy_obsolete_git_files_job) -- GitLab