decidim-core 0.23.2 → 0.24.0

data/lib/decidim/core/api.rb

@@ -2,21 +2,76 @@
 
 module Decidim
   module Core
-    autoload :ParticipatorySpaceInterface, "decidim/api/participatory_space_interface"
-    autoload :ComponentInterface, "decidim/api/component_interface"
-    autoload :AuthorInterface, "decidim/api/author_interface"
-    autoload :AuthorableInterface, "decidim/api/authorable_interface"
-    autoload :CoauthorableInterface, "decidim/api/coauthorable_interface"
-    autoload :CategorizableInterface, "decidim/api/categorizable_interface"
-    autoload :ScopableInterface, "decidim/api/scopable_interface"
-    autoload :AttachableInterface, "decidim/api/attachable_interface"
-    autoload :HashtagInterface, "decidim/api/hashtag_interface"
-    autoload :ParticipatorySpaceResourceableInterface, "decidim/api/participatory_space_resourceable_interface"
-    autoload :FingerprintInterface, "decidim/api/fingerprint_interface"
-    autoload :AmendableInterface, "decidim/api/amendable_interface"
-    autoload :AmendableEntityInterface, "decidim/api/amendable_entity_interface"
-    autoload :TraceableInterface, "decidim/api/traceable_interface"
-    autoload :TimestampsInterface, "decidim/api/timestamps_interface"
-    autoload :EndorsableInterface, "decidim/api/endorsable_interface"
+    autoload :ComponentFinderBase, "decidim/api/functions/component_finder_base"
+    autoload :ComponentList, "decidim/api/functions/component_list"
+    autoload :ComponentListBase, "decidim/api/functions/component_list_base"
+    autoload :NeedsApiFilterAndOrder, "decidim/api/functions/needs_api_filter_and_order"
+    autoload :NeedsApiDefaultOrder, "decidim/api/functions/needs_api_default_order"
+    autoload :ParticipatorySpaceFinderBase, "decidim/api/functions/participatory_space_finder_base"
+    autoload :ParticipatorySpaceListBase, "decidim/api/functions/participatory_space_list_base"
+    autoload :UserEntityFinder, "decidim/api/functions/user_entity_finder"
+    autoload :UserEntityList, "decidim/api/functions/user_entity_list"
+
+    autoload :AmendmentType, "decidim/api/types/amendment_type"
+    autoload :AreaApiType, "decidim/api/types/area_api_type"
+    autoload :AreaTypeType, "decidim/api/types/area_type_type"
+    autoload :AttachmentType, "decidim/api/types/attachment_type"
+    autoload :CategoryType, "decidim/api/types/category_type"
+    autoload :ComponentType, "decidim/api/types/component_type"
+    autoload :CoordinatesType, "decidim/api/types/coordinates_type"
+    autoload :DecidimType, "decidim/api/types/decidim_type"
+    autoload :FingerprintType, "decidim/api/types/fingerprint_type"
+    autoload :HashtagType, "decidim/api/types/hashtag_type"
+    autoload :LocalizedStringType, "decidim/api/types/localized_string_type"
+    autoload :MetricHistoryType, "decidim/api/types/metric_history_type"
+    autoload :MetricType, "decidim/api/types/metric_type"
+    autoload :OrganizationType, "decidim/api/types/organization_type"
+    autoload :ParticipatorySpaceType, "decidim/api/types/participatory_space_type"
+    autoload :ParticipatorySpaceLinkType, "decidim/api/types/participatory_space_link_type"
+    autoload :ScopeApiType, "decidim/api/types/scope_api_type"
+    autoload :SessionType, "decidim/api/types/session_type"
+    autoload :StatisticType, "decidim/api/types/statistic_type"
+    autoload :TraceVersionType, "decidim/api/types/trace_version_type"
+    autoload :TranslatedFieldType, "decidim/api/types/translated_field_type"
+    autoload :UserGroupType, "decidim/api/types/user_group_type"
+    autoload :UserType, "decidim/api/types/user_type"
+
+    autoload :BaseInputFilter, "decidim/api/input_filters/base_input_filter"
+    autoload :ComponentInputFilter, "decidim/api/input_filters/component_input_filter"
+    autoload :HasHastaggableInputFilter, "decidim/api/input_filters/has_hastaggable_input_filter"
+    autoload :HasLocalizedInputFilter, "decidim/api/input_filters/has_localized_input_filter"
+    autoload :HasPublishableInputFilter, "decidim/api/input_filters/has_publishable_input_filter"
+    autoload :HasTimestampInputFilter, "decidim/api/input_filters/has_timestamp_input_filter"
+    autoload :ParticipatorySpaceInputFilter, "decidim/api/input_filters/participatory_space_input_filter"
+    autoload :UserEntityInputFilter, "decidim/api/input_filters/user_entity_input_filter"
+
+    autoload :BaseInputSort, "decidim/api/input_sorts/base_input_sort"
+    autoload :ComponentInputSort, "decidim/api/input_sorts/component_input_sort"
+    autoload :HasEndorsableInputSort, "decidim/api/input_sorts/has_endorsable_input_sort"
+    autoload :HasLocalizedInputSort, "decidim/api/input_sorts/has_localized_input_sort"
+    autoload :HasPublishableInputSort, "decidim/api/input_sorts/has_publishable_input_sort"
+    autoload :HasTimestampInputSort, "decidim/api/input_sorts/has_timestamp_input_sort"
+    autoload :ParticipatorySpaceInputSort, "decidim/api/input_sorts/participatory_space_input_sort"
+    autoload :UserEntityInputSort, "decidim/api/input_sorts/user_entity_input_sort"
+
+    autoload :ParticipatorySpaceInterface, "decidim/api/interfaces/participatory_space_interface"
+    autoload :ComponentInterface, "decidim/api/interfaces/component_interface"
+    autoload :AuthorInterface, "decidim/api/interfaces/author_interface"
+    autoload :AuthorableInterface, "decidim/api/interfaces/authorable_interface"
+    autoload :CoauthorableInterface, "decidim/api/interfaces/coauthorable_interface"
+    autoload :CategorizableInterface, "decidim/api/interfaces/categorizable_interface"
+    autoload :ScopableInterface, "decidim/api/interfaces/scopable_interface"
+    autoload :AttachableInterface, "decidim/api/interfaces/attachable_interface"
+    autoload :HashtagInterface, "decidim/api/interfaces/hashtag_interface"
+    autoload :ParticipatorySpaceResourceableInterface, "decidim/api/interfaces/participatory_space_resourceable_interface"
+    autoload :FingerprintInterface, "decidim/api/interfaces/fingerprint_interface"
+    autoload :AmendableInterface, "decidim/api/interfaces/amendable_interface"
+    autoload :AmendableEntityInterface, "decidim/api/interfaces/amendable_entity_interface"
+    autoload :TraceableInterface, "decidim/api/interfaces/traceable_interface"
+    autoload :TimestampsInterface, "decidim/api/interfaces/timestamps_interface"
+    autoload :EndorsableInterface, "decidim/api/interfaces/endorsable_interface"
+
+    autoload :DateTimeType, "decidim/api/scalars/date_time_type"
+    autoload :DateType, "decidim/api/scalars/date_type"
   end
 end

