decidim 0.0.4 → 0.0.5

data/decidim-proposals/spec/models/decidim/proposals/abilities/admin_user_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe Decidim::Proposals::Abilities::AdminUser do
+  let(:user) { build(:user, :admin) }
+  let(:context) { {} }
+
+  subject { described_class.new(user, context) }
+
+  context "when the user is not an admin" do
+    let(:user) { build(:user) }
+
+    it "doesn't have any permission" do
+      expect(subject.permissions[:can]).to be_empty
+      expect(subject.permissions[:cannot]).to be_empty
+    end
+  end
+
+  it { is_expected.to be_able_to(:manage, Decidim::Proposals::Proposal) }
+
+  context "when creation is disabled" do
+    let(:context) do
+      {
+        current_settings: double(creation_enabled?: false),
+        feature_settings: double(official_proposals_enabled: true)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:create, Decidim::Proposals::Proposal) }
+  end
+
+  context "when official proposals are disabled" do
+    let(:context) do
+      {
+        current_settings: double(creation_enabled?: true),
+        feature_settings: double(official_proposals_enabled: false)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:create, Decidim::Proposals::Proposal) }
+  end
+
+  context "when proposal_answering is disabled in step level" do
+    let(:context) do
+      {
+        current_settings: double(proposal_answering_enabled: false)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:update, Decidim::Proposals::Proposal) }
+  end
+
+  context "when proposal_answering is disabled in feature level" do
+    let(:context) do
+      {
+        feature_settings: double(proposal_answering_enabled: false)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:update, Decidim::Proposals::Proposal) }
+  end
+end

data/decidim-proposals/spec/models/decidim/proposals/abilities/process_admin_user_spec.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe Decidim::Proposals::Abilities::ProcessAdminUser do
+  let(:user) { build(:user) }
+  let(:user_process) { create :participatory_process, organization: user.organization }
+  let(:context) { {} }
+
+  subject { described_class.new(user, context) }
+
+  context "when the user is an admin" do
+    let(:user) { build(:user, :admin) }
+
+    it "doesn't have any permission" do
+      expect(subject.permissions[:can]).to be_empty
+      expect(subject.permissions[:cannot]).to be_empty
+    end
+  end
+
+  it { is_expected.to be_able_to(:manage, Decidim::Proposals::Proposal) }
+
+  context "when creation is disabled" do
+    let(:context) do
+      {
+        current_settings: double(creation_enabled?: false),
+        feature_settings: double(official_proposals_enabled: true)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:create, Decidim::Proposals::Proposal) }
+  end
+
+  context "when official proposals are disabled" do
+    let(:context) do
+      {
+        current_settings: double(creation_enabled?: true),
+        feature_settings: double(official_proposals_enabled: false)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:create, Decidim::Proposals::Proposal) }
+  end
+
+  context "when proposal_answering is disabled in step level" do
+    let(:context) do
+      {
+        current_settings: double(proposal_answering_enabled: false)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:update, Decidim::Proposals::Proposal) }
+  end
+
+  context "when proposal_answering is disabled in feature level" do
+    let(:context) do
+      {
+        feature_settings: double(proposal_answering_enabled: false)
+      }
+    end
+
+    it { is_expected.not_to be_able_to(:update, Decidim::Proposals::Proposal) }
+  end
+end

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -12,77 +12,188 @@ RSpec.shared_examples "manage proposals" do
     end
   end
 
-  it "creates a new proposal" do
-    find(".actions .new").click
+  context "creation" do
+    context "when official_proposals setting is enabled" do
+      before do
+        current_feature.update_attributes(settings: { official_proposals_enabled: true } )
+      end
 
-    within ".new_proposal" do
-      fill_in :proposal_title, with: "Make decidim great again"
-      fill_in :proposal_body, with: "Decidim is great but it can be better"
-      select category.name["en"], from: :proposal_category_id
-      select scope.name, from: :proposal_scope_id
+      context "when creation is enabled" do
+        before do
+          current_feature.update_attributes(
+            step_settings: {
+              current_feature.participatory_process.active_step.id => {
+                creation_enabled: true
+              }
+            }
+          )
+        end
 
