decidim-core 0.26.2 → 0.27.0.rc2

data/lib/decidim/core/test/shared_examples/resource_search_examples.rb

@@ -3,19 +3,18 @@
 require "spec_helper"
 
 shared_examples_for "a resource search" do |factory_name|
-  context "when no component is passed" do
-    let(:params) { default_params.merge(component: nil) }
-
-    it "raises an error" do
-      expect { subject }.to raise_error(StandardError, "Missing component")
+  describe "component_id" do
+    before do
+      get(
+        request_path,
+        headers: { "HOST" => component.organization.host }
+      )
     end
-  end
 
-  describe "component_id" do
     it "only returns resources from the given component" do
       external_resource = create(factory_name)
 
-      expect(subject).not_to include(external_resource)
+      expect(subject).not_to have_escaped_html(translated(external_resource.try(:title) || external_resource.try(:name)))
     end
   end
 end
@@ -28,7 +27,7 @@ shared_examples_for "a resource search with scopes" do |factory_name|
   end
 
   describe "scope_id filter" do
-    let(:params) { default_params.merge(scope_id: scope_ids) }
+    let(:filter_params) { { with_any_scope: scope_ids } }
 
     let(:scope1) { create :scope, organization: component.organization }
     let(:scope2) { create :scope, organization: component.organization }
@@ -38,11 +37,21 @@ shared_examples_for "a resource search with scopes" do |factory_name|
     let!(:resource2) { create(factory_name, { component: component, scope: scope2 }.merge(factory_params)) }
     let!(:resource3) { create(factory_name, { component: component, scope: subscope1 }.merge(factory_params)) }
 
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
     context "when a parent scope id is being sent" do
       let(:scope_ids) { [scope1.id] }
 
       it "filters resources by scope" do
-        expect(subject).to match_array [resource, resource3]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
 
@@ -50,7 +59,9 @@ shared_examples_for "a resource search with scopes" do |factory_name|
       let(:scope_ids) { [subscope1.id] }
 
       it "filters resources by scope" do
-        expect(subject).to eq [resource3]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
 
@@ -58,7 +69,9 @@ shared_examples_for "a resource search with scopes" do |factory_name|
       let(:scope_ids) { [scope2.id, scope1.id] }
 
       it "filters resources by scope" do
-        expect(subject).to match_array [resource, resource2, resource3]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
 
@@ -66,8 +79,19 @@ shared_examples_for "a resource search with scopes" do |factory_name|
       let!(:resource_without_scope) { create(factory_name, { component: component, scope: nil }.merge(factory_params)) }
       let(:scope_ids) { ["global"] }
 
+      before do
+        get(
+          request_path,
+          params: { filter: filter_params },
+          headers: { "HOST" => component.organization.host }
+        )
+      end
+
       it "returns resources without a scope" do
-        expect(subject).to match_array [resource_without_scope]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource_without_scope.try(:title) || resource_without_scope.try(:name)))
       end
     end
 
@@ -75,16 +99,34 @@ shared_examples_for "a resource search with scopes" do |factory_name|
       let!(:resource_without_scope) { create(factory_name, { component: component, scope: nil }.merge(factory_params)) }
       let(:scope_ids) { ["global", scope2.id, scope1.id] }
 
+      before do
+        get(
+          request_path,
+          params: { filter: filter_params },
+          headers: { "HOST" => component.organization.host }
+        )
+      end
+
       it "returns resources without a scope and with selected scopes" do
