decidim 0.3.2 → 0.4.0

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

@@ -7,11 +7,7 @@ describe "Comment notifications", type: :feature do
   let!(:feature) { create(:feature, manifest_name: :dummy, organization: organization) }
   let!(:user) { create(:user, :confirmed, organization: organization) }
   let!(:commentable) { create(:dummy_resource, feature: feature) }
-  let!(:comments) do
-    Array.new(3) do
-      create(:comment, commentable: commentable)
-    end
-  end
+  let!(:comments) { create_list(:comment, 3, commentable: commentable) }
 
   before do
     switch_to_host(organization.host)
@@ -34,7 +30,7 @@ describe "Comment notifications", type: :feature do
 
     wait_for_email subject: "a new comment"
 
-    login_as commentable.author, scope: :user
+    relogin_as commentable.author, scope: :user
 
     visit last_email_first_link
 

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

@@ -11,12 +11,13 @@ module Decidim
       let(:feature) { create(:feature, participatory_process: participatory_process) }
       let(:commentable_author) { create(:user, organization: organization) }
       let(:commentable) { create(:dummy_resource, author: commentable_author, feature: feature) }
+      let(:user) { create(:user, organization: organization) }
       let(:author) { create(:user, organization: organization) }
       let(:comment) { create(:comment, author: author, commentable: commentable) }
       let(:reply) { create(:comment, author: author, commentable: comment) }
 
       describe "comment_created" do
-        let(:mail) { described_class.comment_created(comment, commentable) }
+        let(:mail) { described_class.comment_created(user, comment, commentable) }
 
         let(:subject) { "Tens un nou comentari" }
         let(:default_subject) { "You have a new comment" }
@@ -24,11 +25,11 @@ module Decidim
         let(:body) { "Hi ha un nou comentari d" }
         let(:default_body) { "There is a new comment" }
 
-        include_examples "author localised email"
+        include_examples "user localised email"
       end
 
       describe "reply_created" do
-        let(:mail) { described_class.reply_created(reply, comment, commentable) }
+        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" }
@@ -36,7 +37,7 @@ module Decidim
         let(:body) { "Hi ha una nova resposta de" }
         let(:default_body) { "There is a new reply of your comment" }
 
-        include_examples "author localised email"
+        include_examples "user localised email"
       end
     end
   end

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

@@ -6,8 +6,10 @@ module Decidim
   module Comments
     describe Comment do
       let!(:commentable) { create(:dummy_resource) }
-      let!(:comment) { create(:comment, commentable: commentable) }
-      let!(:replies) { Array.new(3) { create(:comment, commentable: comment, root_commentable: commentable) } }
+      let!(:replies_notifications) { true }
+      let!(:author) { create(:user, organization: commentable.organization, replies_notifications: replies_notifications) }
+      let!(:comment) { create(:comment, commentable: commentable, author: author) }
+      let!(:replies) { create_list(:comment, 3, commentable: comment, root_commentable: commentable) }
       let!(:up_vote) { create(:comment_vote, :up_vote, comment: comment) }
       let!(:down_vote) { create(:comment_vote, :down_vote, comment: comment) }
 
@@ -88,6 +90,34 @@ module Decidim
           expect(subject.down_voted_by?(user)).to be_falsy
         end
       end
+
+      describe "#notifiable?" do
+        let(:context_author) { create(:user, organization: subject.author.organization) }
+
+        context "when the context author is the same as the comment's author" do
+          let(:context_author) { subject.author }
+
+          it "is not notifiable" do
+            expect(subject.notifiable?(author: context_author)).to be_falsy
+          end
+        end
+
+        context "when the context author is not the same as the comment's author" do
+          context "when the comment's author has not replies notifications enabled" do
+            let(:replies_notifications) { false }
+
+            it "is not notifiable" do
+              expect(subject.notifiable?(author: context_author)).to be_falsy
+            end
+          end
+
+          context "when the comment's author has replies notifications enabled" do
+            it "is not notifiable" do
+              expect(subject.notifiable?(author: context_author)).to be_truthy
+            end
+          end
+        end
+      end
     end
   end
 end

data/decidim-comments/spec/shared/author_localised_email.rb

@@ -2,9 +2,8 @@
 
 require "spec_helper"
 
-shared_examples "author localised email" do
-  let(:author) { create(:user, locale: locale, organization: organization) }
-  let(:commentable_author) { create(:user, locale: locale, organization: organization) }
+shared_examples "user localised email" do
+  let(:user) { create(:user, locale: locale, organization: organization) }
 
   context "when the user has a custom locale" do
     let(:locale) { "ca" }

