decidim 0.2.0 → 0.3.0

data/decidim-dev/lib/decidim/dev/test/rspec_support/capybara.rb

@@ -24,10 +24,10 @@ end
 capybara_options = {
   extensions: [
     File.expand_path(
-      File.join(File.dirname(__FILE__), "phantomjs_polyfills", "promise.js")
+      File.join(__dir__, "phantomjs_polyfills", "promise.js")
     ),
     File.expand_path(
-      File.join(File.dirname(__FILE__), "phantomjs_polyfills", "phantomjs-shim.js")
+      File.join(__dir__, "phantomjs_polyfills", "phantomjs-shim.js")
     )
   ],
   js_errors: true,

data/decidim-dev/lib/decidim/dev/test/rspec_support/feature.rb

@@ -27,12 +27,13 @@ module Decidim
     include Resourceable
     include Reportable
     include Authorable
+    include HasCategory
     include Decidim::Comments::Commentable
 
     feature_manifest_name "dummy"
 
-    def reported_content
-      title
+    def reported_content_url
+      ResourceLocatorPresenter.new(self).url
     end
   end
 
@@ -110,6 +111,7 @@ RSpec.configure do |config|
 
         t.references :decidim_feature, index: true
         t.references :decidim_author, index: true
+        t.references :decidim_category, index: true
 
         t.timestamps
       end

data/decidim-dev/lib/decidim/dev/test/rspec_support/feature_context.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.shared_context "feature" do
-  let!(:manifest_name) { raise NotImplementedError }
   let(:manifest) { Decidim.find_feature_manifest(manifest_name) }
 
+  let(:user) { create :user, :confirmed, organization: organization }
+
   let!(:organization) { create(:organization) }
 
   let(:participatory_process) do
@@ -16,6 +17,10 @@ RSpec.shared_context "feature" do
            participatory_process: participatory_process)
   end
 
+  let!(:category) { create :category, participatory_process: participatory_process }
+
+  let!(:scope) { create :scope, organization: organization }
+
   before do
     switch_to_host(organization.host)
   end
@@ -27,19 +32,34 @@ end
 
 RSpec.shared_context "feature admin" do
   include_context "feature"
-  let(:user) { create(:user, :confirmed, organization: organization) }
 
-  before do
-    Decidim::Admin::ParticipatoryProcessUserRole.create!(
-      role: :admin,
-      user: user,
-      participatory_process: participatory_process
-    )
+  let(:current_feature) { feature }
+
+  let(:user) do
+    create :user,
+           :admin,
+           :confirmed,
+           organization: organization
+  end
 
+  before do
     login_as user, scope: :user
+    visit_feature_admin
   end
 
   def visit_feature_admin
     visit decidim_admin.manage_feature_path(participatory_process, feature)
   end
 end
+
+RSpec.shared_context "feature process admin" do
+  include_context "feature admin"
+
+  let(:user) do
+    create :user,
+           :process_admin,
+           :confirmed,
+           organization: organization,
+           participatory_process: participatory_process
+  end
+end

data/decidim-dev/lib/decidim/dev/test/rspec_support/translation_helpers.rb

@@ -16,8 +16,13 @@ module TranslationHelpers
   #
   # field - the field that holds the translations
   # locale - the ID of the locale to check
-  def have_i18n_content(field, locale: I18n.locale)
-    have_content(stripped(translated(field, locale: locale)))
+  # upcase - a boolean to indicate whether the string must be checked upcased or not.
+  #
+  # rubocop:disable Style/PredicateName
+  def have_i18n_content(field, locale: I18n.locale, upcase: false)
+    content = stripped(translated(field, locale: locale))
+    content = content.upcase if upcase
+    have_content(content)
   end
 
   # Handles how to fill in i18n form fields.

data/decidim-dev/lib/decidim/dev/test/spec_helper.rb

