decidim 0.0.3 → 0.0.4

data/decidim-comments/spec/features/notifications_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Comment notifications", type: :feature do
+  let!(:organization) { create(:organization) }
+  let!(:feature) { create(:feature, organization: organization) }
+  let!(:user) { create(:user, :confirmed, organization: organization) }
+  let!(:commentable) { create(:dummy_resource, feature: feature) }
+  let!(:comments) {
+    3.times.map do
+      create(:comment, commentable: commentable)
+    end
+  }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+  end
+
+  it "commentable author receives an email with a link to the comment", perform_enqueued: true  do
+    visit decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process)
+    expect(page).to have_selector(".add-comment form")
+
+    within ".add-comment form" do
+      fill_in "add-comment-#{commentable.class.name}-#{commentable.id}", with: "This is a new comment"
+      click_button "Send"
+    end
+
+    within "#comments" do
+      expect(page).to have_content user.name
+      expect(page).to have_content "This is a new comment"
+    end
+
+    wait_for_email subject: "a new comment"
+
+    login_as commentable.author, scope: :user
+
+    visit last_email_first_link
+
+    within "#comments" do
+      expect(page).to have_content user.name
+      expect(page).to have_content "This is a new comment"
+    end
+  end
+end

data/decidim-comments/spec/forms/comment_form_spec.rb

@@ -35,6 +35,12 @@ module Decidim
         it { is_expected.not_to be_valid }
       end
 
+      context "when body is too long" do
+        let(:body) { "c" * 1001 }
+
+        it { is_expected.not_to be_valid }
+      end
+
       context "when alignment is not present" do
         let(:alignment) { nil }
 

data/decidim-comments/spec/mailers/comment_notification_mailer_spec.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require "spec_helper"
+
+module Decidim
+  module Comments
+    describe CommentNotificationMailer, type: :mailer do
+      let(:commentable) { create(:dummy_resource) }
+      let(:comment) { create(:comment, commentable: commentable) }
+      let(:reply) { create(:comment, commentable: comment)}
+
+      describe "comment_created" do
+        let(:mail) { described_class.comment_created(user, comment, commentable) }
+
+        let(:subject) { "Tens un nou comentari" }
+        let(:default_subject) { "You have a new comment" }
+
+        let(:body) { "Hi ha un nou comentari d" }
+        let(:default_body) { "There is a new comment" }
+
+        include_examples "localised email"
+      end
+
+      describe "reply_created" do
+        let(:mail) { described_class.reply_created(user, reply, comment, commentable) }
+
+        let(:subject) { "Tens una nova resposta del teu comentari" }
+        let(:default_subject) { "You have a new reply of your comment" }
+
+        let(:body) { "Hi ha una nova resposta de" }
+        let(:default_body) { "There is a new reply of your comment" }
+
+        include_examples "localised email"
+      end
+    end
+  end
+end

data/decidim-comments/spec/models/comment_spec.rb

@@ -86,6 +86,14 @@ module Decidim
           expect(subject.down_voted_by?(user)).to be_falsy
         end
       end
+
+      describe "#root_commentable" do
+        let(:reply) { create(:comment, commentable: subject) }
+
+        it "returns the commentable object from the parent comment" do
+          expect(reply.root_commentable).to eq(subject.commentable)
+        end
+      end
     end
   end
 end

data/decidim-comments/spec/spec_helper.rb

@@ -1,4 +1,3 @@
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 
 require "decidim/dev/test/base_spec_helper"
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/decidim-comments/spec/types/mutation_type_spec.rb

@@ -8,22 +8,23 @@ module Decidim
       include_context "graphql type"
 
       describe "addComment" do
-        let!(:participatory_process) { create(:participatory_process, organization: current_organization) }
+        let!(:feature) { create(:feature, organization: current_organization)}
+        let!(:dummy_resource) { create(:dummy_resource, feature: feature) }
 
