decidim-core 0.7.4 → 0.8.0

data/lib/decidim/core/test/factories.rb

@@ -3,7 +3,10 @@
 require "decidim/faker/localized"
 require "decidim/dev"
 
-FactoryGirl.define do
+require "decidim/participatory_processes/test/factories"
+require "decidim/comments/test/factories"
+
+FactoryBot.define do
   sequence(:name) do |n|
     "#{Faker::Name.name} #{n}"
   end
@@ -24,7 +27,7 @@ FactoryGirl.define do
     "#{Faker::Lorem.characters(4).upcase}-#{n}"
   end
 
-  factory :category, class: Decidim::Category do
+  factory :category, class: "Decidim::Category" do
     name { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
 
@@ -37,7 +40,7 @@ FactoryGirl.define do
     participatory_space { parent.participatory_space }
   end
 
-  factory :organization, class: Decidim::Organization do
+  factory :organization, class: "Decidim::Organization" do
     name { Faker::Company.unique.name }
     reference_prefix { Faker::Name.suffix }
     twitter_handler { Faker::Hipster.word }
@@ -57,7 +60,7 @@ FactoryGirl.define do
     official_url { Faker::Internet.url }
   end
 
-  factory :user, class: Decidim::User do
+  factory :user, class: "Decidim::User" do
     email { generate(:email) }
     password "password1234"
     password_confirmation "password1234"
@@ -137,13 +140,13 @@ FactoryGirl.define do
     end
   end
 
-  factory :participatory_process_user_role, class: Decidim::ParticipatoryProcessUserRole do
+  factory :participatory_process_user_role, class: "Decidim::ParticipatoryProcessUserRole" do
     user
     participatory_process { create :participatory_process, organization: user.organization }
     role "admin"
   end
 
-  factory :user_group, class: Decidim::UserGroup do
+  factory :user_group, class: "Decidim::UserGroup" do
     name { Faker::Educator.course }
     document_number { Faker::Number.number(8) + "X" }
     phone { Faker::PhoneNumber.phone_number }
@@ -172,25 +175,34 @@ FactoryGirl.define do
     end
   end
 
-  factory :user_group_membership, class: Decidim::UserGroupMembership do
+  factory :user_group_membership, class: "Decidim::UserGroupMembership" do
     user
     user_group
   end
 
-  factory :identity, class: Decidim::Identity do
+  factory :identity, class: "Decidim::Identity" do
     provider "facebook"
     sequence(:uid)
     user
     organization { user.organization }
   end
 
-  factory :authorization, class: Decidim::Authorization do
-    name "decidim/dummy_authorization_handler"
+  factory :authorization, class: "Decidim::Authorization" do
+    sequence(:name) { |n| "dummy_authorization_#{n}" }
     user
     metadata { {} }
+    granted
+
+    trait :granted do
+      granted_at { 1.day.ago }
+    end
+
+    trait :pending do
+      granted_at nil
+    end
   end
 
-  factory :static_page, class: Decidim::StaticPage do
+  factory :static_page, class: "Decidim::StaticPage" do
     slug { generate(:slug) }
     title { Decidim::Faker::Localized.sentence(3) }
     content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
@@ -201,7 +213,7 @@ FactoryGirl.define do
     end
   end
 
-  factory :attachment, class: Decidim::Attachment do
+  factory :attachment, class: "Decidim::Attachment" do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
@@ -216,7 +228,7 @@ FactoryGirl.define do
     end
   end
 
-  factory :feature, class: Decidim::Feature do
+  factory :feature, class: "Decidim::Feature" do
     transient do
       organization { create(:organization) }
     end
@@ -235,13 +247,13 @@ FactoryGirl.define do
     end
   end
 
-  factory :scope_type, class: Decidim::ScopeType do
+  factory :scope_type, class: "Decidim::ScopeType" do
     name { Decidim::Faker::Localized.word }
     plural { Decidim::Faker::Localized.literal(name.values.first.pluralize) }
     organization
   end
 
-  factory :scope, class: Decidim::Scope do
+  factory :scope, class: "Decidim::Scope" do
     name { Decidim::Faker::Localized.literal(generate(:scope_name)) }
     code { generate(:scope_code) }
     scope_type
@@ -256,19 +268,19 @@ FactoryGirl.define do
     end
   end
 
-  factory :dummy_resource, class: Decidim::DummyResources::DummyResource do
+  factory :dummy_resource, class: "Decidim::DummyResources::DummyResource" do
     title { generate(:name) }
     feature { create(:feature, manifest_name: "dummy") }
     author { create(:user, :confirmed, organization: feature.organization) }
   end
 
-  factory :resource_link, class: Decidim::ResourceLink do
+  factory :resource_link, class: "Decidim::ResourceLink" do
     name { generate(:slug) }
     to { build(:dummy_resource) }
     from { build(:dummy_resource, feature: to.feature) }
   end
 
-  factory :newsletter, class: Decidim::Newsletter do
+  factory :newsletter, class: "Decidim::Newsletter" do
     author { build(:user, :confirmed, organization: organization) }
     organization
 
@@ -276,18 +288,18 @@ FactoryGirl.define do
     body { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
   end
 
-  factory :moderation, class: Decidim::Moderation do
+  factory :moderation, class: "Decidim::Moderation" do
     reportable { build(:dummy_resource) }
     participatory_space { reportable.feature.participatory_space }
   end
 
-  factory :report, class: Decidim::Report do
+  factory :report, class: "Decidim::Report" do
     moderation
     user { build(:user, organization: moderation.reportable.organization) }
     reason "spam"
   end
 
-  factory :impersonation_log, class: Decidim::ImpersonationLog do
+  factory :impersonation_log, class: "Decidim::ImpersonationLog" do
     admin { build(:user, :admin) }
     user { build(:user, :managed, organization: admin.organization) }
     started_at { 10.minutes.ago }

data/lib/decidim/core/test/shared_examples/follows_examples.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples "follows" do
-  include_context "feature"
+  include_context "with a feature"
 
   before do
     login_as user, scope: :user

data/lib/decidim/core/test/shared_examples/manage_moderations_examples.rb

@@ -26,7 +26,7 @@ shared_examples "manage moderations" do
     it "user can review them" do
       moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
-          expect(page).to have_content moderation.reportable.reported_content_url
+          expect(page).to have_css("a[href='#{moderation.reportable.reported_content_url}']")
           expect(page).to have_content "Spam"
         end
       end
@@ -34,23 +34,18 @@ shared_examples "manage moderations" do
 
     it "user can un-report a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        find("a.action-icon--unreport").click
+        click_link "Unreport"
       end
 
-      within ".callout-wrapper" do
-        expect(page).to have_content("Resource successfully unreported")
-      end
+      expect(page).to have_admin_callout("Resource successfully unreported")
     end
 
     it "user can hide a resource" do
       within "tr[data-id=\"#{moderation.id}\"]" do
-        find("a.action-icon--hide").click
-      end
-
-      within ".callout-wrapper" do
-        expect(page).to have_content("Resource successfully hidden")
+        click_link "Hide"
       end
 
+      expect(page).to have_admin_callout("Resource successfully hidden")
       expect(page).to have_no_content(moderation.reportable.reported_content_url)
     end
   end
@@ -61,7 +56,7 @@ shared_examples "manage moderations" do
 
       hidden_moderations.each do |moderation|
         within "tr[data-id=\"#{moderation.id}\"]" do
-          expect(page).to have_content moderation.reportable.reported_content_url
+          expect(page).to have_css("a[href='#{moderation.reportable.reported_content_url}']")
         end
       end
     end

data/lib/decidim/core/test/shared_examples/process_announcements_examples.rb

@@ -18,14 +18,12 @@ shared_examples "manage processes announcements" do
       find("*[type=submit]").click
     end
 
-    within ".callout-wrapper" do
-      expect(page).to have_content("successfully")
-    end
+    expect(page).to have_admin_callout("successfully")
 
     visit decidim_admin_participatory_processes.participatory_processes_path
 
     within "tr", text: translated(participatory_process.title) do
-      page.find("a.action-icon--preview").click
+      click_link "Preview"
     end
 
     expect(page).to have_content("An important announcement")

data/lib/decidim/core/test/shared_examples/reportable.rb

@@ -3,43 +3,45 @@
 require "spec_helper"
 
 shared_examples_for "reportable" do
-  let(:user) { create(:user, organization: subject.organization) }
-  let(:participatory_space) { subject.feature.participatory_space }
-  let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 1) }
-  let!(:report) { create(:report, moderation: moderation, user: user) }
-
-  describe "#reported_by?" do
-    context "when the resource has not been reported by the given user" do
-      let!(:report) { nil }
-
-      it { expect(subject.reported_by?(user)).to be_falsey }
-    end
-
-    context "when the resource has been reported" do
-      it { expect(subject.reported_by?(user)).to be_truthy }
+  context "is reportable" do
+    let(:user) { create(:user, organization: subject.organization) }
+    let(:participatory_space) { subject.feature.participatory_space }
+    let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 1) }
+    let!(:report) { create(:report, moderation: moderation, user: user) }
+
+    describe "#reported_by?" do
+      context "when the resource has not been reported by the given user" do
+        let!(:report) { nil }
+
+        it { expect(subject.reported_by?(user)).to be_falsey }
+      end
+
+      context "when the resource has been reported" do
+        it { expect(subject.reported_by?(user)).to be_truthy }
+      end
     end