data/decidim-comments/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-dev/decidim-dev.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-dev"
-  s.summary     = "Decidim Dev tools"
+  s.name = "decidim-dev"
+  s.summary = "Decidim Dev tools"
   s.description = "Utilities and tools we need to develop Decidim"
 
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
@@ -37,8 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency "codecov", "~> 0.1.9"
   s.add_dependency "rubocop", "~> 0.48.1"
   s.add_dependency "db-query-matchers", "~> 0.9.0"
-  s.add_dependency "letter_opener_web", "~> 1.3.0"
   s.add_dependency "rspec-html-matchers", "~> 0.9.1"
   s.add_dependency "webmock", "~> 3.0.1"
-  s.add_dependency "puma", "~> 3.8.2"
+  s.add_dependency "puma", "~> 3.9.1"
 end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "letter_opener_web"
 require "decidim/dev/railtie"
 
 module Decidim
@@ -14,5 +13,28 @@ module Decidim
     def self.asset(name)
       File.expand_path(File.join(__dir__, "dev", "assets", name))
     end
+
+    # Public: add rake tasks
+    def self.install_tasks
+      Dir[File.join(__dir__, "../tasks/*.rake")].each do |file|
+        load file
+      end
+    end
+
+    # Public: Sets the dummy application path for testing.
+    #
+    # path - A string value defining the path.
+    def self.dummy_app_path=(path)
+      @dummy_app_path = path
+    end
+
+    # Public: Get the dummy application path and raises an error if it is not set.
+    def self.dummy_app_path
+      unless @dummy_app_path
+        raise StandardError, "Please, add Decidim::Dev::dummy_app_path = File.expand_path(File.join(\"..\", \"spec\", \"decidim_dummy_app\")) to\n
+          your spec helper with the path to the generated dummy app"
+      end
+      @dummy_app_path
+    end
   end
 end

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

@@ -2,6 +2,9 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "decidim/dev"
 
 RSpec::Core::RakeTask.new(:spec)
 task default: [:spec]
+
+Decidim::Dev.install_tasks

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
+require "rails"
+
 module Decidim
   module Dev
     class Railtie < Rails::Railtie
       railtie_name :decidim_dev
 
       rake_tasks do
-        Dir[File.join(__dir__, "../../tasks/*.rake")].each do |file|
-          load file
-        end
+        Decidim::Dev.install_tasks
       end
     end
   end

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["RAILS_ENV"] ||= "test"
 
 root_path = File.expand_path("..", Dir.pwd)
 engine_spec_dir = File.join(Dir.pwd, "spec")
-dummy_app_path = File.expand_path(File.join(root_path, "spec", "decidim_dummy_app"))
 
 if ENV["SIMPLECOV"]
   require "simplecov"
@@ -35,10 +36,10 @@ require "decidim/core/test"
 require "#{__dir__}/rspec_support/feature.rb"
 
 begin
-  require "#{dummy_app_path}/config/environment"
+  require "#{Decidim::Dev.dummy_app_path}/config/environment"
 rescue LoadError
   puts "Could not load dummy application. Please ensure you have run `bundle exec rake decidim:generate_test_app`"
-  puts "Tried to load it from #{dummy_app_path}"
+  puts "Tried to load it from #{Decidim::Dev.dummy_app_path}"
   exit(-1)
 end
 

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

@@ -28,6 +28,9 @@ capybara_options = {
     ),
     File.expand_path(
       File.join(__dir__, "phantomjs_polyfills", "phantomjs-shim.js")
+    ),
+    File.expand_path(
+      File.join(__dir__, "phantomjs_polyfills", "phantomjs-getOwnPropertyNames.js")
     )
   ],
   js_errors: true,

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

@@ -35,6 +35,14 @@ module Decidim
     def reported_content_url
       ResourceLocatorPresenter.new(self).url
     end
+
+    def notifiable?(_context)
+      true
+    end
+
+    def users_to_notify
+      [author]
+    end
   end
 
   class DummyResourcesController < ActionController::Base

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.shared_context "feature" do
+  include Decidim::FeaturePathHelper
+
   let(:manifest) { Decidim.find_feature_manifest(manifest_name) }
 
   let(:user) { create :user, :confirmed, organization: organization }
@@ -26,7 +28,7 @@ RSpec.shared_context "feature" do
   end
 
   def visit_feature
