decidim-core 0.30.2 → 0.31.0.rc1

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

@@ -44,6 +44,14 @@ def generate_localized_title(field = nil, skip_injection: false)
   end
 end
 
+def generate_title(field = nil, skip_injection:)
+  skip_injection = true if field.nil?
+
+  prepend = skip_injection ? "" : "<script>alert(\"#{field}\");</script>"
+
+  "#{prepend}#{generate(:title)}"
+end
+
 FactoryBot.define do
   sequence(:title) do |n|
     "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
@@ -57,18 +65,10 @@ FactoryBot.define do
     "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
   end
 
-  sequence(:hashtag_name) do |n|
-    "#{Faker::Lorem.characters(number: rand(1..10))}_#{n}".gsub("'", "_")
-  end
-
   sequence(:email) do |n|
     "user#{n}@example.org"
   end
 
-  sequence(:user_group_email) do |n|
-    "usergroup#{n}@example.org"
-  end
-
   sequence(:slug) do |n|
     "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}".gsub("'", "_")
   end
@@ -132,10 +132,8 @@ FactoryBot.define do
     users_registration_mode { :enabled }
     official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     official_url { Faker::Internet.url }
-    highlighted_content_banner_enabled { false }
     enable_omnipresent_banner { false }
     badges_enabled { true }
-    user_groups_enabled { true }
     send_welcome_notification { true }
     comments_max_length { 1000 }
     admin_terms_of_service_body { generate_localized_description(:admin_terms_of_service_body, skip_injection:) }
@@ -299,76 +297,6 @@ FactoryBot.define do
     privatable_to { create(:assembly, organization: user.organization, skip_injection:) }
   end
 