-        let(:query) { 
-          "{ addComment(commentableId: \"#{participatory_process.id}\", commentableType: \"Decidim::ParticipatoryProcess\", body: \"This is a new comment\") { id, body } }" 
+        let(:query) {
+          "{ addComment(commentableId: \"#{dummy_resource.id}\", commentableType: \"Decidim::DummyResource\", body: \"This is a new comment\") { id, body } }"
         }
 
         it "should create a new comment for the given commentable" do
           expect(response["addComment"]).to include("body" => "This is a new comment")
           comment = Decidim::Comments::Comment.last
-          expect(comment.commentable).to eq(participatory_process)
+          expect(comment.commentable).to eq(dummy_resource)
           expect(response["addComment"]).to include("id" => comment.id.to_s)
         end
 
         context "if the query contains an argument alignment" do
-          let(:query) { 
-            "{ addComment(commentableId: \"#{participatory_process.id}\", commentableType: \"Decidim::ParticipatoryProcess\", body: \"This is positive comment\", alignment: 1) { alignment } }" 
+          let(:query) {
+            "{ addComment(commentableId: \"#{dummy_resource.id}\", commentableType: \"Decidim::DummyResource\", body: \"This is positive comment\", alignment: 1) { alignment } }"
           }
 
           it "should create a comment with that alignment" do
@@ -38,7 +39,7 @@ module Decidim
         let!(:comment) { create(:comment) }
         let(:query) {
           "{ comment(id: \"#{comment.id}\") { id } }"
-        }          
+        }
 
         it "should fetch the comment given its id" do
           expect(response["comment"]).to include("id" => comment.id.to_s)

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

@@ -0,0 +1,5 @@
+ca:
+  decidim:
+    resource_links:
+      test_link:
+        dummy: Element fictici relacionat

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

@@ -0,0 +1,5 @@
+es:
+  decidim:
+    resource_links:
+      test_link:
+        dummy: Ficticio relacionado

data/decidim-dev/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  decidim:
+    resource_links:
+      test_link:
+        dummy: Related gezurrezko

data/decidim-dev/decidim-dev.gemspec

@@ -26,11 +26,12 @@ Gem::Specification.new do |s|
   s.add_dependency "listen", "~> 3.1.0"
   s.add_dependency "launchy"
   s.add_dependency "i18n-tasks", "0.9.8"
-  s.add_dependency "faker", "~> 1.7.2"
+  s.add_dependency "faker", "~> 1.7.3"
   s.add_dependency "poltergeist", "~> 1.13.0"
   s.add_dependency "rails-controller-testing", "~> 1.0.1"
   s.add_dependency "simplecov", "~> 0.13"
   s.add_dependency "codecov", "~> 0.1.9"
   s.add_dependency "rubocop", "~> 0.47"
   s.add_dependency "db-query-matchers", "~> 0.7.0"
+  s.add_dependency "letter_opener_web", "~> 1.3.0"
 end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "letter_opener_web"
+
 module Decidim
   # Decidim::Dev holds all the convenience logic and libraries to be able to
   # create external libraries that create test apps and test themselves against

data/decidim-dev/lib/decidim/dev/dummy_authorization_handler.rb

@@ -3,6 +3,7 @@ module Decidim
   # An example implementation of an AuthorizationHandler to be used in tests.
   class DummyAuthorizationHandler < AuthorizationHandler
     attribute :document_number, String
+    attribute :postal_code, String
     attribute :birthday, Date
 
     validates :document_number, presence: true

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

@@ -2,7 +2,8 @@
 ENV["RAILS_ENV"] ||= "test"
 
 engine_name = ENV["ENGINE_NAME"]
-dummy_app_path = File.expand_path(File.join(Dir.pwd, "spec", "#{engine_name}_dummy_app"))
+engine_spec_dir = File.join(Dir.pwd, "spec")
+dummy_app_path = File.expand_path(File.join(engine_spec_dir, "#{engine_name}_dummy_app"))
 
 if ENV["CI"]
   require "simplecov"
@@ -52,6 +53,8 @@ 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["#{engine_spec_dir}/support/**/*.rb"].each { |f| require f }
+Dir["#{engine_spec_dir}/shared/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.color = true

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

@@ -26,6 +26,25 @@ module MailerHelpers
   def last_email_link
     Nokogiri::HTML(last_email_body).css("table.content a").last["href"]
   end
+
+  def last_email_first_link
+    Nokogiri::HTML(last_email_body).css("table.content a").first["href"]
+  end
+
+  def wait_for_email(options = {})
+    options[:max_attempts] ||= 3
+    attempts = 0
+    loop do
+      if attempts >= options[:max_attempts]
+        raise StandardError, "An email with subject containing '#{options[:subject]}' wasn't sent.'"
+      end
+
+      return if last_email&.subject&.include? options[:subject]
+
+      sleep 1
+      attempts += 1
+    end
+  end
 end
 
 RSpec.configure do |config|

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "decidim/feature_validator"
+require "decidim/comments/comments_helper"
+
 module Decidim
   # Dummy engine to be able to test components.
   class DummyEngine < Rails::Engine
@@ -7,20 +10,39 @@ module Decidim
 
     routes do
       root to: proc { [200, {}, ["DUMMY ENGINE"]] }
-      resources :dummy_resource
+      resources :dummy_resources, controller: "decidim/dummy_resources"
     end
   end
 
   class DummyResource < ActiveRecord::Base
+    include HasFeature
     include Resourceable
-    belongs_to :feature, foreign_key: "decidim_feature_id", class_name: "Decidim::Feature"
-    has_one :organization, through: :feature
+    include Authorable
+
+    feature_manifest_name "dummy"
+  end
+
+  class DummyResourcesController < ActionController::Base
+    helper Decidim::Comments::CommentsHelper
+    skip_authorization_check
+
+    def show
+      @commentable = DummyResource.find(params[:id])
+      @options = params.slice(:arguable, :votable)
+      @options.each { |key, val| @options[key] = val === "true" }
+      render inline: %{
+        <%= javascript_include_tag 'application' %>
+        <%= comments_for(@commentable, @options) %>
+      }.html_safe
+    end
   end
 end
 
 Decidim.register_feature(:dummy) do |feature|
   feature.engine = Decidim::DummyEngine
 
+  feature.actions = %w(foo bar)
+
   feature.settings(:global) do |settings|
     settings.attribute :dummy_global_attribute_1, type: :boolean
     settings.attribute :dummy_global_attribute_2, type: :boolean
@@ -44,6 +66,7 @@ RSpec.configure do |config|
       ActiveRecord::Migration.create_table :decidim_dummy_resources do |t|
         t.string :title
         t.references :decidim_feature, index: true
+        t.references :decidim_author, index: true
 
         t.timestamps
       end

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

@@ -67,7 +67,7 @@ module TranslationHelpers
   def fill_in_i18n_fields(field, tab_selector, localized_values)
     localized_values.each do |locale, value|
       within tab_selector do
-        click_link I18n.t(locale, scope: "locales")
+        click_link I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
       end
       yield "#{field}_#{locale}", value
     end

data/decidim-meetings/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -11,8 +11,8 @@ module Decidim
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
         attribute :address, String
-        attribute :start_time, DateTime
-        attribute :end_time, DateTime
+        attribute :start_time, Decidim::Attributes::TimeWithZone
+        attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
 

data/decidim-meetings/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: meeting_meeting_close_path(meeting, @form)) do |f| %>
+<%=  decidim_form_for(@form, url: meeting_meeting_close_path(meeting, @form)) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/decidim-meetings/app/views/decidim/meetings/admin/meetings/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/decidim-meetings/app/views/decidim/meetings/admin/meetings/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,4 +1,6 @@
-<% content_for(:title, t(".title")) %>
+<% add_meta_tags({
+  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
+}) %>
 
 <% if Decidim.geocoder.present? %>
   <div class="row column">

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

@@ -1,4 +1,10 @@
-<% content_for(:title, translated_attribute(meeting.title)) %>
+<% provide(:title, translated_attribute(meeting.title)) %>
+
+<% add_meta_tags({
+  title: translated_attribute(meeting.title),
+  description: translated_attribute(meeting.description),
+  url: meeting_url(meeting.id)
+}) %>
 
 <div class="row column view-header">
   <h2 class="heading2"><%= translated_attribute meeting.title %></h2>
@@ -32,6 +38,7 @@
           </div>
         </div>
       <% end %>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -64,3 +71,6 @@
   </div>
 </div>
 <%= attachments_for meeting %>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

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

@@ -10,7 +10,7 @@ ca:
   decidim:
     features:
       meetings:
-        name: Llistat de trobades
+        name: Trobades
     meetings:
       actions:
         attachments: Adjunts
@@ -38,7 +38,7 @@ ca:
             title: Edita trobada
             update: Actualitzar trobada
           index:
-            title: Llistat de trobades
+            title: Trobades
           new:
             create: Crear trobada
             title: Nova trobada
@@ -62,7 +62,7 @@ ca:
           filter_for: Filtra per
           unfold: Desplegar
         index:
-          title: Llistat de trobades
+          meta_title: "%{feature_name}"
           view_meeting: Veure trobada
         show:
           attendees: Nombre d'assistents

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

@@ -63,7 +63,7 @@ en:
           filter_for: Filter by
           unfold: Unfold
         index:
-          title: Meetings
+          meta_title: "%{feature_name}"
           view_meeting: View meeting
         show:
           attendees: Attendees count

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

@@ -62,7 +62,7 @@ es:
           filter_for: Filtrar por
           unfold: Desplegar
         index:
-          title: Lista de encuentros
+          meta_title: "%{feature_name}"
           view_meeting: Ver encuentro
         show:
           attendees: Número de asistentes