-    page.visit decidim.feature_path(participatory_process, feature)
+    page.visit feature_path(feature)
   end
 end
 
@@ -48,7 +50,7 @@ RSpec.shared_context "feature admin" do
   end
 
   def visit_feature_admin
-    visit decidim_admin.manage_feature_path(participatory_process, feature)
+    visit manage_feature_path(feature)
   end
 end
 

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

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:suite) do
     # Set geocoder configuration in test mode
     Decidim.geocoder = {
-      static_map_url: "http://www.example.org",
+      static_map_url: "https://www.example.org/my_static_map",
       here_app_id: "1234",
       here_app_code: "5678"
     }
     Geocoder.configure(lookup: :test)
   end
+
+  config.before(:each, :serves_map) do
+    stub_request(:get, %r{https://www\.example\.org/my_static_map})
+      .to_return(body: "map_data")
+  end
 end

data/decidim-dev/lib/decidim/dev/test/rspec_support/phantomjs_polyfills/phantomjs-getOwnPropertyNames.js

@@ -0,0 +1,16 @@
+var hasOwnProperty = Object.hasOwnProperty
+var originalGetOwnPropertyNames = Object.getOwnPropertyNames
+function getOwnPropertyNames (obj) {
+  var result = originalGetOwnPropertyNames.call(this, obj)
+  if (typeof obj !== 'function' || hasOwnProperty.call(obj, 'callee')) {
+    return result
+  }
+  return result.filter(function filterCallee (name) {
+    return name !== 'callee' && name !== 'arguments' && name !== 'caller';
+  })
+};
+Object.defineProperty(Object, 'getOwnPropertyNames', {
+    value: getOwnPropertyNames,
+    configurable: true,
+    writable: true
+})

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

@@ -1,7 +1,23 @@
 # frozen_string_literal: true
 
+module Decidim
+  module WardenTestHelpers
+    include Warden::Test::Helpers
+
+    #
+    # Utility method to login in the middle of a test as a different user from
+    # the current one.
+    #
+    def relogin_as(user, scope: :user)
+      logout scope
+
+      login_as user, scope: scope
+    end
+  end
+end
+
 RSpec.configure do |config|
-  config.include Warden::Test::Helpers, type: :feature
+  config.include Decidim::WardenTestHelpers, type: :feature
   config.include Devise::Test::ControllerHelpers, type: :controller
 
   config.after :each, type: :feature do

data/decidim-meetings/app/helpers/decidim/meetings/application_helper.rb

@@ -8,6 +8,7 @@ module Decidim
       include PaginateHelper
       include Decidim::MapHelper
       include Decidim::Meetings::MapHelper
+      include Decidim::Meetings::MeetingsHelper
     end
   end
 end

data/decidim-meetings/app/helpers/decidim/meetings/meetings_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # Custom helpers used in meetings views
+    module MeetingsHelper
+      include Decidim::ApplicationHelper
+      include Decidim::TranslationsHelper
+
+      # Public: truncates the meeting description
+      #
+      # meeting - a Decidim::Meeting instance
+      # max_length - a number to limit the length of the description
+      #
+      # Returns the meeting's description truncated.
+      def meeting_description(meeting, max_length = 120)
+        link = decidim_meetings.meeting_path(meeting, feature_id: meeting.feature, participatory_process_id: meeting.feature.participatory_process)
+        description = translated_attribute(meeting.description)
+        tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
+        CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@
             <h5 class="card__title"><%= translated_attribute meeting.title %></h5>
           <% end %>
           <%= render partial: "datetime", locals: { meeting: meeting } %>
-          <%== translated_attribute meeting.description %>
+          <%== meeting_description(meeting) %>
           <%= render partial: "tags", locals: { meeting: meeting } %>
           <div class="address card__extra">
             <div class="address__icon">

data/decidim-meetings/bin/rails

@@ -8,8 +8,8 @@ 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", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

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

@@ -90,6 +90,7 @@ ca:
             map: Mapa
             start_time: Data d'inici
             title: Títol
+      read_more: "(Llegeix més)"
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultats relacionats:'

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

@@ -51,7 +51,7 @@ en:
           index:
             title: Meetings
           new:
-            create: Create 
+            create: Create
             title: Create meeting
           update:
             invalid: There's been a problem updating this meeting
@@ -93,6 +93,7 @@ en:
             map: Map
             start_time: Start date
             title: Title
+      read_more: "(read more)"
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Related results:'