test: update tests

Author: Stef-Rousset

spec/controller/decidim/budgets/admin/projects_controller_spec.rb

@@ -8,26 +8,27 @@ module Admin
       describe ProjectsController, type: :controller do
         routes { Decidim::Budgets::AdminEngine.routes }
 
-        let(:user) { create(:user, :confirmed, :admin, organization: component.organization) }
+        let(:organization) { create(:organization) }
+        let(:user) { create(:user, :confirmed, :admin, organization:) }
+        let(:participatory_space) { create(:assembly, organization:) }
+        let(:component) { create(:budgets_component, organization:, participatory_space:) }
 
         before do
-          request.env["decidim.current_organization"] = component.organization
-          request.env["decidim.current_participatory_space"] = component.participatory_space
+          request.env["decidim.current_organization"] = organization
+          request.env["decidim.current_participatory_space"] = participatory_space
           request.env["decidim.current_component"] = component
           sign_in user
         end
 
         describe "PATCH update" do
-          let(:component) { create(:budgets_component) }
-          let(:project) { create(:project, component: component) }
+          let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
+          let(:project) { create(:project, component:, taxonomies: [taxonomy]) }
           let(:project_title) { project.title }
           let(:project_params) do
             {
               title: project_title,
               description: project.description,
               budget_amount: project.budget_amount,
-              decidim_scope_id: project.scope&.id,
-              decidim_category_id: project.category&.id,
               proposal_ids: project.linked_resources(:proposals, "included_proposals").pluck(:id),
               selected: project.selected?,
               photos: project.photos.map { |a| a.id.to_s }
@@ -37,7 +38,9 @@ module Admin
             {
               id: project.id,
               budget_id: project.budget.id,
-              project: project_params
+              project: project_params,
+              component_id: component.id,
+              assembly_slug: participatory_space.slug
             }
           end
 
@@ -66,29 +69,13 @@ def proposals_picker_projects_path
                 patch :update, params: params
 
                 expect(flash[:alert]).not_to be_empty
-                expect(response).to have_http_status(:ok)
+                expect(response).to have_http_status(:unprocessable_entity)
                 expect(subject).to render_template(:edit)
                 expect(response.body).to include("There was a problem updating this project")
               end
             end
           end
         end
-
-        context "when proposal linking is not enabled" do
-          let(:component) { create(:budgets_component) }
-
-          before do
-            allow(Decidim::Budgets).to receive(:enable_proposal_linking).and_return(false)
-          end
-
-          it "does not load the proposals admin picker concern" do
-            expect(Decidim::Budgets::Admin::ProjectsController).not_to receive(:include).with(
-              Decidim::Proposals::Admin::Picker
-            )
-
-            load "#{Decidim::Budgets::Engine.root}/app/controllers/decidim/budgets/admin/projects_controller.rb"
-          end
-        end
       end
     end
   end

spec/serializers/project_serializer_spec.rb

@@ -2,117 +2,165 @@
 
 require "spec_helper"
 
-module Decidim
-  module Budgets
-    describe ProjectSerializer do
-      let(:budget) { create(:budget) }
-      let(:serialized) { subject.run }
-      let(:attachment) { create :attachment, attached_to: project }
-      let(:proposals_component) { create(:component, manifest_name: "proposals", participatory_space: project.participatory_space) }
-      let(:proposals) { create_list(:proposal, 3, component: proposals_component) }
-      let(:category) { create(:category, participatory_space: budget.component.participatory_space) }
-      let(:scope) { create(:scope, organization: category.participatory_space.organization) }
-      let(:project) { create(:project, budget: budget, category: category, scope: scope) }
-      let!(:paper_ballot_result) { create :paper_ballot_result, project: project, votes: 10 }
-
-      subject { described_class.new(project) }
-
-      describe "#serializer" do
-        before { project.link_resources(proposals, "included_proposals") }
-
-        it "includes the keys" do
-          expect(serialized.keys).to eq([:id, :category, :scope, :participatory_space, :component, :title, :description, :budget, :budget_amount, :confirmed_votes, :paper_ballots, :total_votes, :comments, :created_at, :url, :related_proposals, :related_proposal_titles, :related_proposal_urls, :test_field])
-        end
-
-        it "includes the id" do
-          expect(serialized).to include(id: project.id)
-        end
-
-        it "includes the category" do
-          expect(serialized[:category]).to include(id: category.id)
-          expect(serialized[:category]).to include(name: category.name)
-        end
-
-        it "includes the scope" do
-          expect(serialized[:scope]).to include(id: project.scope.id)
-          expect(serialized[:scope]).to include(name: project.scope.name)
-        end
-
-        it "includes the participatory space" do
-          expect(serialized[:participatory_space]).to include(id: project.budget.component.participatory_space.id)
-          expect(serialized[:participatory_space]).to include(url: Decidim::ResourceLocatorPresenter.new(project.participatory_space).url)
-        end
-
-        it "includes the component" do
-          expect(serialized[:component]).to include(id: project.component.id)
-        end
-
-        it "includes the title" do
-          expect(serialized[:title]).to include(project.title)
-        end
-
-        it "includes the description" do
-          expect(serialized[:description]).to include(project.description)
-        end
-
-        it "includes the budget id" do
-          expect(serialized[:budget]).to eq(id: project.budget.id)
-        end
-
-        it "includes the budget amount" do
-          expect(serialized[:budget_amount]).to eq(project.budget_amount)
-        end
-
-        it "includes count of confirmed votes" do
-          expect(serialized[:confirmed_votes]).to eq(project.confirmed_orders_count)
-        end
-
-        it "includes count of paper ballots" do
-          expect(serialized[:paper_ballots]).to eq(project.paper_ballots)
-        end
-
-        it "includes count of total votes" do
-          expect(serialized[:total_votes]).to eq(project.total_votes)
-        end
-
-        it "includes comment count" do
-          expect(serialized[:comments]).to eq(project.comments.count)
-        end
-
-        it "includes the created at" do
-          expect(serialized).to include(created_at: project.created_at)
-        end
-
-        it "includes the url" do
-          expect(serialized[:url]).to eq(project.polymorphic_resource_url({}))
-        end
-
-        it "includes related proposal ids" do
-          expect(serialized[:related_proposals]).to match_array(project.linked_resources(:proposals,
-                                                                                         "included_proposals").map(&:id))
-        end
-
-        it "includes related proposal titles" do
-          expect(serialized[:related_proposal_titles]).to include(proposals.first.title["en"])
-          expect(serialized[:related_proposal_titles]).to include(proposals.second.title["en"])
-          expect(serialized[:related_proposal_titles]).to include(proposals.last.title["en"])
-        end
-
-        it "includes related proposal urls" do
-          expect(serialized[:related_proposal_urls]).to include(Decidim::ResourceLocatorPresenter.new(proposals.first).url)
-          expect(serialized[:related_proposal_urls]).to include(Decidim::ResourceLocatorPresenter.new(proposals.second).url)
-          expect(serialized[:related_proposal_urls]).to include(Decidim::ResourceLocatorPresenter.new(proposals.last).url)
-        end
-      end
-
-      context "when subscribed to the serialize event" do
-        ActiveSupport::Notifications.subscribe("decidim.serialize.budgets.project_serializer") do |_event_name, data|
-          data[:serialized_data][:test_field] = "Resource class: #{data[:resource].class}"
-        end
-
-        it "includes new field" do
-          expect(serialized[:test_field]).to eq("Resource class: Decidim::Budgets::Project")
-        end
+module Decidim::Budgets
+  describe ProjectSerializer do
+    let(:budget) { create(:budget, component:) }
+    let(:serialized) { subject.run }
+    let(:attachment) { create(:attachment, attached_to: project) }
+    let(:proposals_component) { create(:component, manifest_name: "proposals", participatory_space: project.participatory_space) }
+    let(:proposals) { create_list(:proposal, 3, component: proposals_component) }
+    let(:taxonomies) { create_list(:taxonomy, 2, :with_parent, organization: budget.component.organization) }
+    let(:project) { create(:project, budget:, taxonomies:) }
+    let(:router) { Decidim::EngineRouter.main_proxy(budget.component) }
+    let(:component) { create(:budgets_component) }
+    let!(:paper_ballot_result) { create :paper_ballot_result, project:, votes: 10 }
+    let(:serialized_taxonomies) do
+      { ids: taxonomies.pluck(:id) }.merge(taxonomies.to_h { |t| [t.id, t.name] })
+    end
+
+    subject { described_class.new(project) }
+
+    describe "#serializer" do
+      before { project.link_resources(proposals, "included_proposals") }
+
+      it "includes the id" do
+        expect(serialized).to include(id: project.id)
+      end
+
+      it "serializes the taxonomies" do
+        expect(serialized[:taxonomies]).to eq(serialized_taxonomies)
+      end
+
+      it "includes the participatory space" do
+        expect(serialized[:participatory_space]).to include(id: project.budget.component.participatory_space.id)
+        expect(serialized[:participatory_space]).to include(url: Decidim::ResourceLocatorPresenter.new(project.participatory_space).url)
+      end
+
+      it "includes the component" do
+        expect(serialized[:component]).to include(id: project.component.id)
+      end
+
+      it "includes the title" do
+        expect(serialized[:title]).to include(project.title)
+      end
+
+      it "includes the description" do
+        expect(serialized[:description]).to include(project.description)
+      end
+
+      it "includes the budget" do
+        expect(serialized[:budget]).to eq(
+                                         id: project.budget.id,
+                                         title: project.budget.title,
+                                         url: router.budget_url(project.budget)
+                                       )
+      end
+
+      it "includes the budget amount" do
+        expect(serialized[:budget_amount]).to eq(project.budget_amount)
+      end
+
+      it "includes comment count" do
+        expect(serialized[:comments]).to eq(project.comments.count)
+      end
+
+      it "includes count of paper ballots" do
+        expect(serialized[:paper_ballots]).to eq(project.paper_ballots)
+      end
+
+      it "includes count of total votes" do
+        expect(serialized[:total_votes]).to eq(project.total_votes)
+      end
+
+      it "includes the created at" do
+        expect(serialized).to include(created_at: project.created_at)
+      end
+
+      it "includes the url" do
+        expect(serialized[:url]).to eq(project.polymorphic_resource_url({}))
+      end
+
+      it "serializes the address" do
+        expect(serialized).to include(address: project.address)
+      end
+
+      it "includes related proposal ids" do
+        expect(serialized[:related_proposals]).to match_array(project.linked_resources(:proposals, "included_proposals").map(&:id))
+      end
+
+      it "includes related proposal titles" do
+        expect(serialized[:related_proposal_titles]).to include(proposals.first.title["en"])
+        expect(serialized[:related_proposal_titles]).to include(proposals.second.title["en"])
+        expect(serialized[:related_proposal_titles]).to include(proposals.last.title["en"])
+      end
+
+      it "includes related proposal urls" do
+        expect(serialized[:related_proposal_urls]).to include(Decidim::ResourceLocatorPresenter.new(proposals.first).url)
+        expect(serialized[:related_proposal_urls]).to include(Decidim::ResourceLocatorPresenter.new(proposals.second).url)
+        expect(serialized[:related_proposal_urls]).to include(Decidim::ResourceLocatorPresenter.new(proposals.last).url)
+      end
+
+      it "includes the updated date" do
+        expect(serialized).to include(updated_at: project.updated_at)
+      end
+
+      it "includes the follows count" do
+        expect(serialized).to include(follows_count: project.follows_count)
+      end
+
+      it "includes the selected date" do
+        expect(serialized).to include(selected_at: project.selected_at)
+      end
+
+      it "serializes the reference" do
+        expect(serialized).to include(reference: project.reference)
+      end
+
+      it "serializes the latitude" do
+        expect(serialized).to include(latitude: project.latitude)
+      end
+
+      it "serializes the longitude" do
+        expect(serialized).to include(longitude: project.longitude)
+      end
+    end
+
+    context "when subscribed to the serialize event" do
+      before do
+        I18n.backend.store_translations(
+          :en,
+          decidim: {
+            open_data: {
+              help: {
+                projects: {
+                  test_field: "Test field for projects serializer subscription"
+                }
+              }
+            }
+          }
+        )
+      end
+
+      ActiveSupport::Notifications.subscribe("decidim.serialize.budgets.project_serializer") do |_event_name, data|
+        data[:serialized_data][:test_field] = "Resource class: #{data[:resource].class}"
+      end
+
+      it "includes new field" do
+        expect(serialized[:test_field]).to eq("Resource class: Decidim::Budgets::Project")
+      end
+    end
+
+    context "when show votes is disabled" do
+      it "does not include count of confirmed votes" do
+        expect(serialized[:confirmed_votes]).to be_nil
+      end
+    end
+
+    context "when show votes is enabled" do
+      let(:component) { create(:budgets_component, :with_show_votes_enabled) }
+
+      it "includes count of confirmed votes" do
+        expect(serialized[:confirmed_votes]).to eq(project.confirmed_orders_count)
       end
     end
   end

spec/shared/import_proposals_to_projects_examples.rb

@@ -8,12 +8,13 @@
   include Decidim::ComponentPathHelper
 
   it "imports proposals from one component to a budget component" do
+    click_button "Import"
     click_link "Import proposals to projects"
 
     within ".import_proposals" do
       select origin_component.name["en"], from: :proposals_import_origin_component_id
       fill_in "Default budget", with: default_budget
-      check :proposals_import_import_all_accepted_proposals
+      check "Accepted" || "Rejected"
     end
 
     click_button "Import proposals to projects"