-      find("*[type=submit]").click
-    end
+        context "when scoped_proposals setting is enabled" do
+          before do
+            current_feature.update_attributes(settings: { scoped_proposals_enabled: true } )
+          end
+
+          it "can be filtered by scope" do
+            find(".actions .new").click
+
+            within "form" do
+              expect(page).to have_content(/Scope/i)
+            end
+          end
+        end
+
+        context "when scoped_proposals setting is not enabled" do
+          before do
+            current_feature.update_attributes(settings: { scoped_proposals_enabled: false } )
+          end
+
+          it "cannot be filtered by scope" do
+            find(".actions .new").click
+
+            within "form" do
+              expect(page).not_to have_content(/Scope/i)
+            end
+          end
+        end
+
+        it "creates a new proposal" do
+          find(".actions .new").click
 
-    within ".flash" do
-      expect(page).to have_content("successfully")
+          within ".new_proposal" do
+            fill_in :proposal_title, with: "Make decidim great again"
+            fill_in :proposal_body, with: "Decidim is great but it can be better"
+            select category.name["en"], from: :proposal_category_id
+            select scope.name, from: :proposal_scope_id
+
+            find("*[type=submit]").click
+          end
+
+          within ".flash" do
+            expect(page).to have_content("successfully")
+          end
+
+          within "table" do
+            proposal = Decidim::Proposals::Proposal.last
+
+            expect(page).to have_content("Make decidim great again")
+            expect(proposal.body).to eq("Decidim is great but it can be better")
+            expect(proposal.category).to eq(category)
+            expect(proposal.scope).to eq(scope)
+          end
+        end
+      end
     end
 
-    within "table" do
-      proposal = Decidim::Proposals::Proposal.last
+    context "when official_proposals setting is disabled" do
+      before do
+        current_feature.update_attributes(settings: { official_proposals_enabled: false } )
+      end
 
-      expect(page).to have_content("Make decidim great again")
-      expect(proposal.body).to eq("Decidim is great but it can be better")
-      expect(proposal.category).to eq(category)
-      expect(proposal.scope).to eq(scope)
+      it "cannot create a new proposal" do
+        visit_feature
+        expect(page).not_to have_selector(".actions .new")
+      end
     end
   end
 
-  it "can reject a proposal" do
-    within find("tr", text: proposal.title) do
-      click_link "Answer"
+  context "when the proposal_answering feature setting is enabled" do
+    before do
+      current_feature.update_attributes(settings: { proposal_answering_enabled: true } )
     end
 
-    within ".edit_proposal_answer" do
-      fill_in_i18n(
-        :proposal_answer_answer,
-        "#answer-tabs",
-        en: "The proposal doesn't make any sense",
-        es: "La propuesta no tiene sentido",
-        ca: "La proposta no te sentit"
-      )
-      choose "Rejected"
-      click_button "Answer proposal"
-    end
+    context "when the proposal_answering step setting is enabled" do
+      before do
+        current_feature.update_attributes(
+          step_settings: {
+            current_feature.participatory_process.active_step.id => {
+              proposal_answering_enabled: true
+            }
+          }
+        )
+      end
 
-    within ".flash" do
-      expect(page).to have_content("Proposal successfully answered")
-    end
+      it "can reject a proposal" do
+        within find("tr", text: proposal.title) do
+          click_link "Answer"
+        end
+
+        within ".edit_proposal_answer" do
+          fill_in_i18n(
+            :proposal_answer_answer,
+            "#answer-tabs",
+            en: "The proposal doesn't make any sense",
+            es: "La propuesta no tiene sentido",
+            ca: "La proposta no te sentit"
+          )
+          choose "Rejected"
+          click_button "Answer proposal"
+        end
+
+        within ".flash" do
+          expect(page).to have_content("Proposal successfully answered")
+        end
 
-    within find("tr", text: proposal.title) do
-      within find("td:nth-child(4)") do
-        expect(page).to have_content("Rejected")
+        within find("tr", text: proposal.title) do
+          within find("td:nth-child(4)") do
+            expect(page).to have_content("Rejected")
+          end
+        end
       end
