- <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+ <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search") %>
<% if current_participatory_space.has_subscopes? %>
- <%= form.check_boxes_tree :territorial_scope_id, filter_scopes_values, legend_title: t(".territorial_scope") %>
+ <%= form.check_boxes_tree :with_any_territorial_scope_id, filter_scopes_values, legend_title: t(".territorial_scope") %>
<% end %>
<% if current_component.categories.any? %>
- <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category") %>
+ <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category") %>
<% end %>
<% if current_participatory_space.components.published.where(manifest_name: "sdgs").any? %>
diff --git a/decidim-challenges.gemspec b/decidim-challenges.gemspec
index 3870617b..f0040eba 100644
--- a/decidim-challenges.gemspec
+++ b/decidim-challenges.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
s.email = ["199462+tramuntanal@users.noreply.github.com"]
s.license = "AGPL-3.0"
s.homepage = "https://github.com/decidim/decidim-module-challenges"
- s.required_ruby_version = "~> 2.7.2"
+ s.required_ruby_version = ">= 3.0.6"
s.name = "decidim-challenges"
s.summary = "A decidim challenges module"
@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
s.add_development_dependency "decidim", Decidim::Challenges.decidim_version
s.add_development_dependency "decidim-dev", Decidim::Challenges.decidim_version
+ s.metadata["rubygems_mfa_required"] = "true"
end
diff --git a/lib/decidim/challenges/component.rb b/lib/decidim/challenges/component.rb
index 05980be1..c0dfd939 100644
--- a/lib/decidim/challenges/component.rb
+++ b/lib/decidim/challenges/component.rb
@@ -12,7 +12,7 @@
component.admin_engine = Decidim::Challenges::AdminEngine
component.icon = "media/images/decidim_challenges_icon.svg"
- component.data_portable_entities = ["Decidim::Challenge::Survey"]
+ component.data_portable_entities = ["Decidim::Challenges::Survey"]
# component.on(:before_destroy) do |instance|
# # Code executed before removing the component
diff --git a/lib/decidim/challenges/version.rb b/lib/decidim/challenges/version.rb
index b2e1c7dd..0d280402 100644
--- a/lib/decidim/challenges/version.rb
+++ b/lib/decidim/challenges/version.rb
@@ -4,11 +4,11 @@ module Decidim
# This holds the decidim-meetings version.
module Challenges
def self.version
- "0.2.0"
+ "0.3.0"
end
def self.decidim_version
- "~> 0.26.2"
+ "~> 0.27"
end
end
end
diff --git a/spec/cells/decidim/challenges/challenge_cell_spec.rb b/spec/cells/decidim/challenges/challenge_cell_spec.rb
index b1e2b001..f6cf9b39 100644
--- a/spec/cells/decidim/challenges/challenge_cell_spec.rb
+++ b/spec/cells/decidim/challenges/challenge_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Challenges
controller Decidim::Challenges::ChallengesController
let(:description) do
- Decidim::Faker::Localized.sentence(3)
+ Decidim::Faker::Localized.sentence
end
let!(:challenge) { create :challenge, global_description: description }
diff --git a/spec/cells/decidim/challenges/challenge_m_cell_spec.rb b/spec/cells/decidim/challenges/challenge_m_cell_spec.rb
index 6dd18fb8..e5b7ab70 100644
--- a/spec/cells/decidim/challenges/challenge_m_cell_spec.rb
+++ b/spec/cells/decidim/challenges/challenge_m_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Challenges
controller Decidim::Challenges::ChallengesController
let(:description) do
- Decidim::Faker::Localized.sentence(3)
+ Decidim::Faker::Localized.sentence
end
let(:component) { create(:challenges_component, :with_card_image_allowed) }
diff --git a/spec/cells/decidim/problems/problem_cell_spec.rb b/spec/cells/decidim/problems/problem_cell_spec.rb
index 21a086d4..908a851f 100644
--- a/spec/cells/decidim/problems/problem_cell_spec.rb
+++ b/spec/cells/decidim/problems/problem_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Problems
controller Decidim::Problems::ProblemsController
let(:description) do
- Decidim::Faker::Localized.sentence(3)
+ Decidim::Faker::Localized.sentence
end
let!(:problem) { create :problem, description: description }
let(:model) { problem }
diff --git a/spec/cells/decidim/problems/problem_m_cell_spec.rb b/spec/cells/decidim/problems/problem_m_cell_spec.rb
index 0be8f37c..75273869 100644
--- a/spec/cells/decidim/problems/problem_m_cell_spec.rb
+++ b/spec/cells/decidim/problems/problem_m_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Problems
controller Decidim::Problems::ProblemsController
let(:description) do
- Decidim::Faker::Localized.sentence(3)
+ Decidim::Faker::Localized.sentence
end
let!(:problem) { create :problem, description: description }
let(:model) { problem }
diff --git a/spec/cells/decidim/solutions/solution_cell_spec.rb b/spec/cells/decidim/solutions/solution_cell_spec.rb
index cc81f907..c0a38129 100644
--- a/spec/cells/decidim/solutions/solution_cell_spec.rb
+++ b/spec/cells/decidim/solutions/solution_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Solutions
controller Decidim::Solutions::SolutionsController
let(:description) do
- Decidim::Faker::Localized.sentence(3)
+ Decidim::Faker::Localized.sentence
end
let!(:solution) { create :solution, description: description }
diff --git a/spec/cells/decidim/solutions/solution_m_cell_spec.rb b/spec/cells/decidim/solutions/solution_m_cell_spec.rb
index 2b6edd92..eb1dbf6a 100644
--- a/spec/cells/decidim/solutions/solution_m_cell_spec.rb
+++ b/spec/cells/decidim/solutions/solution_m_cell_spec.rb
@@ -7,7 +7,7 @@ module Decidim::Solutions
controller Decidim::Solutions::SolutionsController
let(:description) do
- Decidim::Faker::Localized.sentence(3)
+ Decidim::Faker::Localized.sentence
end
let(:model) { solution }
diff --git a/spec/helpers/decidim/challenges/challenges_helper_spec.rb b/spec/helpers/decidim/challenges/challenges_helper_spec.rb
index 2b651fc7..8b596292 100644
--- a/spec/helpers/decidim/challenges/challenges_helper_spec.rb
+++ b/spec/helpers/decidim/challenges/challenges_helper_spec.rb
@@ -19,7 +19,6 @@ module Decidim::Challenges
expect(subject).to include(solution)
end
- # rubocop: disable RSpec/RepeatedExample
it "hides solutions if the problem is published but the solutions are NOT published" do
solution.update_attribute(:published_at, nil)
expect(subject).to be_empty
@@ -34,8 +33,6 @@ module Decidim::Challenges
solution.update_attribute(:published_at, nil)
expect(subject).to be_empty
end
- # rubocop: enable RSpec/RepeatedExample
-
it "hides solutions if the problem is NOT published" do
problem.update_attribute(:published_at, nil)
expect(subject).to be_empty
diff --git a/spec/lib/decidim/challenges/component_spec.rb b/spec/lib/decidim/challenges/component_spec.rb
index d448be3b..e3ac2c80 100644
--- a/spec/lib/decidim/challenges/component_spec.rb
+++ b/spec/lib/decidim/challenges/component_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-describe "Challenges component" do # rubocop:disable RSpec/DescribeClass
+describe "Challenges component" do
subject { component }
let(:component) { create :challenges_component }
diff --git a/spec/lib/decidim/problems/component_spec.rb b/spec/lib/decidim/problems/component_spec.rb
index 3b33e72b..8affaf6f 100644
--- a/spec/lib/decidim/problems/component_spec.rb
+++ b/spec/lib/decidim/problems/component_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-describe "Problems component" do # rubocop:disable RSpec/DescribeClass
+describe "Problems component" do
subject { component }
let(:component) { create :problems_component }
diff --git a/spec/lib/decidim/solutions/component_spec.rb b/spec/lib/decidim/solutions/component_spec.rb
index d9331beb..4c0ff42f 100644
--- a/spec/lib/decidim/solutions/component_spec.rb
+++ b/spec/lib/decidim/solutions/component_spec.rb
@@ -2,7 +2,7 @@
require "spec_helper"
-describe "Solutions component" do # rubocop:disable RSpec/DescribeClass
+describe "Solutions component" do
subject { component }
let(:component) { create :solutions_component }
diff --git a/spec/permissions/decidim/challenges/admin/permissions_spec.rb b/spec/permissions/decidim/challenges/admin/permissions_spec.rb
index 2d02f502..1c4f12d4 100644
--- a/spec/permissions/decidim/challenges/admin/permissions_spec.rb
+++ b/spec/permissions/decidim/challenges/admin/permissions_spec.rb
@@ -9,16 +9,22 @@
let(:user) { create :user, :admin, organization: organization }
let(:challenge) { create :challenge }
let(:context) { {} }
- let(:permission_action) { Decidim::PermissionAction.new(action) }
+ let(:permission_action) do
+ Decidim::PermissionAction.new(
+ action: action[:action],
+ subject: action[:subject],
+ scope: action[:scope]
+ )
+ end
shared_examples "access for role" do |access|
case access
when true
- it { is_expected.to eq true }
+ it { is_expected.to be true }
when :not_set
it_behaves_like "permission is not set"
else
- it { is_expected.to eq false }
+ it { is_expected.to be false }
end
end
diff --git a/spec/permissions/decidim/problems/admin/permissions_spec.rb b/spec/permissions/decidim/problems/admin/permissions_spec.rb
index 6c298a5f..fab29960 100644
--- a/spec/permissions/decidim/problems/admin/permissions_spec.rb
+++ b/spec/permissions/decidim/problems/admin/permissions_spec.rb
@@ -9,16 +9,22 @@
let(:user) { create :user, :admin, organization: organization }
let(:problem) { create :problem }
let(:context) { {} }
- let(:permission_action) { Decidim::PermissionAction.new(action) }
+ let(:permission_action) do
+ Decidim::PermissionAction.new(
+ action: action[:action],
+ subject: action[:subject],
+ scope: action[:scope]
+ )
+ end
shared_examples "access for role" do |access|
case access
when true
- it { is_expected.to eq true }
+ it { is_expected.to be true }
when :not_set
it_behaves_like "permission is not set"
else
- it { is_expected.to eq false }
+ it { is_expected.to be false }
end
end
diff --git a/spec/permissions/decidim/solutions/admin/permissions_spec.rb b/spec/permissions/decidim/solutions/admin/permissions_spec.rb
index e1781bcf..a84ddbdc 100644
--- a/spec/permissions/decidim/solutions/admin/permissions_spec.rb
+++ b/spec/permissions/decidim/solutions/admin/permissions_spec.rb
@@ -9,16 +9,22 @@
let(:user) { create :user, :admin, organization: organization }
let(:solution) { create :solution }
let(:context) { {} }
- let(:permission_action) { Decidim::PermissionAction.new(action) }
+ let(:permission_action) do
+ Decidim::PermissionAction.new(
+ action: action[:action],
+ subject: action[:subject],
+ scope: action[:scope]
+ )
+ end
shared_examples "access for role" do |access|
case access
when true
- it { is_expected.to eq true }
+ it { is_expected.to be true }
when :not_set
it_behaves_like "permission is not set"
else
- it { is_expected.to eq false }
+ it { is_expected.to be false }
end
end
diff --git a/spec/serializers/decidim/challenges/survey_serializer_spec.rb b/spec/serializers/decidim/challenges/survey_serializer_spec.rb
index fd0b83ed..841600cb 100644
--- a/spec/serializers/decidim/challenges/survey_serializer_spec.rb
+++ b/spec/serializers/decidim/challenges/survey_serializer_spec.rb
@@ -6,7 +6,8 @@ module Decidim::Challenges
describe SurveySerializer do
describe "#serialize" do
let!(:survey) { create(:survey) }
- let!(:subject) { described_class.new(survey) }
+
+ subject { described_class.new(survey) }
context "when there are not a questionnaire" do
it "includes the id" do
@@ -25,6 +26,7 @@ module Decidim::Challenges
context "when questionnaire enabled" do
let(:challenge) { create :challenge, :with_survey_enabled }
+ let(:serialized) { subject.serialize }
let!(:user) { create(:user, organization: challenge.organization) }
let!(:survey) { create(:survey, challenge: challenge, user: user) }
@@ -56,8 +58,7 @@ module Decidim::Challenges
create :answer_choice, answer: singlechoice_answer, answer_option: answer_option, body: answer_option.body[I18n.locale.to_s]
end
- let!(:subject) { described_class.new(survey) }
- let(:serialized) { subject.serialize }
+ subject { described_class.new(survey) }
it "includes the answer for each question" do
expect(serialized[:survey_form_answers]).to include(
diff --git a/spec/services/decidim/challenges/challenge_search_spec.rb b/spec/services/decidim/challenges/challenge_search_spec.rb
deleted file mode 100644
index aad39093..00000000
--- a/spec/services/decidim/challenges/challenge_search_spec.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require_relative "../search_scopes_examples"
-
-module Decidim
- module Challenges
- describe ChallengeSearch do
- let(:component) { create(:challenges_component) }
- let(:participatory_process) { component.participatory_space }
- let!(:challenges_list) { create_list(:challenge, 3, component: component) }
-
- describe "results" do
- subject do
- described_class.new(
- component: component,
- search_text: search_text,
- state: states,
- related_to: related_to,
- scope_id: scope_ids,
- category_id: category_ids,
- sdgs_codes: sdgs_codes
- ).results
- end
-
- let(:search_text) { nil }
- let(:related_to) { nil }
- let(:states) { nil }
- let(:scope_ids) { nil }
- let(:category_ids) { nil }
- let(:sdgs_codes) { nil }
-
- it "only includes challenges from the given component" do
- other_challenge = create(:challenge)
-
- expect(subject).to match_array(challenges_list)
- expect(subject).not_to include(other_challenge)
- end
-
- describe "search_text filter" do
- let(:search_text) { "dog" }
-
- it "returns the challenges containing the search in the title or the body" do
- dog_challenge = create(:challenge, title: { I18n.locale => "A dog" }, component: component)
-
- expect(subject).to include(dog_challenge)
- expect(subject.size).to eq(1)
- end
- end
-
- describe "state filter" do
- context "when filtering for default states" do
- it "returns all challenges" do
- expect(subject.size).to eq(3)
- expect(subject).to match_array(challenges_list)
- end
- end
-
- context "when filtering challenges in :proposal state" do
- let(:states) { %w(proposal) }
-
- it "hides execution and finished proposals" do
- create(:challenge, :finished, component: component)
- proposal_challenge = create(:challenge, :proposal, component: component)
-
- expect(subject.size).to eq(1)
- expect(subject).to include(proposal_challenge)
- end
- end
-
- context "when filtering challenges in :execution state" do
- let(:states) { %w(execution) }
-
- it "returns only execution proposals" do
- create(:challenge, :finished, component: component)
- create(:challenge, :proposal, component: component)
-
- expect(subject.size).to eq(3)
- expect(subject).to match_array(challenges_list)
- end
- end
-
- context "when filtering challenges in :finished state" do
- let(:states) { %w(finished) }
-
- it "returns only finished proposals" do
- finished_challenge = create(:challenge, :finished, component: component)
- create(:challenge, :proposal, component: component)
-
- expect(subject.size).to eq(1)
- expect(subject).to include(finished_challenge)
- end
- end
- end
-
- describe "challenge territorial scopes" do
- include_context "with example scopes"
-
- let(:resources_list) { challenges_list }
- let!(:resource_without_scope) { create(:challenge, component: component, scope: nil) }
- let!(:resource_1) { create(:challenge, component: component, scope: scope_1) }
- let!(:resource_2) { create(:challenge, component: component, scope: scope_2) }
- let!(:resource_3) { create(:challenge, component: component, scope: subscope_1) }
-
- context "with sectorial_scope_ids" do
- include_examples "search scope filter", "scope_ids"
- end
- end
-
- describe "ods filter" do
- context "when none is selected" do
- it "does not apply the filter" do
- expect(subject).to match_array(challenges_list)
- end
- end
-
- context "when one SDG is selected" do
- let(:sdg_code) { Decidim::Sdgs::Sdg::SDGS.index(:responsible_consumption) }
- let!(:challenge_w_sdg) { create(:challenge, component: component, sdg_code: sdg_code) }
- let(:sdgs_codes) { [sdg_code] }
-
- it "returns the problems associated to the given SDG" do
- expect(subject.pluck(:id)).to contain_exactly(challenge_w_sdg.id)
- end
- end
- end
-
- # describe "related_to filter" do
- pending "when filtering by related to problems"
- # let(:related_to) { 'Decidim::Meetings::Meeting'.underscore }
- # let(:problems_component) { create(:component, manifest_name: 'problems', participatory_space: participatory_process) }
- # let(:problem) { create :problem, component: problems_component }
-
- # it "returns only challenges related to problems"
- # related_challenge = create(:challenge, :accepted, component: component)
- # related_challenge_2 = create(:challenge, :accepted, component: component)
- # create_list(:challenge, 3, component: component)
- # problem.link_resources([related_challenge], 'challenges_from_problem')
- # related_challenge_2.link_resources([problem], 'challenges_from_problem')
-
- # expect(subject).to match_array([related_challenge, related_challenge_2])
- # end
-
- pending "when filtering by related to resources"
- # let(:related_to) { 'Decidim::DummyResources::DummyResource'.underscore }
- # let(:dummy_component) { create(:component, manifest_name: 'dummy', participatory_space: participatory_process) }
- # let(:dummy_resource) { create :dummy_resource, component: dummy_component }
-
- # it "returns only challenges related to results"
- # related_challenge = create(:challenge, :accepted, component: component)
- # related_challenge_2 = create(:challenge, :accepted, component: component)
- # create_list(:challenge, 3, component: component)
- # dummy_resource.link_resources([related_challenge], 'included_challenges')
- # related_challenge_2.link_resources([dummy_resource], 'included_challenges')
-
- # expect(subject).to match_array([related_challenge, related_challenge_2])
- # end
- # end
- end
- end
- end
-end
diff --git a/spec/services/decidim/problems/problem_search_spec.rb b/spec/services/decidim/problems/problem_search_spec.rb
deleted file mode 100644
index 3611554a..00000000
--- a/spec/services/decidim/problems/problem_search_spec.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require_relative "../search_scopes_examples"
-
-module Decidim
- module Problems
- describe ProblemSearch do
- let!(:challenge) { create(:challenge) }
- let(:component) { create(:component, organization: challenge.component.organization, manifest_name: "problems") }
- let(:participatory_process) { component.participatory_space }
- let!(:problems_list) { create_list(:problem, 3, component: component, challenge: challenge) }
-
- describe "results" do
- subject do
- described_class.new(
- component: component,
- search_text: search_text,
- state: states,
- related_to: related_to,
- sectorial_scope_id: sectorial_scope_ids,
- technological_scope_id: technological_scope_ids,
- territorial_scope_id: territorial_scope_ids,
- category_id: category_ids,
- sdgs_codes: sdgs_codes
- ).results
- end
-
- let(:search_text) { nil }
- let(:related_to) { nil }
- let(:states) { nil }
- let(:sectorial_scope_ids) { nil }
- let(:technological_scope_ids) { nil }
- let(:territorial_scope_ids) { nil }
- let(:category_ids) { nil }
- let(:sdgs_codes) { nil }
-
- it "only includes problems from the given component" do
- other_problem = create(:problem)
-
- expect(subject).to match_array(problems_list)
- expect(subject).not_to include(other_problem)
- end
-
- describe "search_text filter" do
- let(:search_text) { "dog" }
-
- it "returns the problems containing the search in the title or the body" do
- dog_problem = create(:problem, title: { I18n.locale => "A dog" }, component: component)
-
- expect(subject).to include(dog_problem)
- expect(subject.size).to eq(1)
- end
- end
-
- # describe "when filtering problems by challenge" do
- pending "finds the problems associated with the given challenge"
- # end
-
- describe "problem scopes" do
- include_context "with example scopes"
-
- let(:resources_list) { problems_list }
- let!(:resource_without_scope) { create(:problem, component: component, sectorial_scope: nil, technological_scope: nil) }
- let!(:resource_1) { create(:problem, component: component, sectorial_scope: scope_1, technological_scope: scope_1) }
- let!(:resource_2) { create(:problem, component: component, sectorial_scope: scope_2, technological_scope: scope_2) }
- let!(:resource_3) { create(:problem, component: component, sectorial_scope: subscope_1, technological_scope: subscope_1) }
-
- context "with sectorial_scope_ids" do
- include_examples "search scope filter", "sectorial_scope_ids"
- end
-
- context "with technological_scope_ids" do
- include_examples "search scope filter", "technological_scope_ids"
- end
- end
-
- describe "challenge territorial scopes" do
- include_context "with example scopes"
-
- let(:challenges_component) { create(:challenges_component, participatory_space: component.participatory_space) }
- let!(:challenge_without_scope) { create(:challenge, component: challenges_component, scope: nil) }
- let!(:challenge_1) { create(:challenge, component: challenges_component, scope: scope_1) }
- let!(:challenge_2) { create(:challenge, component: challenges_component, scope: scope_2) }
- let!(:challenge_3) { create(:challenge, component: challenges_component, scope: subscope_1) }
-
- let(:resources_list) { problems_list }
- let!(:resource_without_scope) { create(:problem, component: component, challenge: challenge_without_scope) }
- let!(:resource_1) { create(:problem, component: component, challenge: challenge_1) }
- let!(:resource_2) { create(:problem, component: component, challenge: challenge_2) }
- let!(:resource_3) { create(:problem, component: component, challenge: challenge_3) }
-
- context "with sectorial_scope_ids" do
- include_examples "search scope filter", "territorial_scope_ids"
- end
- end
-
- describe "state filter" do
- context "when filtering for default states" do
- it "returns all problems" do
- expect(subject.size).to eq(3)
- expect(subject).to match_array(problems_list)
- end
- end
-
- context "when filtering problems in :proposal state" do
- let(:states) { %w(proposal) }
-
- it "hides execution and finished proposals" do
- create(:problem, :finished, component: component)
- proposal_problem = create(:problem, :proposal, component: component)
-
- expect(subject.size).to eq(1)
- expect(subject).to include(proposal_problem)
- end
- end
-
- context "when filtering problems in :execution state" do
- let(:states) { %w(execution) }
-
- it "returns only execution proposals" do
- create(:problem, :finished, component: component, challenge: challenge)
- create(:problem, :proposal, component: component, challenge: challenge)
-
- expect(subject.size).to eq(3)
- expect(subject).to match_array(problems_list)
- end
- end
-
- context "when filtering problems in :finished state" do
- let(:states) { %w(finished) }
-
- it "returns only finished proposals" do
- finished_problem = create(:problem, :finished, component: component)
- create(:problem, :proposal, component: component)
-
- expect(subject.size).to eq(1)
- expect(subject).to include(finished_problem)
- end
- end
- end
-
- describe "SDGs filter" do
- context "when none is selected" do
- it "does not apply the filter" do
- expect(subject).to match_array(problems_list)
- end
- end
-
- context "when one SDG is selected" do
- let(:sdg_code) { :zero_hunger }
- let!(:challenge_w_sdg) { create(:challenge, component: challenge.component, sdg_code: sdg_code) }
- let!(:problem_w_sdg) { create(:problem, component: component, challenge: challenge_w_sdg) }
- let(:sdgs_codes) { [sdg_code] }
-
- it "returns the problems associated to the given SDG" do
- expect(subject.pluck(:id)).to match_array([problem_w_sdg.id])
- end
- end
- end
-
- # describe "related_to filter" do
- pending "when filtering by related to problems"
- # let(:related_to) { 'Decidim::Meetings::Meeting'.underscore }
- # let(:problems_component) { create(:component, manifest_name: 'problems', participatory_space: participatory_process) }
- # let(:problem) { create :problem, component: problems_component }
-
- # it "returns only problems related to problems"
- # related_problem = create(:problem, :accepted, component: component)
- # related_problem_2 = create(:problem, :accepted, component: component)
- # create_list(:problem, 3, component: component)
- # problem.link_resources([related_problem], 'problems_from_problem')
- # related_problem_2.link_resources([problem], 'problems_from_problem')
-
- # expect(subject).to match_array([related_problem, related_problem_2])
- # end
-
- pending "when filtering by related to resources"
- # let(:related_to) { 'Decidim::DummyResources::DummyResource'.underscore }
- # let(:dummy_component) { create(:component, manifest_name: 'dummy', participatory_space: participatory_process) }
- # let(:dummy_resource) { create :dummy_resource, component: dummy_component }
-
- # it "returns only problems related to results"
- # related_problem = create(:problem, :accepted, component: component)
- # related_problem_2 = create(:problem, :accepted, component: component)
- # create_list(:problem, 3, component: component)
- # dummy_resource.link_resources([related_problem], 'included_problems')
- # related_problem_2.link_resources([dummy_resource], 'included_problems')
-
- # expect(subject).to match_array([related_problem, related_problem_2])
- # end
- # end
- end
- end
- end
-end
diff --git a/spec/services/decidim/search_scopes_examples.rb b/spec/services/decidim/search_scopes_examples.rb
deleted file mode 100644
index 6a791bac..00000000
--- a/spec/services/decidim/search_scopes_examples.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_context "with example scopes" do
- let(:scope_1) { create :scope, organization: component.organization }
- let(:scope_2) { create :scope, organization: component.organization }
- let(:subscope_1) { create :scope, organization: component.organization, parent: scope_1 }
-end
-
-# Parameters:
-# scope_filter_param_name - is the symbol corresponding to the name used for the filter's parameter.
-#
-RSpec.shared_examples "search scope filter" do |scope_filter_param_name|
- context "when a parent scope id is being sent" do
- let(scope_filter_param_name) { [scope_1.id] }
-
- it "filters resources by scope" do
- expect(subject).to match_array [resource_1, resource_3]
- end
- end
-
- context "when a subscope id is being sent" do
- let(scope_filter_param_name) { [subscope_1.id] }
-
- it "filters resources by scope" do
- expect(subject).to eq [resource_3]
- end
- end
-
- context "when multiple ids are sent" do
- let(scope_filter_param_name) { [scope_2.id, scope_1.id] }
-
- it "filters resources by scope" do
- expect(subject).to match_array [resource_1, resource_2, resource_3]
- end
- end
-
- context "when `global` is being sent" do
- let(scope_filter_param_name) { ["global"] }
-
- it "returns resources without a scope" do
- expect(subject.pluck(:id).sort).to eq(resources_list.pluck(:id) + [resource_without_scope.id])
- end
- end
-
- context "when `global` and some ids is being sent" do
- let(scope_filter_param_name) { ["global", scope_2.id, scope_1.id] }
-
- it "returns resources without a scope and with selected scopes" do
- expect(subject.pluck(:id)).to match_array(resources_list.pluck(:id) + [resource_without_scope.id, resource_1.id, resource_2.id, resource_3.id])
- end
- end
-end
diff --git a/spec/services/decidim/solutions/solution_search_spec.rb b/spec/services/decidim/solutions/solution_search_spec.rb
deleted file mode 100644
index e797df0f..00000000
--- a/spec/services/decidim/solutions/solution_search_spec.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-require_relative "../search_scopes_examples"
-
-module Decidim
- module Solutions
- describe SolutionSearch do
- let!(:challenge) { create(:challenge) }
- let!(:problem) { create(:problem, challenge: challenge) }
- let(:component) { create(:solutions_component, organization: challenge.component.organization) }
- let(:participatory_process) { component.participatory_space }
- let!(:solutions_list) { create_list(:solution, 3, component: component, problem: problem) }
-
- describe "results" do
- subject do
- described_class.new(
- component: component,
- search_text: search_text,
- state: states,
- related_to: related_to,
- territorial_scope_id: territorial_scope_ids,
- category_id: category_ids,
- sdgs_codes: sdgs_codes
- ).results
- end
-
- let(:search_text) { nil }
- let(:related_to) { nil }
- let(:states) { nil }
- let(:territorial_scope_ids) { nil }
- let(:category_ids) { nil }
- let(:sdgs_codes) { nil }
-
- it "only includes solutions from the given component" do
- other_solution = create(:solution, problem: problem)
-
- expect(subject).to match_array(solutions_list)
- expect(subject).not_to include(other_solution)
- end
-
- describe "search_text filter" do
- let(:search_text) { "dog" }
-
- it "returns the solutions containing the search in the title or the body" do
- dog_solution = create(:solution, title: { I18n.locale => "A dog" }, component: component)
-
- expect(subject).to include(dog_solution)
- expect(subject.size).to eq(1)
- end
- end
-
- describe "challenge territorial scopes" do
- include_context "with example scopes"
-
- let(:challenges_component) { create(:challenges_component, participatory_space: component.participatory_space) }
- let!(:challenge_without_scope) { create(:challenge, component: challenges_component, scope: nil) }
- let!(:challenge_1) { create(:challenge, component: challenges_component, scope: scope_1) }
- let!(:challenge_2) { create(:challenge, component: challenges_component, scope: scope_2) }
- let!(:challenge_3) { create(:challenge, component: challenges_component, scope: subscope_1) }
-
- let(:problems_component) { create(:problems_component, participatory_space: component.participatory_space) }
- let!(:problem_without_scope) { create(:problem, component: problems_component, challenge: challenge_without_scope) }
- let!(:problem_1) { create(:problem, component: problems_component, challenge: challenge_1) }
- let!(:problem_2) { create(:problem, component: problems_component, challenge: challenge_2) }
- let!(:problem_3) { create(:problem, component: problems_component, challenge: challenge_3) }
-
- let(:resources_list) { solutions_list }
- let!(:resource_without_scope) { create(:solution, component: component, problem: problem_without_scope) }
- let!(:resource_1) { create(:solution, component: component, problem: problem_1) }
- let!(:resource_2) { create(:solution, component: component, problem: problem_2) }
- let!(:resource_3) { create(:solution, component: component, problem: problem_3) }
-
- context "with sectorial_scope_ids" do
- include_examples "search scope filter", "territorial_scope_ids"
- end
- end
-
- describe "SDGs filter" do
- context "when none is selected" do
- it "does not apply the filter" do
- expect(subject).to match_array(solutions_list)
- end
- end
-
- context "when one SDG is selected" do
- let(:sdg_code) { :partnership }
- let!(:challenge_w_sdg) { create(:challenge, component: challenge.component, sdg_code: sdg_code) }
- let!(:problem_w_sdg) { create(:problem, component: problem.component, challenge: challenge_w_sdg) }
- let!(:solution_w_sdg) { create(:solution, component: component, problem: problem_w_sdg) }
- let(:sdgs_codes) { [sdg_code] }
-
- it "returns the solutions associated to the given SDG" do
- expect(subject.pluck(:id)).to match_array([solution_w_sdg.id])
- end
- end
- end
-
- # describe "related_to filter" do
- pending "when filtering by related to solutions"
- # let(:related_to) { 'Decidim::Meetings::Meeting'.underscore }
- # let(:solutions_component) { create(:component, manifest_name: 'solutions', participatory_space: participatory_process) }
- # let(:solution) { create :solution, component: solutions_component }
-
- # it "returns only solutions related to solutions"
- # related_solution = create(:solution, :accepted, component: component)
- # related_solution_2 = create(:solution, :accepted, component: component)
- # create_list(:solution, 3, component: component)
- # solution.link_resources([related_solution], 'solutions_from_solution')
- # related_solution_2.link_resources([solution], 'solutions_from_solution')
-
- # expect(subject).to match_array([related_solution, related_solution_2])
- # end
-
- pending "when filtering by related to resources"
- # let(:related_to) { 'Decidim::DummyResources::DummyResource'.underscore }
- # let(:dummy_component) { create(:component, manifest_name: 'dummy', participatory_space: participatory_process) }
- # let(:dummy_resource) { create :dummy_resource, component: dummy_component }
-
- # it "returns only solutions related to results"
- # related_solution = create(:solution, :accepted, component: component)
- # related_solution_2 = create(:solution, :accepted, component: component)
- # create_list(:solution, 3, component: component)
- # dummy_resource.link_resources([related_solution], 'included_solutions')
- # related_solution_2.link_resources([dummy_resource], 'included_solutions')
-
- # expect(subject).to match_array([related_solution, related_solution_2])
- # end
- # end
- end
- end
- end
-end
diff --git a/spec/shared/manage_challenges_examples.rb b/spec/shared/manage_challenges_examples.rb
index bda6d0eb..e084ccfa 100644
--- a/spec/shared/manage_challenges_examples.rb
+++ b/spec/shared/manage_challenges_examples.rb
@@ -177,21 +177,21 @@
end
describe "deleting a challenge" do
- let!(:challenge2) { create(:challenge, component: current_component) }
+ let!(:challenge_2) { create(:challenge, component: current_component) }
before do
visit current_path
end
it "deletes a challenge" do
- within find("tr", text: Decidim::Challenges::ChallengePresenter.new(challenge2).title) do
+ within find("tr", text: Decidim::Challenges::ChallengePresenter.new(challenge_2).title) do
accept_confirm { click_link "Delete" }
end
expect(page).to have_admin_callout("successfully")
within "table" do
- expect(page).to have_no_content(Decidim::Challenges::ChallengePresenter.new(challenge2).title)
+ expect(page).to have_no_content(Decidim::Challenges::ChallengePresenter.new(challenge_2).title)
end
end
end
diff --git a/spec/shared/manage_problems_examples.rb b/spec/shared/manage_problems_examples.rb
index cde4375f..9631d5b3 100644
--- a/spec/shared/manage_problems_examples.rb
+++ b/spec/shared/manage_problems_examples.rb
@@ -152,21 +152,21 @@
end
describe "deleting a problem" do
- let!(:problem2) { create(:problem, component: current_component) }
+ let!(:problem_2) { create(:problem, component: current_component) }
before do
visit current_path
end
it "deletes a problem" do
- within find("tr", text: Decidim::Problems::ProblemPresenter.new(problem2).title) do
+ within find("tr", text: Decidim::Problems::ProblemPresenter.new(problem_2).title) do
accept_confirm { click_link "Delete" }
end
expect(page).to have_admin_callout("successfully")
within "table" do
- expect(page).to have_no_content(Decidim::Problems::ProblemPresenter.new(problem2).title)
+ expect(page).to have_no_content(Decidim::Problems::ProblemPresenter.new(problem_2).title)
end
end
end
diff --git a/spec/shared/manage_questionnaires_answers_examples.rb b/spec/shared/manage_questionnaires_answers_examples.rb
index f3dc477e..c3d24a88 100644
--- a/spec/shared/manage_questionnaires_answers_examples.rb
+++ b/spec/shared/manage_questionnaires_answers_examples.rb
@@ -24,9 +24,9 @@
end
context "when there are answers" do
- let!(:answer1) { create :answer, questionnaire: questionnaire, question: first }
- let!(:answer2) { create :answer, body: "second answer", questionnaire: questionnaire, question: first }
- let!(:answer3) { create :answer, questionnaire: questionnaire, question: second }
+ let!(:answer_1) { create :answer, questionnaire: questionnaire, question: first }
+ let!(:answer_2) { create :answer, body: "second answer", questionnaire: questionnaire, question: first }
+ let!(:answer_3) { create :answer, questionnaire: questionnaire, question: second }
it "shows the answer admin link" do
visit questionnaire_edit_path
@@ -44,10 +44,10 @@
end
it "shows the anwers page" do
- expect(page).to have_content(answer1.body)
- expect(page).to have_content(answer1.question.body["en"])
- expect(page).to have_content(answer2.body)
- expect(page).to have_content(answer2.question.body["en"])
+ expect(page).to have_content(answer_1.body)
+ expect(page).to have_content(answer_1.question.body["en"])
+ expect(page).to have_content(answer_2.body)
+ expect(page).to have_content(answer_2.question.body["en"])
end
it "shows the percentage" do
@@ -59,8 +59,8 @@
end
it "has an export link" do
- expect(page).to have_link(answer1.body)
- expect(page).to have_link(answer2.body)
+ expect(page).to have_link(answer_1.body)
+ expect(page).to have_link(answer_2.body)
expect(page).to have_link("Export")
end
@@ -68,17 +68,17 @@
let(:first_type) { "long_answer" }
it "shows session token" do
- expect(page).not_to have_content(answer1.body)
- expect(page).to have_content(answer1.session_token)
- expect(page).to have_content(answer2.session_token)
- expect(page).to have_content(answer3.session_token)
+ expect(page).not_to have_content(answer_1.body)
+ expect(page).to have_content(answer_1.session_token)
+ expect(page).to have_content(answer_2.session_token)
+ expect(page).to have_content(answer_3.session_token)
expect(page).to have_content("User identifier")
end
end
end
context "and managing individual answer page" do
- let!(:answer11) { create :answer, questionnaire: questionnaire, body: "", user: answer1.user, question: second }
+ let!(:answer_11) { create :answer, questionnaire: questionnaire, body: "", user: answer_1.user, question: second }
before do
visit questionnaire_edit_path
@@ -88,26 +88,26 @@
end
it "shows all the questions and responses" do
- click_link answer1.body, match: :first
+ click_link answer_1.body, match: :first
expect(page).to have_content(first.body["en"])
expect(page).to have_content(second.body["en"])
- expect(page).to have_content(answer1.body)
+ expect(page).to have_content(answer_1.body)
end
it "first answer has a next link" do
- click_link answer1.body, match: :first
+ click_link answer_1.body, match: :first
expect(page).to have_link("Next ›")
expect(page).not_to have_link("‹ Prev")
end
it "second answer has prev/next links" do
- click_link answer2.body, match: :first
+ click_link answer_2.body, match: :first
expect(page).to have_link("Next ›")
expect(page).to have_link("‹ Prev")
end
it "third answer has prev link" do
- click_link answer3.session_token, match: :first
+ click_link answer_3.session_token, match: :first
expect(page).not_to have_link("Next ›")
expect(page).to have_link("‹ Prev")
end
diff --git a/spec/shared/manage_solutions_examples.rb b/spec/shared/manage_solutions_examples.rb
index 7c6cff16..889b6c9a 100644
--- a/spec/shared/manage_solutions_examples.rb
+++ b/spec/shared/manage_solutions_examples.rb
@@ -147,21 +147,21 @@
describe "deleting a solution" do
let(:challenge) { create :challenge }
let(:problem) { create :problem, challenge: challenge }
- let!(:solution2) { create(:solution, component: current_component, problem: problem) }
+ let!(:solution_2) { create(:solution, component: current_component, problem: problem) }
before do
visit current_path
end
it "deletes a solution" do
- within find("tr", text: Decidim::Solutions::SolutionPresenter.new(solution2).title) do
+ within find("tr", text: Decidim::Solutions::SolutionPresenter.new(solution_2).title) do
accept_confirm { click_link "Delete" }
end
expect(page).to have_admin_callout("successfully")
within "table" do
- expect(page).to have_no_content(Decidim::Solutions::SolutionPresenter.new(solution2).title)
+ expect(page).to have_no_content(Decidim::Solutions::SolutionPresenter.new(solution_2).title)
end
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index de638229..3e84fe89 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,7 +13,7 @@
SimpleCov.start do
# `ENGINE_ROOT` holds the name of the engine we're testing.
# This brings us to the main Decidim folder.
- root File.expand_path(".", ENV["ENGINE_ROOT"])
+ root File.expand_path(".", ENV.fetch("ENGINE_ROOT", nil))
# We make sure we track all Ruby files, to avoid skipping unrequired files
# We need to include the `../` section, otherwise it only tracks files from the
diff --git a/spec/system/decidim/challenges/challenges_global_search_spec.rb b/spec/system/decidim/challenges/challenges_global_search_spec.rb
index c785e632..b5fa46a1 100644
--- a/spec/system/decidim/challenges/challenges_global_search_spec.rb
+++ b/spec/system/decidim/challenges/challenges_global_search_spec.rb
@@ -6,7 +6,7 @@
include_context "with a component"
let(:manifest_name) { "challenges" }
let!(:searchables) { create_list(:challenge, 3, component: component) }
- let!(:term) { translated(searchables.first.title).split(" ").last }
+ let!(:term) { translated(searchables.first.title).split.last }
before do
searchables.each { |s| s.update(published_at: Time.current) }
diff --git a/spec/system/decidim/challenges/filter_challenges_spec.rb b/spec/system/decidim/challenges/filter_challenges_spec.rb
index b36bafa7..fa975004 100644
--- a/spec/system/decidim/challenges/filter_challenges_spec.rb
+++ b/spec/system/decidim/challenges/filter_challenges_spec.rb
@@ -30,7 +30,7 @@
context "when selecting the global scope" do
it "lists the filtered challenges", :slow do
- within ".filters .scope_id_check_boxes_tree_filter" do
+ within ".filters .with_any_scope_check_boxes_tree_filter" do
uncheck "All"
check "Global"
end
@@ -42,7 +42,7 @@
context "when selecting one scope" do
it "lists the filtered challenges", :slow do
- within ".filters .scope_id_check_boxes_tree_filter" do
+ within ".filters .with_any_scope_check_boxes_tree_filter" do
uncheck "All"
check scope.name[I18n.locale.to_s]
end
@@ -54,7 +54,7 @@
context "when selecting the global scope and another scope" do
it "lists the filtered challenges", :slow do
- within ".filters .scope_id_check_boxes_tree_filter" do
+ within ".filters .with_any_scope_check_boxes_tree_filter" do
uncheck "All"
check "Global"
check scope.name[I18n.locale.to_s]
@@ -67,7 +67,7 @@
context "when unselecting the selected scope" do
it "lists the filtered challenges" do
- within ".filters .scope_id_check_boxes_tree_filter" do
+ within ".filters .with_any_scope_check_boxes_tree_filter" do
uncheck "All"
check scope.name[I18n.locale.to_s]
check "Global"
@@ -117,7 +117,7 @@
create(:challenge, :proposal, component: component, scope: scope)
visit_component
- within ".filters .state_check_boxes_tree_filter" do
+ within ".filters .with_any_state_check_boxes_tree_filter" do
check "All"
uncheck "All"
check "Proposal"
@@ -135,7 +135,7 @@
create(:challenge, :execution, component: component, scope: scope)
visit_component
- within ".filters .state_check_boxes_tree_filter" do
+ within ".filters .with_any_state_check_boxes_tree_filter" do
check "All"
uncheck "All"
check "Execution"
@@ -187,9 +187,12 @@
before do
find(".filters__section.sdgs-filter button").click
expect(page).to have_css("#sdgs-modal")
- find('#sdgs-modal .sdg-cell[data-value="no_poverty"]').click
- find('#sdgs-modal .sdg-cell[data-value="good_health"]').click
- find("#sdgs-modal .reveal__footer a.button").click
+
+ within "#sdgs-modal" do
+ find('.sdg-cell[data-value="no_poverty"]').click
+ find('.sdg-cell[data-value="good_health"]').click
+ find(".reveal__footer a.button").click
+ end
end
it "lists the challenges with the selected SDGs" do
@@ -200,95 +203,36 @@
end
end
- # context "when filtering challenges by CATEGORY", :slow do
- # context "when the user is logged in" do
- # let!(:category2) { create :category, participatory_space: participatory_process }
- # let!(:category3) { create :category, participatory_space: participatory_process }
- # let!(:challenge1) { create(:challenge, component: component, category: category) }
- # let!(:challenge2) { create(:challenge, component: component, category: category2) }
- # let!(:challenge3) { create(:challenge, component: component, category: category3) }
-
- # before do
- # login_as user, scope: :user
- # end
-
- # it "can be filtered by a category" do
- # visit_component
-
- # within ".filters .category_id_check_boxes_tree_filter" do
- # uncheck "All"
- # check category.name[I18n.locale.to_s]
- # end
-
- # expect(page).to have_css(".card--challenge", count: 1)
- # end
-
- # it "can be filtered by two categories" do
- # visit_component
-
- # within ".filters .category_id_check_boxes_tree_filter" do
- # uncheck "All"
- # check category.name[I18n.locale.to_s]
- # check category2.name[I18n.locale.to_s]
- # end
-
- # expect(page).to have_css(".card--challenge", count: 2)
- # end
- # end
- # end
-
- # context "when using the browser history", :slow do
- # before do
- # create_list(:challenge, 2, component: component)
- # create_list(:challenge, 2, :official, component: component)
- # create_list(:challenge, 2, :official, :accepted, component: component)
- # create_list(:challenge, 2, :official, :rejected, component: component)
-
- # visit_component
- # end
-
- # it "recover filters from initial pages" do
- # within ".filters .state_check_boxes_tree_filter" do
- # check "Rejected"
- # end
-
- # expect(page).to have_css(".card.card--challenge", count: 8)
-
- # page.go_back
-
- # expect(page).to have_css(".card.card--challenge", count: 6)
- # end
+ context "when filtering challenges by CATEGORY" do
+ let!(:challenge) { create(:challenge, component: component, category: category) }
- # it "recover filters from previous pages" do
- # within ".filters .state_check_boxes_tree_filter" do
- # check "All"
- # uncheck "All"
- # end
- # within ".filters .origin_check_boxes_tree_filter" do
- # uncheck "All"
- # end
-
- # within ".filters .origin_check_boxes_tree_filter" do
- # check "Official"
- # end
-
- # within ".filters .state_check_boxes_tree_filter" do
- # check "Accepted"
- # end
+ before do
+ login_as user, scope: :user
+ visit_component
+ end
- # expect(page).to have_css(".card.card--challenge", count: 2)
+ it "can be filtered by category" do
+ within ".filters .with_any_category_check_boxes_tree_filter" do
+ uncheck "All"
+ check category.name[I18n.locale.to_s]
+ end
- # page.go_back
+ expect(page).to have_css(".card--challenge", count: 1)
+ end
- # expect(page).to have_css(".card.card--challenge", count: 6)
+ it "works with 'back to list' link" do
+ within ".filters .with_any_category_check_boxes_tree_filter" do
+ uncheck "All"
+ check category.name[I18n.locale.to_s]
+ end
- # page.go_back
+ expect(page).to have_css(".card--challenge", count: 1)
- # expect(page).to have_css(".card.card--challenge", count: 8)
+ page.find(".card--challenge .card__link").click
- # page.go_forward
+ click_link "Return to list"
- # expect(page).to have_css(".card.card--challenge", count: 6)
- # end
- # end
+ expect(page).to have_css(".card--challenge", count: 1)
+ end
+ end
end
diff --git a/spec/system/decidim/problems/filter_problems_spec.rb b/spec/system/decidim/problems/filter_problems_spec.rb
index 9f839dfa..55e06df9 100644
--- a/spec/system/decidim/problems/filter_problems_spec.rb
+++ b/spec/system/decidim/problems/filter_problems_spec.rb
@@ -23,8 +23,8 @@
create(:problem, component: component, sectorial_scope: nil, technological_scope: nil)
end
- include_examples "when filtering resources by a scope", "PROBLEM", ".card--problem", ".sectorial_scope_id_check_boxes_tree_filter"
- include_examples "when filtering resources by a scope", "PROBLEM", ".card--problem", ".technological_scope_id_check_boxes_tree_filter"
+ include_examples "when filtering resources by a scope", "PROBLEM", ".card--problem", ".with_any_sectorial_scope_id_check_boxes_tree_filter"
+ include_examples "when filtering resources by a scope", "PROBLEM", ".card--problem", ".with_any_technological_scope_id_check_boxes_tree_filter"
end
describe "when filtering problems by challenge's territorial scopes" do
@@ -38,7 +38,7 @@
create(:problem, component: component, challenge: challenge_no_scope)
end
- include_examples "when filtering resources by a scope", "PROBLEM", ".card--problem", ".territorial_scope_id_check_boxes_tree_filter"
+ include_examples "when filtering resources by a scope", "PROBLEM", ".card--problem", ".with_any_territorial_scope_id_check_boxes_tree_filter"
end
describe "when filtering problems by STATE" do
@@ -54,7 +54,7 @@
create(:problem, :proposal, component: component)
visit_component
- within ".filters .state_check_boxes_tree_filter" do
+ within ".filters .with_any_state_check_boxes_tree_filter" do
check "All"
uncheck "All"
check "Proposal"
@@ -73,7 +73,7 @@
create(:problem, :execution, component: component)
visit_component
- within ".filters .state_check_boxes_tree_filter" do
+ within ".filters .with_any_state_check_boxes_tree_filter" do
check "All"
uncheck "All"
check "Execution"
@@ -130,9 +130,12 @@
before do
find(".filters__section.sdgs-filter button").click
expect(page).to have_css("#sdgs-modal")
- find('#sdgs-modal .sdg-cell[data-value="no_poverty"]').click
- find('#sdgs-modal .sdg-cell[data-value="good_health"]').click
- find("#sdgs-modal .reveal__footer a.button").click
+
+ within "#sdgs-modal" do
+ find('.sdg-cell[data-value="no_poverty"]').click
+ find('.sdg-cell[data-value="good_health"]').click
+ find(".reveal__footer a.button").click
+ end
end
it "lists the problems with the selected SDGs" do
diff --git a/spec/system/decidim/problems/problems_global_search_spec.rb b/spec/system/decidim/problems/problems_global_search_spec.rb
index c40e69fc..2baafa21 100644
--- a/spec/system/decidim/problems/problems_global_search_spec.rb
+++ b/spec/system/decidim/problems/problems_global_search_spec.rb
@@ -6,7 +6,7 @@
include_context "with a component"
let(:manifest_name) { "problems" }
let!(:searchables) { create_list(:problem, 3, component: component) }
- let!(:term) { translated(searchables.first.title).split(" ").last }
+ let!(:term) { translated(searchables.first.title).split.last }
before do
searchables.each { |s| s.update(published_at: Time.current) }
diff --git a/spec/system/decidim/solutions/filter_solutions_spec.rb b/spec/system/decidim/solutions/filter_solutions_spec.rb
index 7636e417..c39e956a 100644
--- a/spec/system/decidim/solutions/filter_solutions_spec.rb
+++ b/spec/system/decidim/solutions/filter_solutions_spec.rb
@@ -30,7 +30,7 @@
create(:solution, component: component, problem: problem_no_scope)
end
- include_examples "when filtering resources by a scope", "SOLUTION", ".card--solution", ".territorial_scope_id_check_boxes_tree_filter"
+ include_examples "when filtering resources by a scope", "SOLUTION", ".card--solution", ".with_any_territorial_scope_id_check_boxes_tree_filter"
end
describe "when filtering solutions by SDG" do
@@ -52,16 +52,16 @@
before do
challenge = create(:challenge, component: challenges_component, sdg_code: :no_poverty)
problem = create(:problem, component: problems_component, challenge: challenge)
- create_list(:solution, 2, component: component, problem: problem)
+ create_list(:solution, 2, component: component, problem: problem, challenge: challenge)
challenge = create(:challenge, component: challenges_component, sdg_code: :zero_hunger)
problem = create(:problem, component: problems_component, challenge: challenge)
- create(:solution, component: component, problem: problem)
+ create(:solution, component: component, problem: problem, challenge: challenge)
challenge = create(:challenge, component: challenges_component, sdg_code: :good_health)
problem = create(:problem, component: problems_component, challenge: challenge)
- create(:solution, component: component, problem: problem)
+ create(:solution, component: component, problem: problem, challenge: challenge)
challenge = create(:challenge, component: challenges_component)
problem = create(:problem, component: problems_component, challenge: challenge)
- create(:solution, component: component, problem: problem)
+ create(:solution, component: component, problem: problem, challenge: challenge)
visit_component
end
@@ -80,9 +80,12 @@
before do
find(".filters__section.sdgs-filter button").click
expect(page).to have_css("#sdgs-modal")
- find('#sdgs-modal .sdg-cell[data-value="no_poverty"]').click
- find('#sdgs-modal .sdg-cell[data-value="good_health"]').click
- find("#sdgs-modal .reveal__footer a.button").click
+
+ within "#sdgs-modal" do
+ find('.sdg-cell[data-value="no_poverty"]').click
+ find('.sdg-cell[data-value="good_health"]').click
+ find(".reveal__footer a.button").click
+ end
end
it "lists the solutions with the selected SDGs" do
diff --git a/spec/system/decidim/solutions/solutions_global_search_spec.rb b/spec/system/decidim/solutions/solutions_global_search_spec.rb
index dd2ef8a5..6834649b 100644
--- a/spec/system/decidim/solutions/solutions_global_search_spec.rb
+++ b/spec/system/decidim/solutions/solutions_global_search_spec.rb
@@ -6,7 +6,7 @@
include_context "with a component"
let(:manifest_name) { "solutions" }
let!(:searchables) { create_list(:solution, 3, component: component) }
- let!(:term) { translated(searchables.first.title).split(" ").last }
+ let!(:term) { translated(searchables.first.title).split.last }
before do
searchables.each { |s| s.update(published_at: Time.current) }