data/lib/decidim/core/engine.rb

@@ -37,7 +37,6 @@ require "kaminari"
 require "doorkeeper"
 require "doorkeeper-i18n"
 require "nobspw"
-require "kaminari"
 require "batch-loader"
 require "etherpad-lite"
 require "diffy"
@@ -89,9 +88,9 @@ module Decidim
       end
 
       initializer "decidim.graphql_api" do
-        Decidim::Api::QueryType.define do
-          Decidim::QueryExtensions.define(self)
-        end
+        # Enable them method `!` everywhere for compatibility, this line will be removed when upgrading to GraphQL 2.0
+        GraphQL::DeprecatedDSL.activate
+        Decidim::Api::QueryType.include Decidim::QueryExtensions
 
         Decidim::Api.add_orphan_type Decidim::Core::UserType
         Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
@@ -110,7 +109,7 @@ module Decidim
         # that may be using the `geocoded_by` or `reverse_geocoded_by` class
         # methods injected by the Geocoder gem.
         ActiveSupport.on_load :active_record do
-          ActiveRecord::Base.send(:include, Decidim::Geocodable)
+          ActiveRecord::Base.include Decidim::Geocodable
         end
       end
 
@@ -335,6 +334,36 @@ module Decidim
           end
         end
 
+        Decidim.metrics_registry.register(:blocked_users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::BlockedUsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:user_reports) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::UserReportsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
+        Decidim.metrics_registry.register(:reported_users) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Metrics::ReportedUsersMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home)
+            settings.attribute :weight, type: :integer, default: 1
+          end
+        end
+
         Decidim.metrics_registry.register(:participants) do |metric_registry|
           metric_registry.manager_class = "Decidim::Metrics::ParticipantsMetricManage"
 