-    end
-  end
 
-  it "can accept a proposal" do
-    within find("tr", text: proposal.title) do
-      click_link "Answer"
+      it "can accept a proposal" do
+        within find("tr", text: proposal.title) do
+          click_link "Answer"
+        end
+
+        within ".edit_proposal_answer" do
+          choose "Accepted"
+          click_button "Answer proposal"
+        end
+
+        within ".flash" do
+          expect(page).to have_content("Proposal successfully answered")
+        end
+
+        within find("tr", text: proposal.title) do
+          within find("td:nth-child(4)") do
+            expect(page).to have_content("Accepted")
+          end
+        end
+      end
     end
 
-    within ".edit_proposal_answer" do
-      choose "Accepted"
-      click_button "Answer proposal"
+    context "when the proposal_answering step setting is disabled" do
+      before do
+        current_feature.update_attributes(
+          step_settings: {
+            current_feature.participatory_process.active_step.id => {
+              proposal_answering_enabled: false
+            }
+          }
+        )
+      end
+
+      it "cannot answer a proposal" do
+        visit current_path
+
+        within find("tr", text: proposal.title) do
+          expect(page).to have_no_css("a", text: "Answer")
+        end
+      end
     end
+  end
 
-    within ".flash" do
-      expect(page).to have_content("Proposal successfully answered")
+  context "when the proposal_answering feature setting is disabled" do
+    before do
+      current_feature.update_attributes(settings: { proposal_answering_enabled: false } )
     end
 
-    within find("tr", text: proposal.title) do
-      within find("td:nth-child(4)") do
-        expect(page).to have_content("Accepted")
+    it "cannot answer a proposal" do
+      visit current_path
+
+      within find("tr", text: proposal.title) do
+        expect(page).to have_no_css("a", text: "Answer")
       end
     end
   end

data/decidim-results/app/models/decidim/results/result.rb

@@ -8,8 +8,29 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::Comments::Commentable
 
       feature_manifest_name "results"
+
+      # Public: Overrides the `commentable?` Commentable concern method.
+      def commentable?
+        feature.settings.comments_enabled?
+      end
+
+      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+      def accepts_new_comments?
+         commentable? && !feature.active_step_settings.comments_blocked
+      end
+
+      # Public: Overrides the `comments_have_alignment?` Commentable concern method.
+      def comments_have_alignment?
+        true
+      end
+
+      # Public: Overrides the `comments_have_votes?` Commentable concern method.
+      def comments_have_votes?
+        true
+      end
     end
   end
 end

data/decidim-results/app/views/decidim/results/results/index.html.erb

@@ -1,7 +1,3 @@
-<% add_meta_tags({
-  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
-}) %>
-
 <div class="row columns">
   <div class="title-action">
     <h2 id="proposals-count" class="title-action__title section-heading">

data/decidim-results/app/views/decidim/results/results/show.html.erb

@@ -1,6 +1,4 @@
-<% provide(:title, translated_attribute(result.title)) %>
-
-<% add_meta_tags({
+<% add_decidim_meta_tags({
   description: translated_attribute(result.description),
   title: translated_attribute(result.title),
   url: result_url(result.id)
@@ -52,11 +50,7 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-    <%= comments_for result, arguable: true, votable: true %>
-  <% end %>
-<% end %>
+<%= comments_for result %>
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/decidim-results/config/i18n-tasks.yml

@@ -2,4 +2,5 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.results.name"
+- "decidim.features.results.settings.*"
 - "decidim.resource_links.*"

data/decidim-results/config/locales/ca.yml

@@ -3,6 +3,11 @@ ca:
     features:
       results:
         name: Resultats
+        settings:
+          global:
+            comments_enabled: Comentaris habilitats
+          step:
+            comments_blocked: Comentaris bloquejats
     resource_links:
       included_proposals:
         proposals: Propostes incloses en aquest resultat
@@ -49,8 +54,6 @@ ca:
           category: Categoria
           scopes: Àmbits
           search: Cerca
-        index:
-          meta_title: "%{feature_name}"
         show:
           stats:
             attendees: Assistents