From 1d90bb5fbd6dfae5d0eb2e482cb62094a89ea36d Mon Sep 17 00:00:00 2001 From: B_Rass Date: Wed, 22 Jan 2025 18:03:43 +0100 Subject: [PATCH] Fixing tests --- app/controllers/power_distribution_units_controller.rb | 2 +- app/views/power_distribution_units/_form.html.erb | 8 ++++---- test/fixtures/servers.yml | 2 +- test/models/server_test.rb | 7 +++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/power_distribution_units_controller.rb b/app/controllers/power_distribution_units_controller.rb index cb1bba77c..6dc784a24 100644 --- a/app/controllers/power_distribution_units_controller.rb +++ b/app/controllers/power_distribution_units_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class PowerDistributionUnitsController < ServersController +class PowerDistributionUnitsController < ApplicationController before_action :set_pdu, only: %i[show edit update destroy destroy_connections] def index diff --git a/app/views/power_distribution_units/_form.html.erb b/app/views/power_distribution_units/_form.html.erb index 399edbfc4..52e1898f5 100644 --- a/app/views/power_distribution_units/_form.html.erb +++ b/app/views/power_distribution_units/_form.html.erb @@ -86,7 +86,7 @@
@@ -99,7 +99,7 @@ <% cards = @pdu.cards.select { |c| c.composant.enclosure == enclosure } .sort_by! { |c| c.composant.position } %> <%= f.fields_for :cards, cards do |card_fields| %> - <%= render partial: "card_fields", locals: { f: card_fields, server: @pdu, enclosure: enclosure } %> + <%= render partial: "servers/card_fields", locals: { f: card_fields, server: @pdu, enclosure: enclosure } %> <% end %>
@@ -126,7 +126,7 @@
@@ -136,7 +136,7 @@ <% end %> <%= f.fields_for :documents do |document_fields| %> - <%= render partial: "document_fields", locals: { f: document_fields } %> + <%= render partial: "servers/document_fields", locals: { f: document_fields } %> <% end %>
diff --git a/test/fixtures/servers.yml b/test/fixtures/servers.yml index 7d69abb3a..80a9b88a1 100644 --- a/test/fixtures/servers.yml +++ b/test/fixtures/servers.yml @@ -49,7 +49,7 @@ pdu: modele_id: 3 side: right color: B - numero: PDU_1 + numero: pdu_frame_1 with_cluster: frame_id: 1 diff --git a/test/models/server_test.rb b/test/models/server_test.rb index 1ee946ac2..75d232bf1 100644 --- a/test/models/server_test.rb +++ b/test/models/server_test.rb @@ -8,13 +8,16 @@ class ServerTest < ActiveSupport::TestCase refute_includes Server.only_pdus, servers(:one) end - test 'scope no_puds' do + test 'scope no_pdus' do refute_includes Server.no_pdus, servers(:pdu) assert_includes Server.no_pdus, servers(:one) end test '#documentation_url with no documentation_url value on manufacturer' do - assert_nil servers(:pdu).documentation_url + server = servers(:pdu) + server.numero = nil + + assert_nil server.documentation_url end test '#documentation_url with no numero value on manufacturer' do