@@ -513,7 +542,7 @@ module Decidim
       end
 
       config.to_prepare do
-        FoundationRailsHelper::FlashHelper.send(:include, Decidim::FlashHelperExtensions)
+        FoundationRailsHelper::FlashHelper.include Decidim::FlashHelperExtensions
       end
     end
   end

data/lib/decidim/core/test.rb

@@ -22,7 +22,6 @@ require "decidim/core/test/shared_examples/reports_examples"
 require "decidim/core/test/shared_examples/paginated_resource_examples"
 require "decidim/core/test/shared_examples/errors"
 require "decidim/core/test/shared_examples/scope_helper_examples"
-require "decidim/core/test/shared_examples/user_localised_email_examples"
 require "decidim/core/test/shared_examples/follows_examples"
 require "decidim/core/test/shared_examples/simple_event"
 require "decidim/core/test/shared_examples/component_type"
@@ -63,3 +62,5 @@ require "decidim/core/test/shared_examples/manage_component_share_tokens"
 require "decidim/core/test/shared_examples/metric_manage_shared_context"
 require "decidim/core/test/shared_examples/embed_resource_examples"
 require "decidim/core/test/shared_examples/resource_search_examples"
+require "decidim/core/test/shared_examples/static_pages_examples"
+require "decidim/core/test/shared_examples/controller_render_views"

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/faker/localized"
+require "decidim/faker/internet"
 require "decidim/dev"
 
 require "decidim/participatory_processes/test/factories"
@@ -13,7 +14,7 @@ end
 
 FactoryBot.define do
   sequence(:title) do |n|
-    "#{Faker::Lorem.sentence(3)} #{n}".delete("'")
+    "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
   end
 
   sequence(:name) do |n|
@@ -21,11 +22,11 @@ FactoryBot.define do
   end
 
   sequence(:nickname) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
+    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:hashtag_name) do |n|
-    "#{Faker::Lorem.characters(rand(1..10))}_#{n}".gsub("'", "_")
+    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
   sequence(:email) do |n|
@@ -37,19 +38,19 @@ FactoryBot.define do
   end
 
   sequence(:slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}".gsub("'", "_")
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}".gsub("'", "_")
   end
 
   sequence(:scope_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}".gsub("s", "z").gsub("S", "Z")
+    "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}".gsub("s", "z").gsub("S", "Z")
   end
 
   sequence(:scope_code) do |n|
-    "#{Faker::Lorem.characters(4).upcase}-#{n}"
+    "#{Faker::Lorem.characters(number: 4).upcase}-#{n}"
   end
 
   sequence(:area_name) do |n|
-    "#{Faker::Lorem.sentence(1, true, 3)} #{n}"
+    "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
   factory :category, class: "Decidim::Category" do
@@ -67,6 +68,10 @@ FactoryBot.define do
   end
 
   factory :organization, class: "Decidim::Organization" do
+    transient do
+      create_static_pages { true }
+    end
+
     name { Faker::Company.unique.name }
     reference_prefix { Faker::Name.suffix }
     time_zone { "UTC" }
@@ -104,9 +109,15 @@ FactoryBot.define do
     end
     file_upload_settings { Decidim::OrganizationSettings.default(:upload) }
 