-  end
 
-  context "#hidden?" do
-    context "when the resource has not been hidden" do
-      it { expect(subject).not_to be_hidden }
-    end
+    context "#hidden?" do
+      context "when the resource has not been hidden" do
+        it { expect(subject).not_to be_hidden }
+      end
 
-    context "when the resource has been hidden" do
-      let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 1, hidden_at: Time.current) }
-      it { expect(subject).to be_hidden }
+      context "when the resource has been hidden" do
+        let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 1, hidden_at: Time.current) }
+        it { expect(subject).to be_hidden }
+      end
     end
-  end
 
-  context "#reported?" do
-    context "when the report count is equal to 0" do
-      let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 0) }
-      let!(:report) { nil }
-      it { expect(subject).not_to be_reported }
-    end
+    context "#reported?" do
+      context "when the report count is equal to 0" do
+        let(:moderation) { create(:moderation, reportable: subject, participatory_space: participatory_space, report_count: 0) }
+        let!(:report) { nil }
+        it { expect(subject).not_to be_reported }
+      end
 
-    context "when the report count is greater than 0" do
-      it { expect(subject).to be_reported }
+      context "when the report count is greater than 0" do
+        it { expect(subject).to be_reported }
+      end
     end
   end
 end

data/lib/decidim/core/test/shared_examples/scope_helper_examples.rb