-  factory :user_group, class: "Decidim::UserGroup" do
-    transient do
-      skip_injection { false }
-      document_number { "#{Faker::Number.number(digits: 8)}X" }
-      phone { Faker::PhoneNumber.phone_number }
-      rejected_at { nil }
-      verified_at { nil }
-    end
-
-    sequence(:name) { |n| "#{Faker::Company.name} #{n}" }
-    email { generate(:user_group_email) }
-    nickname { generate(:nickname) }
-    about { generate_localized_title(:user_group_about, skip_injection:) }
-    organization
-    avatar { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") } # Keep after organization
-
-    transient do
-      users { [] }
-    end
-
-    trait :verified do
-      verified_at { Time.current }
-    end
-
-    trait :rejected do
-      rejected_at { Time.current }
-    end
-
-    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 group" }
-    end
-
-    after(:build) do |user_group, evaluator|
-      user_group.extended_data = user_group.extended_data.merge({
-                                                                  document_number: evaluator.document_number,
-                                                                  phone: evaluator.phone,
-                                                                  rejected_at: evaluator.rejected_at,
-                                                                  verified_at: evaluator.verified_at
-                                                                })
-    end
-
-    after(:create) do |user_group, evaluator|
-      users = evaluator.users.dup
-      next if users.empty?
-
-      creator = users.shift
-      create(:user_group_membership, user: creator, user_group:, role: :creator, skip_injection: evaluator.skip_injection)
-
-      users.each do |user|
-        create(:user_group_membership, user:, user_group:, role: :admin, skip_injection: evaluator.skip_injection)
-      end
-    end
-  end
-
-  factory :user_group_membership, class: "Decidim::UserGroupMembership" do
-    transient do
-      skip_injection { false }
-    end
-    user { create(:user, :confirmed, organization: user_group.organization, skip_injection:) }
-    role { :creator }
-    user_group
-  end
-
   factory :identity, class: "Decidim::Identity" do
     transient do
       skip_injection { false }
@@ -580,29 +508,29 @@ FactoryBot.define do
       end
     end
 
-    trait :with_endorsements_enabled do
+    trait :with_likes_enabled do
       step_settings do
         participatory_space_with_steps if participatory_space.active_step.nil?
         {
-          participatory_space.active_step.id => { endorsements_enabled: true }
+          participatory_space.active_step.id => { likes_enabled: true }
         }
       end
     end
 
-    trait :with_endorsements_disabled do
+    trait :with_likes_disabled do
       step_settings do
         participatory_space_with_steps if participatory_space.active_step.nil?
         {
-          participatory_space.active_step.id => { endorsements_enabled: false }
+          participatory_space.active_step.id => { likes_enabled: false }
         }
       end
     end
 
-    trait :with_endorsements_blocked do
+    trait :with_likes_blocked do
       step_settings do
         participatory_space_with_steps if participatory_space.active_step.nil?
         {
-          participatory_space.active_step.id => { endorsements_blocked: true }
+          participatory_space.active_step.id => { likes_blocked: true }
         }
       end
     end
@@ -878,8 +806,10 @@ FactoryBot.define do
       extra_data { {} }
     end
 
+    user { create(:user) }
     organization { user.organization }
-    user
+    user_id { user.id }
+    user_type { user.class.name }
     participatory_space { build(:participatory_process, organization:, skip_injection:) }
     component { build(:component, participatory_space:, skip_injection:) }
     resource { build(:dummy_resource, component:, skip_injection:) }
@@ -917,7 +847,9 @@ FactoryBot.define do
     organization_url { "http://example.org" }
     organization_logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
     redirect_uri { "https://app.example.org/oauth" }
-    scopes { "public" }
+    scopes { "profile" }
+    confidential { true }
+    refresh_tokens_enabled { false }
   end
 
   factory :oauth_access_token, class: "Doorkeeper::AccessToken" do
@@ -929,7 +861,7 @@ FactoryBot.define do
     token { SecureRandom.hex(32) }
     expires_in { 1.month.from_now }
     created_at { Time.current }
-    scopes { "public" }
+    scopes { "profile" }
   end
 
   factory :private_export, class: "Decidim::PrivateExport" do
@@ -974,28 +906,6 @@ FactoryBot.define do
     end
   end
 
-  factory :hashtag, class: "Decidim::Hashtag" do
-    transient do
-      skip_injection { false }
-    end
-    name { generate(:hashtag_name) }
-    organization
-  end
-
-  factory :metric, class: "Decidim::Metric" do
-    transient do
-      skip_injection { false }
-    end
-    organization
-    day { Time.zone.today }
-    metric_type { "random_metric" }
-    cumulative { 2 }
-    quantity { 1 }
-    category { create(:category) }
-    participatory_space { create(:participatory_process, organization:, skip_injection:) }
-    related_object { create(:component, participatory_space:, skip_injection:) }
-  end
-
   factory :amendment, class: "Decidim::Amendment" do
     transient do
       skip_injection { false }
@@ -1044,7 +954,7 @@ FactoryBot.define do
     user { create(:user, :confirmed) }
   end
 
-  factory :endorsement, class: "Decidim::Endorsement" do
+  factory :like, class: "Decidim::Like" do
     transient do
       skip_injection { false }
     end
@@ -1052,15 +962,6 @@ FactoryBot.define do
     author { resource.try(:creator_author) || resource.try(:author) || build(:user, organization: resource.organization, skip_injection:) }
   end
 
-  factory :user_group_endorsement, class: "Decidim::Endorsement" do
-    transient do
-      skip_injection { false }
-    end
-    resource { build(:dummy_resource, skip_injection:) }
-    author { build(:user, organization: resource.organization, skip_injection:) }
-    user_group { create(:user_group, verified_at: Time.current, organization: resource.organization, users: [author], skip_injection:) }
-  end
-
   factory :share_token, class: "Decidim::ShareToken" do
     transient do
       skip_injection { false }

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

@@ -4,23 +4,6 @@ require "spec_helper"
 
 shared_examples_for "authorable" do
   describe "validations" do
-    context "when the user group is not verified" do
-      it "is not valid" do
-        user_group = create(:user_group)
-        create(:user_group_membership, user: subject.author, user_group:)
-        subject.user_group = user_group
-        expect(subject).not_to be_valid
-      end
-    end
-
-    context "when the author does not have a membership of the user group" do
-      it "is not valid" do
-        user_group = create(:user_group, :verified)
-        subject.user_group = user_group
-        expect(subject).not_to be_valid
-      end
-    end
-
     context "when the author is from another organization" do
       before do
         subject.author = create(:user)

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

@@ -6,7 +6,7 @@ shared_examples_for "coauthorable" do
   describe "authorable interface" do
     let!(:creator_author) { coauthorable.authors.first }
     let(:other_authors) { create_list(:user, 5, organization: coauthorable.component.participatory_space.organization) }
-    let(:other_user_groups) { create_list(:user_group, 5, :verified, organization: creator_author.organization, users: [creator_author]) }
+    let(:official_author) { creator_author.organization }
 
     describe "authors" do
       context "when there is one author" do
@@ -31,46 +31,6 @@ shared_examples_for "coauthorable" do
       end
     end
 
-    describe "user_groups" do
-      let(:user_group) do
-        create(:user_group,
-               :verified,
-               organization: creator_author.organization,
-               users: [creator_author])
-      end
-
-      context "when there is NO user_group" do
-        it "returns empty array" do
-          expect(coauthorable.user_groups).to eq([])
-        end
-      end
-
-      context "when there is one user_group" do
-        before do
-          coauthorship = coauthorable.coauthorships.first
-          coauthorship.user_group = user_group
-          coauthorship.save
-        end
-
-        it "returns the only user_group" do
-          expect(coauthorable.user_groups).to eq([user_group])
-        end
-      end
-
-      context "when there are many user_groups" do
-        before do
-          coauthorable.coauthorships.clear
-          other_user_groups.each do |ug|
-            Decidim::Coauthorship.create(author: ug.memberships.first.user, user_group: ug, coauthorable:)
-          end
-        end
-
-        it "returns all user_groups" do
-          expect(coauthorable.user_groups).to eq(other_user_groups)
-        end
-      end
-    end
-
     describe "authored by? user" do
       context "when there are no coauthors" do
         before do
@@ -112,18 +72,15 @@ shared_examples_for "coauthorable" do
             coauthorable.add_coauthor(author)
           end
 
-          other_user_groups.each do |user_group|
-            coauthorable.add_coauthor(
-              user_group.memberships.first.user,
-              user_group:
-            )
-          end
+          coauthorable.add_coauthor(
+            official_author
+          )
         end
 
         it "returns an array of identities" do
           identities = [creator_author]
           identities += other_authors
-          identities += other_user_groups
+          identities += [official_author]
           expect(coauthorable.identities.to_a).to match_array(identities)
         end
       end

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

@@ -194,7 +194,7 @@ shared_examples "comments" do
       it "shows a modal with the comment form" do
         expect(page).to have_content("Add comment")
         click_on "Add comment"
-        sleep 1
+
         expect(page).to have_content("Add comment")
         expect(page).to have_content("1000 characters left")
         expect(page).to have_css(".add-comment form")
@@ -244,6 +244,9 @@ shared_examples "comments" do
             click_on locale
           end
 
+          sleep 1
+          page.scroll_to(find(".add-comment form"))
+
           within ".add-comment form" do
             expect(page).to have_css(".emoji__container")
             expect(page).to have_css(".emoji__trigger .emoji__button")
@@ -705,28 +708,6 @@ shared_examples "comments" do
       end
     end
 
-    context "when the user has verified organizations" do
-      let(:user_group) { create(:user_group, :verified, organization:) }
-      let(:content) { "This is a new comment" }
-
-      before do
-        create(:user_group_membership, user:, user_group:)
-      end
-
-      it "adds new comment as a user group" do
-        visit resource_path
-
-        within "form#new_comment_for_#{commentable.commentable_type.demodulize}_#{commentable.id}" do
-          field = find("#add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}")
-          field.set " "
-          field.native.send_keys content
-          click_on "Publish comment"
-        end
-
-        expect(page).to have_comment_from(user_group, content, wait: 20)
-      end
-    end
-
     context "when a user deletes a comment" do
       let(:comment_body) { "This comment is a mistake" }
       let!(:comment) { create(:comment, body: comment_body, commentable:, author: comment_author) }
@@ -991,15 +972,6 @@ shared_examples "comments" do
           expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
         end
       end
-
-      context "when mentioning a group" do
-        let!(:mentioned_group) { create(:user_group, :confirmed, organization:) }
-        let(:content) { "A confirmed user group mention: @#{mentioned_group.nickname}" }
-
-        it "shows the tribute container" do
-          expect(page).to have_css(".tribute-container", text: mentioned_group.nickname, wait: 10)
-        end
-      end
     end
 
     describe "mentions", :slow do
@@ -1045,26 +1017,6 @@ shared_examples "comments" do
       end
     end
 
-    describe "hashtags", :slow do
-      let(:content) { "A comment with a hashtag #decidim" }
-
-      before do
-        visit resource_path
-
-        within "form#new_comment_for_#{commentable.commentable_type.demodulize}_#{commentable.id}" do
-          field = find("#add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}")
-          field.set " "
-          field.native.send_keys content
-          click_on "Publish comment"
-        end
-      end
-
-      it "replaces the hashtag with a link to the hashtag search" do
-        expect(page).to have_comment_from(user, "A comment with a hashtag #decidim", wait: 20)
-        expect(page).to have_link "#decidim", href: "/search?term=%23decidim"
-      end
-    end
-
     describe "export_serializer" do
       let(:comment) { comments.first }
 
@@ -1082,7 +1034,6 @@ shared_examples "comments" do
         it { is_expected.to have_key(:author) }
         it { is_expected.to have_key(:alignment) }
         it { is_expected.to have_key(:depth) }
-        it { is_expected.to have_key(:user_group) }
         it { is_expected.to have_key(:commentable_id) }
         it { is_expected.to have_key(:commentable_type) }
         it { is_expected.to have_key(:root_commentable_url) }
@@ -1163,14 +1114,14 @@ shared_examples "comments blocked" do
       end
 
       context "when the user has an evaluator role in the same participatory space" do
-        let!(:valuator_role) { create(:participatory_process_user_role, role: :valuator, user:, participatory_process: participatory_space) }
+        let!(:evaluator_role) { create(:participatory_process_user_role, role: :evaluator, user:, participatory_process: participatory_space) }
 
         it_behaves_like "can answer comments"
       end
 
       shared_examples "evaluator role in different participatory space" do |space_type|
-        let!(:another_space_valuator_role) do
-          create(:"#{space_type}_user_role", role: :valuator, user:, "#{space_type}": create(space_type, organization:))
+        let!(:another_space_evaluator_role) do
+          create(:"#{space_type}_user_role", role: :evaluator, user:, "#{space_type}": create(space_type, organization:))
         end
 
         it "cannot answer" do

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+shared_examples_for "likeable" do
+  context "when likeable" do
+    let(:user) { create(:user, organization: subject.organization) }
+
+    describe "#liked_by?" do
+      context "with User like" do
+        it "returns false if the resource is not liked by the given user" do
+          expect(subject).not_to be_liked_by(user)
+        end
+
+        it "returns true if the resource is liked by the given user" do
+          create(:like, resource: subject, author: user)
+          expect(subject).to be_liked_by(user)
+        end
+      end
+    end
+  end
+end

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

@@ -116,6 +116,7 @@ shared_examples "manage resource share tokens" do
         expect(page).to have_content("Yes")
       end
       within ".share_tokens tbody tr", text: last_token.token do
+        find("button[data-controller='dropdown']").click
         click_on "Edit"
       end
 
@@ -142,6 +143,7 @@ shared_examples "manage resource share tokens" do
 
     it "allows copying the share link from the share token" do
       within ".share_tokens tbody tr", text: last_token.token do
+        find("button[data-controller='dropdown']").click
         click_on "Copy link"
         expect(page).to have_content("copied!")
         expect(page).to have_css("[data-clipboard-copy-label]")
@@ -153,6 +155,7 @@ shared_examples "manage resource share tokens" do
     it "has a share link for each token" do
       urls = share_tokens.map(&:url)
       within ".share_tokens tbody tr", text: last_token.token do
+        find("button[data-controller='dropdown']").click
         share_window = window_opened_by { click_on "Preview" }
 
         within_window share_window do
@@ -163,6 +166,7 @@ shared_examples "manage resource share tokens" do
 
     it "has a share button that opens the share url for the resource" do
       within ".share_tokens tbody tr", text: last_token.token do
+        find("button[data-controller='dropdown']").click
         share_window = window_opened_by { click_on "Preview", wait: 2 }
 
         within_window share_window do
@@ -173,6 +177,7 @@ shared_examples "manage resource share tokens" do
 
     it "can delete tokens" do
       within ".share_tokens tbody tr", text: last_token.token do
+        find("button[data-controller='dropdown']").click
         accept_confirm { click_on "Delete" }
       end
 
@@ -211,8 +216,11 @@ shared_examples "manage component share tokens" do
 
   def visit_share_tokens_page
     visit components_path
-    within ".table-list" do
-      click_on "Access links"
+
+    within("tr", text: resource_name) do
+      #  To remove once all the actions are migrated to dropdowns
+      find("button[data-controller='dropdown']").click
+      click_on "Share link"
     end
   end
 
@@ -230,7 +238,12 @@ shared_examples "manage participatory space share tokens" do
 
   def visit_share_tokens_page
     visit participatory_spaces_path
-    click_on "Access links"
+
+    within("tr", text: resource_name) do
+      #  To remove once all the actions are migrated to dropdowns
+      find("button[data-controller='dropdown']").click
+      click_on "Share link"
+    end
   end
 
   it_behaves_like "manage resource share tokens"

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

@@ -87,7 +87,7 @@ shared_context "with frontend map elements" do
           <script type="text/javascript">
             // This is just to indicate to Capybara that the page has fully
             // finished loading.
-            document.addEventListener("DOMContentLoaded", function() {
+            document.addEventListener("turbo:load", function() {
               setTimeout(function() {
                 window.$("body").append('<div id="ready_indicator">Document ready</div>');
               }, 1000);