-    after(:create) do |organization|
-      tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
-      create(:static_page, :tos, organization: organization) if tos_page.nil?
+    trait :secure_context do
+      host { "localhost" }
+    end
+
+    after(:create) do |organization, evaluator|
+      if evaluator.create_static_pages
+        tos_page = Decidim::StaticPage.find_by(slug: "terms-and-conditions", organization: organization)
+        create(:static_page, :tos, organization: organization) if tos_page.nil?
+      end
     end
   end
 
@@ -121,15 +132,23 @@ FactoryBot.define do
     tos_agreement { "1" }
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     personal_url { Faker::Internet.url }
-    about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
+    about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     confirmation_sent_at { Time.current }
     accepted_tos_version { organization.tos_version }
     email_on_notification { true }
+    email_on_moderations { true }
 
     trait :confirmed do
       confirmed_at { Time.current }
     end
 
+    trait :blocked do
+      blocked { true }
+      blocked_at { Time.current }
+      extended_data { { "user_name": generate(:name) } }
+      name { "Blocked user" }
+    end
+
     trait :deleted do
       email { "" }
       deleted_at { Time.current }
@@ -175,7 +194,7 @@ FactoryBot.define do
 
   factory :user_group, class: "Decidim::UserGroup" do
     transient do
-      document_number { Faker::Number.number(8) + "X" }
+      document_number { "#{Faker::Number.number(digits: 8)}X" }
       phone { Faker::PhoneNumber.phone_number }
       rejected_at { nil }
       verified_at { nil }
@@ -184,7 +203,7 @@ FactoryBot.define do
     sequence(:name) { |n| "#{Faker::Company.name} #{n}" }
     email { generate(:user_group_email) }
     nickname { generate(:nickname) }
-    about { "<script>alert(\"ABOUT\");</script>" + Faker::Lorem.paragraph(2) }
+    about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
     organization
     avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } # Keep after organization
 