@@ -19,11 +19,11 @@ require "db-query-matchers"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/rspec_support/**/*.rb"].each { |f| require f }
+Dir["#{__dir__}/rspec_support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.color = true
-  config.fail_fast = ENV["FAIL_FAST"] || false
+  config.fail_fast = ENV["FAIL_FAST"] == "true"
   config.infer_spec_type_from_file_location!
   config.mock_with :rspec
   config.raise_errors_for_deprecations!

data/decidim-dev/lib/generators/decidim/dummy_generator.rb

@@ -24,7 +24,7 @@ module Decidim
 
       def source_paths
         [
-          File.expand_path("../templates", __FILE__)
+          File.expand_path("templates", __dir__)
         ]
       end
 

data/decidim-meetings/README.md

@@ -1,5 +1,5 @@
 # Decidim::Meetings
-The Meeetings module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process.
+The Meetings module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process.
 
 ## Usage
 Meetings will be available as a Feature for a Participatory Process.

data/decidim-meetings/app/controllers/decidim/meetings/application_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
       helper Decidim::Meetings::ApplicationHelper

data/decidim-meetings/app/views/decidim/meetings/meetings/_linked_meetings.html.erb

@@ -3,7 +3,7 @@
     <div class="column">
       <article class="card card--meeting">
         <div class="card__content">
-          <%= link_to decidim_resource_path(meeting), class: "card__link" do %>
+          <%= link_to resource_locator(meeting).path, class: "card__link" do %>
             <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
           <% end %>
           <div class="card__datetime">

data/decidim-meetings/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/meetings/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/meetings/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-meetings/config/locales/it.yml

@@ -0,0 +1,87 @@
+it:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Numero di partecipanti
+        attending_organizations: Elenco delle organizzazioni partecipanti
+      meeting:
+        address: Indirizzo
+        decidim_category_id: Categoria
+        decidim_scope_id: Visibilità
+        description: Descrizione
+        end_time: Orario fine
+        start_time: Orario inizio
+  decidim:
+    features:
+      meetings:
+        name: Incontri
+    meetings:
+      actions:
+        attachments: Allegati
+        close: Chiuso
+        confirm_destroy: Sei certo di voler cancellare questo meeting?
+        destroy: Cancella
+        edit: Modifica
+        new: Nuovo
+        preview: Anteprima
+        title: Azioni
+      admin:
+        meeting_closes:
+          edit:
+            close: Chiudi
+            title: Chiusura meeting
+        meetings:
+          close:
+            invalid: C'è stato un problema durante la chiusura di questo meeting.
+            success: OK, il meeting è stato chiuso.
+          create:
+            invalid: C'è stato un problema durante la creazione di questo meeting.
+            success: OK, il meeting è stato creato con successo.
+          destroy:
+            success: OK, il meeting è stato cancellato.
+          edit:
+            update: Modifica
+          new:
+            create: Crea
+            title: Crea meeting
+          update:
+            invalid: C'è stato un problema durante l'aggiornamento di questo meeting.
+            success: OK, il meeting è stato aggiornato.
+      meetings:
+        filters:
+          category: Categoria
+          category_prompt: Scegli una categoria
+          date: Data
+          past: Passato
+          scopes: Visibilità
+          search: Cerca
+          upcoming: Imminenti
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Espandi
+        index:
+          view_meeting: Visualizza meeting
+        meetings:
+          no_meetings_warning: Nessun meeting corrisponde ai tuoi criteri di ricerca oppure non vi è nessun meeting in programma.
+          upcoming_meetings_warning: Attualmente non vi sono meeting in programma, ma qui puoi trovare elencati tutti i meeting effettuati in passato.
+        show:
+          attendees: Conteggio dei partecipanti
+          contributions: Conteggio dei contributi
+          organizations: Organizzazioni partecipanti.
+      models:
+        meeting:
+          fields:
+            closed: Chiuso
+            end_time: Data di fine
+            map: Mappa
+            start_time: Data di inizio
+            title: Titolo
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Risultati correlati:'
+        result_meetings: 'Meeting correlati:'
+      proposals_from_meeting:
+        meeting_proposals: 'Proposte correlate:'
+        proposal_meetings: 'Meeting correlati alle proposte:'

data/decidim-meetings/db/migrate/20161130121354_create_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateMeetings < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_meetings_meetings do |t|

data/decidim-meetings/db/migrate/20170110142105_close_a_meeting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CloseAMeeting < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_meetings_meetings, :closing_report, :jsonb

data/decidim-meetings/db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddLatitudeAndLongitudeToMeetings < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_meetings_meetings, :latitude, :float

data/decidim-meetings/db/migrate/20170129153716_remove_short_description_from_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveShortDescriptionFromMeetings < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_meetings_meetings, :short_description

data/decidim-meetings/db/migrate/20170215132546_add_reference_to_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToMeetings < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_meetings_meetings, :reference, :string

data/decidim-meetings/db/migrate/20170410074252_remove_not_null_reference_meetings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveNotNullReferenceMeetings < ActiveRecord::Migration[5.0]
   def change
     change_column_null :decidim_meetings_meetings, :reference, true

data/decidim-meetings/db/migrate/20170612101925_migrate_meetings_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateMeetingsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_meetings_meetings.id, \'Decidim::Meetings::Meeting\', NOW(), NOW()
+        FROM decidim_meetings_meetings
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_meetings_meetings.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_meetings_meetings, :decidim_category_id
+  end
+end

data/decidim-meetings/decidim-meetings.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

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

@@ -54,13 +54,13 @@ Decidim.register_feature(:meetings) do |feature|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
           attached_to: meeting
         )
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
+          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           attached_to: meeting
         )
       end