@@ -3,39 +3,37 @@
 require "spec_helper"
 
 shared_examples "scope helpers" do
-  describe Decidim::ScopesHelper do
-    let(:organization) { create(:organization) }
-    let(:scopes_enabled) { true }
-    let(:participatory_space_scope) { nil }
-    let(:feature) { create(:feature, manifest_name: "dummy", participatory_space: participatory_space) }
-    let(:scope) { create(:scope, organization: organization) }
-    let(:resource) { create(:dummy_resource, feature: feature, scope: scope) }
-
-    subject { helper.has_visible_scopes?(resource) }
-
-    before do
-      allow(helper).to receive(:current_participatory_space).and_return(participatory_space)
+  let(:organization) { create(:organization) }
+  let(:scopes_enabled) { true }
+  let(:participatory_space_scope) { nil }
+  let(:feature) { create(:feature, manifest_name: "dummy", participatory_space: participatory_space) }
+  let(:scope) { create(:scope, organization: organization) }
+  let(:resource) { create(:dummy_resource, feature: feature, scope: scope) }
+
+  subject { helper.has_visible_scopes?(resource) }
+
+  before do
+    allow(helper).to receive(:current_participatory_space).and_return(participatory_space)
+  end
+
+  describe "has_visible_scopes?" do
+    context "when all conditions are met" do
+      it { is_expected.to be_truthy }
+    end
+
+    context "when the process has not scope enabled" do
+      let(:scopes_enabled) { false }
+      it { is_expected.to be_falsey }
+    end
+
+    context "when the process has a scope" do
+      let(:participatory_space_scope) { create(:scope, organization: organization) }
+      it { is_expected.to be_falsey }
     end
 
-    describe "has_visible_scopes?" do
-      context "when all conditions are met" do
-        it { is_expected.to be_truthy }
-      end
-
-      context "when the process has not scope enabled" do
-        let(:scopes_enabled) { false }
-        it { is_expected.to be_falsey }
-      end
-
-      context "when the process has a scope" do
-        let(:participatory_space_scope) { create(:scope, organization: organization) }
-        it { is_expected.to be_falsey }
-      end
-
-      context "when the resource has not a scope" do
-        let(:scope) { nil }
-        it { is_expected.to be_falsey }
-      end
+    context "when the resource has not a scope" do
+      let(:scope) { nil }
+      it { is_expected.to be_falsey }
     end
   end
 end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.7.4"
+      "0.8.0"
     end
   end
 end

data/lib/decidim/engine_router.rb

@@ -28,13 +28,15 @@ module Decidim
       new(target.mounted_admin_engine, target.mounted_params)
     end
 
-    attr_reader :default_url_options
-
     def initialize(engine, default_url_options)
       @engine = engine
       @default_url_options = default_url_options
     end
 
+    def default_url_options
+      @default_url_options.reverse_merge(ActionMailer::Base.default_url_options)
+    end
+
     def respond_to_missing?(method_name, include_private = false)
       route_helper?(method_name) || super
     end

data/lib/decidim/has_reference.rb

@@ -28,12 +28,20 @@ module Decidim
         Decidim.resource_reference_generator.call(self, feature)
       end
 
-      # Internal: Sets the unique reference to the model.
+      # Internal: Sets the unique reference to the model. Note that if the resource
+      # implements `Decidim::Traceable` then any normal update (or `update_attributes`)
+      # will create a new version through an ActiveRecord update callback, but here
+      # we can't track the author of the version, so we use the `update_column` method
+      # which does not trigger callbacks.
       #
       # Returns nothing.
       def store_reference
         self[:reference] ||= calculate_reference
-        save if changed?
+        return unless changed?
+
+        # rubocop:disable Rails/SkipsModelValidations
+        update_column(:reference, self[:reference])
+        # rubocop:enable Rails/SkipsModelValidations
       end
     end
   end

data/lib/decidim/messaging.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Messaging
+    def self.table_name_prefix
+      "decidim_messaging_"
+    end
+  end
+end