-        expect(subject).to match_array [resource_without_scope, resource, resource2, resource3]
+        expect(subject).to have_escaped_html(translated(resource_without_scope.try(:title) || resource_without_scope.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
       end
     end
   end
 end
 
-shared_examples_for "a resource search with categories" do |factory_name|
-  let(:participatory_process) { component.participatory_space }
-  let(:params) { default_params.merge(category_id: category_ids) }
+shared_examples_for "a resource search with categories" do |factory_name, category_mode = :multi|
+  let(:participatory_space) { component.participatory_space }
+  let(:filter_params) do
+    case category_mode
+    when :single
+      { with_category: category_ids }
+    else
+      { with_any_category: category_ids }
+    end
+  end
   let(:factory_params) do
     resource_params
   rescue StandardError
@@ -92,19 +134,30 @@ shared_examples_for "a resource search with categories" do |factory_name|
   end
 
   describe "results" do
-    let(:category1) { create :category, participatory_space: participatory_process }
-    let(:category2) { create :category, participatory_space: participatory_process }
-    let(:child_category) { create :category, participatory_space: participatory_process, parent: category2 }
+    let(:category1) { create :category, participatory_space: participatory_space }
+    let(:category2) { create :category, participatory_space: participatory_space }
+    let(:child_category) { create :category, participatory_space: participatory_space, parent: category2 }
     let!(:resource) { create(factory_name, { component: component }.merge(factory_params)) }
     let!(:resource2) { create(factory_name, { component: component, category: category1 }.merge(factory_params)) }
     let!(:resource3) { create(factory_name, { component: component, category: category2 }.merge(factory_params)) }
     let!(:resource4) { create(factory_name, { component: component, category: child_category }.merge(factory_params)) }
 
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
     context "when no category filter is present" do
       let(:category_ids) { nil }
 
       it "includes all resources" do
-        expect(subject).to match_array [resource, resource2, resource3, resource4]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
@@ -112,7 +165,10 @@ shared_examples_for "a resource search with categories" do |factory_name|
       let(:category_ids) { [category2.id] }
 
       it "includes only resources for that category and its children" do
-        expect(subject).to match_array [resource3, resource4]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
@@ -120,7 +176,10 @@ shared_examples_for "a resource search with categories" do |factory_name|
       let(:category_ids) { [child_category.id] }
 
       it "includes only resources for that category" do
-        expect(subject).to eq [resource4]
+        expect(subject).not_to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
@@ -128,15 +187,23 @@ shared_examples_for "a resource search with categories" do |factory_name|
       let(:category_ids) { ["without"] }
 
       it "returns resources without a category" do
-        expect(subject).to eq [resource]
+        expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
       end
     end
 
-    context "when `without` and some category id is being sent" do
-      let(:category_ids) { ["without", category1.id] }
+    if category_mode == :multi
+      context "when `without` and some category id is being sent" do
+        let(:category_ids) { ["without", category1.id] }
 
-      it "returns resources without a category and with the selected category" do
-        expect(subject).to match_array [resource, resource2]
+        it "returns resources without a category and with the selected category" do
+          expect(subject).to have_escaped_html(translated(resource.try(:title) || resource.try(:name)))
+          expect(subject).to have_escaped_html(translated(resource2.try(:title) || resource2.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(resource3.try(:title) || resource3.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(resource4.try(:title) || resource4.try(:name)))
+        end
       end
     end
   end
@@ -148,32 +215,42 @@ shared_examples_for "a resource search with origin" do |factory_name|
   rescue StandardError
     {}
   end
-  let(:params) { default_params.merge(origin: origins) }
+  let(:filter_params) { { with_any_origin: origins } }
 
   describe "results" do
     let!(:official_resource) { create(factory_name, :official, { component: component }.merge(factory_params)) }
     let!(:user_group_resource) { create(factory_name, :user_group_author, { component: component }.merge(factory_params)) }
-    let!(:citizen_resource) { create(factory_name, :citizen_author, { component: component }.merge(factory_params)) }
+    let!(:participant_resource) { create(factory_name, :participant_author, { component: component }.merge(factory_params)) }
 
     if FactoryBot.factory_by_name(factory_name).defined_traits.map(&:name).include?(:meeting_resource)
       let!(:meeting_resource) { create(factory_name, :official_meeting, { component: component }.merge(factory_params)) }
     end
 
+    before do
+      get(
+        request_path,
+        params: { filter: filter_params },
+        headers: { "HOST" => component.organization.host }
+      )
+    end
+
     context "when filtering official resources" do
       let(:origins) { %w(official) }
 
       it "returns only official resources" do
-        expect(subject.size).to eq(1)
-        expect(subject).to include(official_resource)
+        expect(subject).to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
       end
     end
 
-    context "when filtering citizen resources" do
-      let(:origins) { %w(citizens) }
+    context "when filtering participants resources" do
+      let(:origins) { %w(participants) }
 
       it "returns only citizen resources" do
-        expect(subject.size).to eq(1)
-        expect(subject).to include(citizen_resource)
+        expect(subject).not_to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
       end
     end
 
@@ -181,8 +258,9 @@ shared_examples_for "a resource search with origin" do |factory_name|
       let(:origins) { %w(user_group) }
 
       it "returns only user groups resources" do
-        expect(subject.size).to eq(1)
-        expect(subject).to include(user_group_resource)
+        expect(subject).not_to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+        expect(subject).not_to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+        expect(subject).to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
       end
     end
 
@@ -191,8 +269,10 @@ shared_examples_for "a resource search with origin" do |factory_name|
         let(:origins) { %w(meeting) }
 
         it "returns only meeting resources" do
-          expect(subject.size).to eq(1)
-          expect(subject).to include(meeting_resource)
+          expect(subject).not_to have_escaped_html(translated(official_resource.try(:title) || official_resource.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(participant_resource.try(:title) || participant_resource.try(:name)))
+          expect(subject).not_to have_escaped_html(translated(user_group_resource.try(:title) || user_group_resource.try(:name)))
+          expect(subject).to have_escaped_html(translated(meeting_resource.try(:title) || meeting_resource.try(:name)))
         end
       end
     end

data/lib/decidim/core/test/shared_examples/resourceable.rb

@@ -8,10 +8,4 @@ shared_examples_for "resourceable" do
       expect(subject.resource_title).to be_present
     end
   end
-
-  describe "resource_description" do
-    it "is defined" do
-      expect(subject.resource_title).to be_present
-    end
-  end
 end

data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb

@@ -83,7 +83,7 @@ shared_examples "global search of participatory spaces" do
   describe "Search" do
     # trick to force creating participatory_space2 declared in users of this shared_examples
     let!(:spaces) { [participatory_space, participatory_space2] }
-    let(:description_2) do
+    let(:description2) do
       msg = "Chewie, I'll be waiting for your signal. Take care, you two. May the Force be with you. Ow!"
       { ca: "CA:#{msg}", en: "EN:#{msg}", es: "ES:#{msg}" }
     end

data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb

@@ -6,7 +6,7 @@ RSpec.shared_context "when a resource is ready for global search" do
   let!(:scope1) { create :scope, organization: organization }
 
   let(:test_locales) { [:ca, :en, :es] }
-  let(:description_1) do
+  let(:description1) do
     Decidim::Faker::Localized.prefixed("Poemes als terrats de l'Empordà, Ow!", test_locales)
   end
 end

data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb

@@ -6,11 +6,11 @@ shared_context "with resources to be endorsed or not" do
   include_context "with a component"
 
   # Should be overriden and create one main resource
-  let!(:resource) {}
+  let!(:resource) { nil }
   # the name of the resource to be clicked from the component view
-  let(:resource_name) {}
+  let(:resource_name) { nil }
   # Should be overriden and create 3 extra resources in the current component
-  let!(:resources) {}
+  let!(:resources) { nil }
 end
 
 shared_examples "Endorse resource system specs" do

data/lib/decidim/core/test/shared_examples/translated_event_examples.rb

@@ -56,7 +56,7 @@ shared_examples_for "a translated event" do
       end
 
       context "when translation is not available" do
-        let(:body) { { "en": en_body } }
+        let(:body) { { en: en_body } }
 
         it "does perform translation" do
           expect(subject.perform_translation?).to eq(translatable)
@@ -104,7 +104,7 @@ shared_examples_for "a translated event" do
       end
 
       context "when translation is not available" do
-        let(:body) { { "en": en_body } }
+        let(:body) { { en: en_body } }
 
         it "does perform translation" do
           expect(subject.perform_translation?).to eq(translatable)

data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples "versions controller" do
+  let(:base_params) do
+    if resource.is_a?(Decidim::Participable)
+      { "#{resource.model_name.singular_route_key}_slug".to_sym => resource.slug }
+    else
+      { "#{resource.model_name.singular_route_key}_id".to_sym => resource.id }
+    end
+  end
+
+  before do
+    request.env["decidim.current_organization"] = resource.organization
+
+    if resource.is_a?(Decidim::HasComponent)
+      request.env["decidim.current_participatory_space"] = resource.participatory_space
+      request.env["decidim.current_component"] = resource.component
+    end
+  end
+
+  describe "GET show" do
+    context "with an existing version" do
+      it "returns a HTTP 200" do
+        get :show, params: base_params.merge(id: 1)
+
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context "when the resource does not exist" do
+      it "raises a routing error" do
+        expect do
+          get :show, params: base_params.merge(id: 999_999_999)
+        end.to raise_error(ActionController::RoutingError)
+      end
+    end
+  end
+end

data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 # users of this test should delare the `subject` variable.
 shared_examples "with endorsable permissions can perform actions related to endorsable" do
   let(:action_subject) { :endorsement }
-  let(:resource) { create :dummy_resource }
+  let(:resource) { create :dummy_resource, component: component }
   before do
     context[:current_settings] = double(current_settings)
     context[:resource] = resource

data/lib/decidim/core/test.rb

@@ -71,3 +71,5 @@ require "decidim/core/test/shared_examples/categories_container_examples"
 require "decidim/core/test/shared_examples/assembly_announcements_examples"
 require "decidim/core/test/shared_examples/translated_event_examples"
 require "decidim/core/test/shared_examples/conversations_examples"
+require "decidim/core/test/shared_examples/resource_endorsed_event_examples"
+require "decidim/core/test/shared_examples/versions_controller_examples"

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.26.2"
+      "0.27.0.rc2"
     end
   end
 end