@@ -259,6 +278,7 @@ FactoryBot.define do
     title { generate_localized_title }
     content { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization { build(:organization) }
+    allow_public_access { false }
 
     trait :default do
       slug { Decidim::StaticPage::DEFAULT_PAGES.sample }
@@ -290,7 +310,7 @@ FactoryBot.define do
   factory :attachment_collection, class: "Decidim::AttachmentCollection" do
     name { generate_localized_title }
     description { generate_localized_title }
-    weight { Faker::Number.number(1) }
+    weight { Faker::Number.number(digits: 1) }
 
     association :collection_for, factory: :participatory_process
   end
@@ -298,7 +318,7 @@ FactoryBot.define do
   factory :attachment, class: "Decidim::Attachment" do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    weight { Faker::Number.number(1) }
+    weight { Faker::Number.number(digits: 1) }
     attached_to { build(:participatory_process) }
     content_type { "image/jpeg" }
     file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after attached_to
@@ -402,6 +422,14 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_comments_disabled do
+      settings do
+        {
+          comments_enabled: false
+        }
+      end
+    end
   end
 
   factory :scope_type, class: "Decidim::ScopeType" do
@@ -681,6 +709,16 @@ FactoryBot.define do
     end
   end
 
+  factory :user_report, class: "Decidim::UserReport" do
+    reason { "spam" }
+    moderation { build(:user_moderation) }
+    user { build(:user, organization: moderation.organization) }
+  end
+
+  factory :user_moderation, class: "Decidim::UserModeration" do
+    user { build(:user) }
+  end
+
   factory :endorsement, class: "Decidim::Endorsement" do
     resource { build(:dummy_resource) }
     author { resource.try(:creator_author) || resource.try(:author) || build(:user, organization: resource.organization) }

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

@@ -59,7 +59,7 @@ shared_examples "admin manages resource gallery" do
       let!(:image1) { create(:attachment, :with_image, attached_to: resource) }
       let!(:image2) { create(:attachment, :with_image, attached_to: resource) }
       let(:uploaded_photos) { [] }
-      let(:current_photos) { [image1.id.to_s] }
+      let(:current_photos) { [image1] }
 
       it "to decrease the number of photos in the gallery" do
         expect(resource.attachments.count).to eq(2)

data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment accepted event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been accepted for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment promoted event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to eq("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("A <a href=\"#{emendation_path}\">rejected amendment</a> for <a href=\"#{amendable_path}\">#{amendable_title}</a> has been published as a new #{amendable_type} by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a>.") # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb

@@ -37,7 +37,7 @@ shared_examples "amendment rejected event" do
   describe "notification_title" do
     it "is generated correctly" do
       expect(subject.notification_title)
-        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Metrics/LineLength
+        .to eq("The <a href=\"#{emendation_path}\">amendment</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a>.") # rubocop:disable Layout/LineLength
     end
   end
 end

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

@@ -5,15 +5,23 @@ require "spec_helper"
 shared_examples_for "categorizable interface" do
   let!(:category) { create(:category, participatory_space: model.participatory_space) }
 
-  before do
-    model.update(category: category)
-  end
-
   describe "category" do
     let(:query) { "{ category { id } }" }
 
-    it "has a category" do
-      expect(response).to include("category" => { "id" => category.id.to_s })
+    context "when model has category" do
+      before do
+        model.update(category: category)
+      end
+
+      it "has a category" do
+        expect(response).to include("category" => { "id" => category.id.to_s })
+      end
+    end
+
+    context "when model has no category" do
+      it "returns null" do
+        expect(response).to include("category" => nil)
+      end
     end
   end
 end

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

@@ -97,13 +97,14 @@ shared_examples "comments" do
     context "when user adds a new comment" do
       before do
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment"
           click_button "Send"
         end
       end
 
-      it "shows comment to the user" do
+      it "shows comment to the user and updates the comments counter" do
         expect(page).to have_comment_from(user, "This is a new comment", wait: 20)
+        expect(page).to have_selector("span.comments-count", text: "#{commentable.comments.count} COMMENTS")
       end
     end
 
@@ -120,7 +121,7 @@ shared_examples "comments" do
         expect(page).to have_selector(".add-comment form")
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment"
           select user_group.name, from: "Comment as"
           click_button "Send"
         end
@@ -144,7 +145,7 @@ shared_examples "comments" do
         end
 
         expect(page).to have_selector("#comment_#{comment.id} .add-comment")
-        fill_in "add-comment-Decidim::Comments::Comment-#{comment.id}", with: "This is a reply"
+        fill_in "add-comment-Comment-#{comment.id}", with: "This is a reply"
         within ".comment-thread .add-comment" do
           click_button "Send"
         end
@@ -152,6 +153,7 @@ shared_examples "comments" do
         expect(page).to have_selector(".comment-thread .comment--nested", wait: 20)
         expect(page).to have_selector(".comment__additionalreply")
         expect(page).to have_reply_to(comment, "This is a reply")
+        expect(page).to have_selector("span.comments-count", text: "#{commentable.comments.count} COMMENTS")
       end
     end
 
@@ -184,7 +186,7 @@ shared_examples "comments" do
             page.find(".opinion-toggle--ok").click
 
             within ".add-comment form" do
-              fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "I am in favor about this!"
+              fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "I am in favor about this!"
               click_button "Send"
             end
 
@@ -237,7 +239,7 @@ shared_examples "comments" do
         visit resource_path
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: content
         end
       end
 
@@ -284,7 +286,7 @@ shared_examples "comments" do
         visit resource_path
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          fill_in "add-comment-#{commentable.commentable_type.demodulize.demodulize}-#{commentable.id}", with: content
           click_button "Send"
         end
       end
@@ -296,7 +298,7 @@ shared_examples "comments" do
 
         it "replaces the mention with a link to the user's profile" do
           expect(page).to have_comment_from(user, "A valid user mention: @#{mentioned_user.nickname}", wait: 20)
-          expect(page).to have_link "@#{mentioned_user.nickname}", href: "/profiles/#{mentioned_user.nickname}"
+          expect(page).to have_link "@#{mentioned_user.nickname}", href: "http://#{mentioned_user.organization.host}/profiles/#{mentioned_user.nickname}"
         end
       end
 
@@ -327,7 +329,7 @@ shared_examples "comments" do
         visit resource_path
 
         within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: content
           click_button "Send"
         end
       end