decidim 0.0.1 → 0.0.2

data/decidim-meetings/spec/models/meeting_spec.rb

@@ -7,4 +7,24 @@ describe Decidim::Meetings::Meeting do
   subject { meeting }
 
   it { is_expected.to be_valid }
+
+  context "without a title" do
+    let(:meeting) { build :meeting, title: nil }
+
+    it { is_expected.not_to be_valid }
+  end
+
+  context "when the scope is from another organization" do
+    let(:scope) { create :scope }
+    let(:meeting) { build :meeting, scope: scope }
+
+    it { is_expected.not_to be_valid }
+  end
+
+  context "when the category is from another organization" do
+    let(:category) { create :category }
+    let(:meeting) { build :meeting, category: category }
+
+    it { is_expected.not_to be_valid }
+  end
 end

data/decidim-meetings/spec/services/meeting_search_spec.rb

@@ -0,0 +1,146 @@
+require "spec_helper"
+
+describe Decidim::Meetings::MeetingSearch do
+  let(:current_feature) { create :feature }
+  let(:scope1) { create :scope, organization: current_feature.organization }
+  let(:scope2) { create :scope, organization: current_feature.organization }
+  let(:parent_category) { create :category, participatory_process: current_feature.participatory_process }
+  let(:subcategory) { create :subcategory, parent: parent_category }
+  let!(:meeting1) do
+    create(
+      :meeting,
+      feature: current_feature,
+      start_time: 1.day.from_now,
+      category: parent_category,
+      scope: scope1,
+      description: Decidim::Faker::Localized.literal("Nulla TestCheck accumsan tincidunt.")
+    )
+  end
+  let!(:meeting2) do
+    create(
+      :meeting,
+      feature: current_feature,
+      start_time: 2.day.from_now,
+      category: subcategory,
+      scope: scope2,
+      description: Decidim::Faker::Localized.literal("Curabitur arcu erat, accumsan id imperdiet et.")
+    )
+  end
+  let(:external_meeting) { create :meeting }
+  let(:feature_id) { current_feature.id }
+  let(:organization_id) { current_feature.organization.id }
+  let(:default_params) { { feature: current_feature, organization: current_feature.organization } }
+  let(:params) { default_params }
+
+  subject { described_class.new(params) }
+
+  describe "base query" do
+    context "when no feature is passed" do
+      let(:default_params) { { feature: nil } }
+
+      it "raises an error" do
+        expect{ subject.results }.to raise_error(StandardError, "Missing feature")
+      end
+    end
+  end
+
+  describe "filters" do
+    context "feature_id" do
+      it "only returns meetings from the given feature" do
+        external_meeting = create(:meeting)
+
+        expect(subject.results).not_to include(external_meeting)
+      end
+    end
+
+    context "order_start_time" do
+      let(:params) { default_params.merge(order_start_time: order) }
+
+      context "is :asc" do
+        let(:order) { :asc }
+
+        it "sorts the meetings by start_time asc" do
+          expect(subject.results).to eq [meeting1, meeting2]
+        end
+      end
+
+      context "is :desc" do
+        let(:order) { :desc }
+
+        it "sorts the meetings by start_time desc" do
+          expect(subject.results).to eq [meeting2, meeting1]
+        end
+      end
+    end
+
+    context "search_text" do
+      let(:params) { default_params.merge(search_text: "TestCheck") }
+      
+      it "show only the meeting containing the search_text" do
+        expect(subject.results).to include(meeting1)
+        expect(subject.results.length).to eq(1)
+      end
+    end
+
+    context "scope_id" do
+      context "when a single id is being sent" do
+        let(:params) { default_params.merge(scope_id: scope1.id) }
+
+        it "filters meetings by scope" do
+          expect(subject.results).to eq [meeting1]
+        end
+      end
+
+      context "when multiple ids are sent" do
+        let(:params) { default_params.merge(scope_id: [scope2.id, scope1.id]) }
+
+        it "filters meetings by scope" do
+          expect(subject.results).to match_array [meeting1,meeting2]
+        end
+      end
+    end
+
+    context "category_id" do
+      context "when the given category has no subcategories" do
+        let(:params) { default_params.merge(category_id: subcategory.id) }
+
+        it "returns only meetings from the given category" do
+          expect(subject.results).to eq [meeting2]
+        end
+      end
+
+      context "when the given category has some subcategories" do
+        let(:params) { default_params.merge(category_id: parent_category.id) }
+
+        it "returns meetings from this category and its children's" do
+          expect(subject.results).to match_array [meeting2, meeting1]
+        end
+      end
+
+      context "when the category does not belong to the current feature" do
+        let(:external_category) { create :category }
+        let(:params) { default_params.merge(category_id: external_category.id) }
+
+        it "returns an empty array" do
+          expect(subject.results).to eq []
+        end
+      end
+    end
+  end
+
+  context "pagination" do
+    let(:params) do
+      default_params.merge(
+        per_page: 2
+      )
+    end
+
+    it "filters the meetings per page" do
+      create(:meeting, feature: current_feature)
+      meetings = subject.results
+
+      expect(meetings.total_pages).to eq(2)
+      expect(meetings.total_count).to eq(3)
+    end
+  end
+end

