OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Fix specs for Costlog Controller
Klaus Zandersc96aa9b5fa5c
diff --git a/modules/costs/spec/controllers/costlog_controller_spec.rb b/modules/costs/spec/controllers/costlog_controller_spec.rbindex 02f90352cd2..d9f853361ec 100644--- a/modules/costs/spec/controllers/costlog_controller_spec.rb+++ b/modules/costs/spec/controllers/costlog_controller_spec.rb@@ -87,7 +87,11 @@ RSpec.describe CostlogController doenddescribe "GET new" do- let(:params) { { "work_package_id" => work_package.id.to_s } }+ let(:params) do+ {+ "work_package_id" => work_package.id.to_s+ }+ endlet(:expected_project) { project }let(:expected_work_package) { work_package }@@ -235,9 +239,9 @@ RSpec.describe CostlogController dogrant_current_user_permissions user, [:edit_cost_entries]cost_entry.project = create(:project_with_types)- cost_entry.work_package = create(:work_package, project: cost_entry.project,- type: cost_entry.project.types.first,- author: user)+ cost_entry.entity = create(:work_package, project: cost_entry.project,+ type: cost_entry.project.types.first,+ author: user)cost_entry.save!end@@ -249,7 +253,7 @@ RSpec.describe CostlogController dobefore dogrant_current_user_permissions user, [:edit_cost_entries]- params["id"] = (cost_entry.id + 1).to_s+ params["id"] = "this-entry-does-not-exist"get :edit, params:end@@ -262,7 +266,8 @@ RSpec.describe CostlogController dolet (:params) do{ "project_id" => project.id.to_s,"cost_entry" => { "user_id" => user.id.to_s,- "work_package_id" => (work_package.present? ? work_package.id.to_s : ""),+ "entity_type" => (work_package.present? ? "WorkPackage" : ""),+ "entity_id" => (work_package.present? ? work_package.id.to_s : ""),"units" => units.to_s,"cost_type_id" => (cost_type.present? ? cost_type.id.to_s : ""),"comments" => "lorem",@@ -451,7 +456,7 @@ RSpec.describe CostlogController dobefore dogrant_current_user_permissions user, [:log_costs]- params["cost_entry"]["work_package_id"] = work_package2.id+ params["cost_entry"]["entity_id"] = work_package2.idendit_behaves_like "invalid create"@@ -464,7 +469,7 @@ RSpec.describe CostlogController dobefore dogrant_current_user_permissions user, [:log_costs]- params["cost_entry"].delete("work_package_id")+ params["cost_entry"].delete("entity_id")endit_behaves_like "invalid create"@@ -494,7 +499,8 @@ RSpec.describe CostlogController dolet(:params) do{ "id" => cost_entry.id.to_s,"cost_entry" => { "comments" => "lorem",- "work_package_id" => cost_entry.work_package.id.to_s,+ "entity_type" => "WorkPackage",+ "entity_id" => cost_entry.work_package.id.to_s,"units" => cost_entry.units.to_s,"spent_on" => cost_entry.spent_on.to_s,"user_id" => cost_entry.user.id.to_s,@@ -545,7 +551,8 @@ RSpec.describe CostlogController dodescribe "WHEN the user is allowed to update cost_entries " \"WHEN updating:- work_package_id+ entity_type+ entity_iduser_idunitscost_type@@ -566,7 +573,8 @@ RSpec.describe CostlogController dogrant_current_user_permissions expected_user, []grant_current_user_permissions user, [:edit_cost_entries]- params["cost_entry"]["work_package_id"] = expected_work_package.id.to_s+ params["cost_entry"]["entity_type"] = "WorkPackage"+ params["cost_entry"]["entity_id"] = expected_work_package.id.to_sparams["cost_entry"]["user_id"] = expected_user.id.to_sparams["cost_entry"]["spent_on"] = expected_spent_on.to_sparams["cost_entry"]["units"] = expected_units.to_s@@ -615,8 +623,8 @@ RSpec.describe CostlogController doenddescribe "WHEN the user is allowed to update cost_entries " \- "WHEN updating the work_package " \- "WHEN the new work_package isn't an work_package of the current project" do+ "WHEN updating the entity " \+ "WHEN the new entity isn't an entity of the current project" dolet(:project2) { create(:project_with_types) }let(:work_package2) docreate(:work_package, project: project2,@@ -627,21 +635,21 @@ RSpec.describe CostlogController dobefore dogrant_current_user_permissions user, [:edit_cost_entries]- params["cost_entry"]["work_package_id"] = work_package2.id.to_s+ params["cost_entry"]["entity_id"] = work_package2.id.to_sendit_behaves_like "invalid update"enddescribe "WHEN the user is allowed to update cost_entries " \- "WHEN updating the work_package " \- "WHEN the new work_package_id isn't existing" do+ "WHEN updating the entity " \+ "WHEN the new entity isn't existing" dolet(:expected_work_package) { nil }before dogrant_current_user_permissions user, [:edit_cost_entries]- params["cost_entry"]["work_package_id"] = (work_package.id + 1).to_s+ params["cost_entry"]["entity_id"] = "this-id-does-not-exist"endit_behaves_like "invalid update"