data/decidim-meetings/spec/features/admin_manages_meetings_attachments_spec.rb

@@ -3,6 +3,10 @@
 require "spec_helper"
 
 describe "Admin manages meetings attachments", type: :feature do
-  include_context "admin"
+  let(:manifest_name) { "meetings" }
+  let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
+
+  include_context "feature admin"
+
   it_behaves_like "manage meetings attachments"
 end

data/decidim-meetings/spec/features/admin_manages_meetings_spec.rb

@@ -3,12 +3,10 @@
 require "spec_helper"
 
 describe "Admin manages meetings", type: :feature do
-  include_context "admin"
-  it_behaves_like "manage meetings"
+  let(:manifest_name) { "meetings" }
+  let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
+
+  include_context "feature admin"
 
-  before do
-    switch_to_host(organization.host)
-    login_as user, scope: :user
-    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
-  end
+  it_behaves_like "manage meetings"
 end

data/decidim-meetings/spec/features/explore_meetings_spec.rb

@@ -26,6 +26,11 @@ describe "Explore meetings", type: :feature do
         visit_feature
         within ".filters" do
           fill_in :filter_search_text, with: translated(meetings.first.title)
+
+          # The form should be auto-submitted when filter box is filled up, but
+          # somehow it's not happening. So we workaround that be explicitly
+          # clicking on "Search" until we find out why.
+          find(".icon--magnifying-glass").click
         end
 
         expect(page).to have_css(".card--meeting", count: 1)
@@ -219,18 +224,39 @@ describe "Explore meetings", type: :feature do
     let(:attached_to) { meeting }
     it_behaves_like "has attachments"
 
-    context "when the meeting is closed" do
-      let!(:meeting) { create(:meeting, :closed, feature: feature) }
-
+    shared_examples_for "a closing report page" do
       it "shows the closing report" do
         visit_feature
         click_link translated(meeting.title)
         expect(page).to have_i18n_content(meeting.closing_report)
 
         within ".definition-data" do
-          expect(page).to have_content(meeting.attendees_count)
-          expect(page).to have_content(meeting.contributions_count)
-          expect(page).to have_content(meeting.attending_organizations)
+          expect(page).to have_content("ATTENDEES COUNT #{meeting.attendees_count}")
+          expect(page).to have_content("ATTENDING ORGANIZATIONS #{meeting.attending_organizations}")
+        end
+      end
+    end
+
+    context "when the meeting is closed and had no contributions" do
+      let!(:meeting) { create(:meeting, :closed, contributions_count: 0, feature: feature) }
+
+      it_behaves_like "a closing report page"
+
+      it "does not show contributions count" do
+        within ".definition-data" do
+          expect(page).to have_no_content("CONTRIBUTIONS COUNT 0")
+        end
+      end
+    end
+
+    context "when the meeting is closed and had contributions" do
+      let!(:meeting) { create(:meeting, :closed, contributions_count: 1, feature: feature) }
+
+      it_behaves_like "a closing report page"
+
+      it "shows contributions count" do
+        within ".definition-data" do
+          expect(page).to have_content("CONTRIBUTIONS COUNT 1")
         end
       end
     end