data/decidim-meetings/spec/shared/admin_shared_context.rb

@@ -1,9 +1,11 @@
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
-  let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization, email: "admin@decidim.org") }
   let(:participatory_process) { create(:participatory_process, organization: organization) }
   let(:process_admin) { create :user, :confirmed, organization: organization }
   let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }
   let(:current_feature) { create :feature, participatory_process: participatory_process, manifest_name: "meetings" }
-  let!(:meeting) { create :meeting, feature: current_feature }
+  let(:scope) { create :scope, organization: organization }
+  let!(:category) { create :category, participatory_process: participatory_process }
+  let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
 end

data/decidim-meetings/spec/shared/manage_meetings_examples.rb

@@ -49,14 +49,14 @@ RSpec.shared_examples "manage meetings" do
         es: "Mi meeting",
         ca: "El meu meeting"
       )
-      fill_in_i18n_editor(
+      fill_in_i18n(
         :meeting_location,
         "#location-tabs",
         en: "Location",
         es: "Location",
         ca: "Location"
       )
-      fill_in_i18n_editor(
+      fill_in_i18n(
         :meeting_location_hints,
         "#location_hints-tabs",
         en: "Location hints",
@@ -82,6 +82,9 @@ RSpec.shared_examples "manage meetings" do
       fill_in :meeting_start_time, with: 1.day.from_now
       fill_in :meeting_end_time, with: 1.day.from_now + 2.hours
 
+      select scope.name, from: :meeting_decidim_scope_id
+      select translated(category.name), from: :meeting_decidim_category_id
+
       find("*[type=submit]").click
     end
 

data/decidim-meetings/spec/spec_helper.rb

@@ -1,2 +1,2 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
-require "decidim/test/base_spec_helper"
+require "decidim/dev/test/base_spec_helper"

data/decidim-pages/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

data/decidim-pages/app/assets/images/decidim/pages/icon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
+  <path d="M0 0v8h7v-4h-4v-4h-3zm4 0v3h3l-3-3zm-3 2h1v1h-1v-1zm0 2h1v1h-1v-1zm0 2h4v1h-4v-1z" />
+</svg>

data/decidim-pages/app/commands/decidim/pages/admin/update_page.rb

@@ -29,8 +29,7 @@ module Decidim
         def update_page
           @page.update_attributes!(
             title: @form.title,
-            body: @form.body,
-            commentable: @form.commentable
+            body: @form.body
           )
         end
       end

data/decidim-pages/app/forms/decidim/pages/admin/page_form.rb

@@ -8,7 +8,6 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :body, String
-        attribute :commentable, Boolean
 
         validates :title, translatable_presence: true
       end

data/decidim-pages/app/views/decidim/pages/admin/pages/_form.html.erb

@@ -1,5 +1,4 @@
 <div class="field">
   <%= form.translated :text_field, :title, autofocus: true, label: t("models.components.title", scope: "decidim.pages.admin") %>
   <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin")  %>
-  <%= form.check_box :commentable, label: t("models.components.commentable", scope: "decidim.pages.admin") %>
 </div>

data/decidim-pages/app/views/decidim/pages/application/show.html.erb

@@ -9,8 +9,8 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if @page.commentable? %>
-    <%= comments_for @page, arguable: true %>
+<% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
+  <%= content_for :expanded do %>
+    <%= comments_for @page, arguable: true, votable: true %>
   <% end %>
 <% end %>

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

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

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

@@ -3,12 +3,16 @@ ca:
     features:
       pages:
         name: Pàgina
+        settings:
+          global:
+            comments_always_enabled: Comentaris sempre habilitats
+          step:
+            comments_enabled: Comentaris habilitats
     pages:
       admin:
         models:
           components:
             body: Cos
-            commentable: Habilitar comentaris per a aquesta pàgina
             title: Títol
         pages:
           edit:

data/decidim-pages/config/locales/en.yml

@@ -4,12 +4,16 @@ en:
     features:
       pages:
         name: Page
+        settings:
+          global:
+            comments_always_enabled: Comments always enabled
+          step:
+            comments_enabled: Comments enabled
     pages:
       admin:
         models:
           components:
             body: Body
-            commentable: Enable comments for this page
             title: Title
         pages:
           edit:

data/decidim-pages/config/locales/es.yml

@@ -3,12 +3,16 @@ es:
     features:
       pages:
         name: Página
+        settings:
+          global:
+            comments_always_enabled: Comentarios siempre habilitados
+          step:
+            comments_enabled: Comentarios habilitados
     pages:
       admin:
         models:
           components:
             body: Cuerpo
-            commentable: Habilitar comentarios para esta página
             title: Título
         pages:
           edit:

data/decidim-pages/db/migrate/20170110145040_remove_commentable_flag_from_pages.rb

@@ -0,0 +1,5 @@
+class RemoveCommentableFlagFromPages < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :decidim_pages_pages, :commentable
+  end
+end

data/decidim-pages/lib/decidim/pages/feature.rb

@@ -5,6 +5,7 @@ require_dependency "decidim/features/namer"
 Decidim.register_feature(:pages) do |feature|
   feature.engine = Decidim::Pages::Engine
   feature.admin_engine = Decidim::Pages::AdminEngine
+  feature.icon = "decidim/pages/icon.svg"
 
   feature.on(:create) do |instance|
     Decidim::Pages::CreatePage.call(instance) do
@@ -18,6 +19,14 @@ Decidim.register_feature(:pages) do |feature|
     end
   end
 
+  feature.settings(:global) do |settings|
+    settings.attribute :comments_always_enabled, type: :boolean
+  end
+
+  feature.settings(:step) do |settings|
+    settings.attribute :comments_enabled, type: :boolean
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?
@@ -28,14 +37,15 @@ Decidim.register_feature(:pages) do |feature|
         participatory_process: process
       )
 
-      Decidim::Pages::Page.create!(
+      page = Decidim::Pages::Page.create!(
         feature: feature,
         title: Decidim::Faker::Localized.sentence(2),
         body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
-        end,
-        commentable: true
+        end
       )
+
+      Decidim::Comments::Seed.comments_for(page)
     end
   end
 end

data/decidim-pages/spec/commands/update_page_spec.rb

@@ -20,7 +20,8 @@ module Decidim
         end
         let(:form) do
           PageForm.from_params(
-            form_params,
+            form_params
+          ).with_context(
             current_organization: current_organization
           )
         end

data/decidim-pages/spec/factories.rb

@@ -1,5 +1,5 @@
-require_relative "../../decidim-core/spec/factories"
-require_relative "../../decidim-comments/spec/factories"
+require "decidim/core/test/factories"
+require "decidim/comments/test/factories"
 
 FactoryGirl.define do
   factory :page, class: Decidim::Pages::Page do

data/decidim-pages/spec/features/admin_spec.rb

@@ -56,16 +56,5 @@ describe "Edit a page", type: :feature do
       expect(page).to have_title("New title")
       expect(page).to have_content("New body")
     end
-
-    it "enable comments to the page" do
-      within "form.edit_page" do
-        check "page_commentable"
-        find("*[type=submit]").click
-      end
-
-      visit_feature_admin
-
-      expect(page.find("#page_commentable")).to be_checked
-    end
   end
 end

data/decidim-pages/spec/features/page_show_spec.rb

@@ -22,9 +22,10 @@ describe "Show a page", type: :feature do
     }
   end
 
-  describe "page show" do  
+  let!(:page_feature) { create(:page, feature: feature, title: title, body: body) }
+
+  describe "page show" do
     before do
-      create(:page, feature: feature, title: title, body: body)
       visit_feature
     end
 
@@ -35,18 +36,16 @@ describe "Show a page", type: :feature do
   end
 
   describe "page show with comments" do
-    let!(:page_feature) { create(:page, feature: feature, title: title, body: body) }
     let!(:comments) { create_list(:comment, 3, commentable: page_feature) }
 
-    before do
-      page_feature.update_attribute(:commentable, commentable)
-    end
-
     context "when the page is commentable" do
-      let(:commentable) { true }
+      before do
+        feature.settings = { comments_always_enabled: true }
+        feature.save
+        visit_feature
+      end
 
       it "renders the comments of the page" do
-        visit_feature
         expect(page).to have_selector('.comment', count: comments.length)
 
         comments.each do |comment|
@@ -56,7 +55,11 @@ describe "Show a page", type: :feature do
     end
 
     context "when the page is not commentable" do
-      let(:commentable) { false }
+      before do
+        feature.settings = { comments_always_enabled: false }
+        feature.save
+        visit_feature
+      end
 
       it "doesn't render the comments of the page" do
         visit_feature