From a94516da4bd05026f638b4ab816f7e8095aac1ba Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Tue, 31 Jan 2023 19:44:01 +0200
Subject: [PATCH] Backport 'User's group endorsement no longer disappears after
 personal endorsement removed' to v0.26 (#10311)

* User's group endorsement no longer disappears after personal endorsement removed

* Fixed group endorsement removal when personal endorsement removed & tests

* test-fixes

* Improve the spec to wait the endorsement has happened

---------

Co-authored-by: JoonasAapro <110532525+JoonasAapro@users.noreply.github.com>
Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
---
 .../spec/system/endorse_posts_spec.rb         | 113 ++++++++++++++++++
 .../commands/decidim/unendorse_resource.rb    |   2 +-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 decidim-blogs/spec/system/endorse_posts_spec.rb

diff --git a/decidim-blogs/spec/system/endorse_posts_spec.rb b/decidim-blogs/spec/system/endorse_posts_spec.rb
new file mode 100644
index 000000000000..9168c4a03b9c
--- /dev/null
+++ b/decidim-blogs/spec/system/endorse_posts_spec.rb
@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "endorse posts", type: :system do
+  include_context "with a component"
+  let(:manifest_name) { "blogs" }
+  let(:organization) { create(:organization) }
+  let(:author) { create(:user, :confirmed, name: "Tester", organization: organization) }
+  let!(:post) { create(:post, component: component, title: { en: "Blog post title" }) }
+
+  before do
+    sign_in author
+    visit_component
+    click_link "Blog post title"
+  end
+
+  context "when endorsing the post without belonging to a user group" do
+    it "endorses the post" do
+      click_button("Endorse")
+      expect(page).to have_content("ENDORSED")
+    end
+  end
+
+  context "when endorsing the post while being a part of a group" do
+    let!(:user_group) do
+      create(
+        :user_group,
+        :verified,
+        name: "Tester's Organization",
+        nickname: "test_org",
+        email: "t.mail.org@example.org",
+        users: [author],
+        organization: organization
+      )
+    end
+
+    it "opens a modal where you select identity as a user or a group" do
+      visit page.current_path
+      click_button("Endorse")
+      expect(page).to have_content("SELECT IDENTITY")
+      expect(page).to have_content("Tester's Organization")
+      expect(page).to have_content("Tester")
+    end
+
+    def add_endorsements
+      click_button "Endorse"
+      within "#user-identities" do
+        find("li", text: /\ATester's Organization\z/).click
+        find("li", text: /\ATester\z/).click
+        expect(page).to have_css(".selected", count: 2)
+        click_button "Done"
+      end
+      visit current_path
+      click_button "Endorse"
+    end
+
+    context "when both identities picked" do
+      it "endorses the post as a group and a user" do
+        visit page.current_path
+
+        add_endorsements
+
+        within "#user-identities" do
+          expect(page).to have_css(".selected", count: 2)
+        end
+      end
+    end
+
+    context "when endorsement cancelled as a user" do
+      it "doesn't cancel group endorsement" do
+        visit page.current_path
+
+        add_endorsements
+        within "#user-identities" do
+          find(".selected", match: :first).click
+          expect(page).to have_css(".selected", count: 1)
+          click_button "Done"
+        end
+        visit current_path
+        click_button "Endorse"
+
+        within "#user-identities" do
+          expect(page).to have_css(".selected", count: 1)
+          within ".selected" do
+            expect(page).to have_text("Tester's Organization", exact: true)
+          end
+        end
+      end
+    end
+
+    context "when endorsement cancelled as a group" do
+      it "doesn't cancel user endorsement" do
+        visit page.current_path
+
+        add_endorsements
+        within "#user-identities" do
+          page.all(".selected")[1].click
+          click_button "Done"
+        end
+        visit current_path
+        click_button "Endorse"
+
+        within "#user-identities" do
+          expect(page).to have_css(".selected", count: 1)
+          within ".selected" do
+            expect(page).to have_text("Tester", exact: true)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/decidim-core/app/commands/decidim/unendorse_resource.rb b/decidim-core/app/commands/decidim/unendorse_resource.rb
index a052781fe7a9..25f2f2cd6e1b 100644
--- a/decidim-core/app/commands/decidim/unendorse_resource.rb
+++ b/decidim-core/app/commands/decidim/unendorse_resource.rb
@@ -31,7 +31,7 @@ def destroy_resource_endorsement
       query = if @current_group.present?
                 @resource.endorsements.where(decidim_user_group_id: @current_group&.id)
               else
-                @resource.endorsements.where(author: @current_user)
+                @resource.endorsements.where(author: @current_user, decidim_user_group_id: nil)
               end
       query.destroy_all
     end