decidim-core 0.25.0.rc2 → 0.25.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f79ffb8df1322e287abbc21fa43fae864cd76b7505c56ef58fcca6832e24d65
-  data.tar.gz: ac09f979e6e0594e05e591b4d8ca6524301d9ee445fdebb0e76be572f04e6a32
+  metadata.gz: 7501cdb061920f3c951740c5df3c6d6b06df3b3ae6e39e08885dd02eb3b7071e
+  data.tar.gz: b9f623717650dc6c2430e98f3950c158f67390683dcd9f1fd9f7a59910916813
 SHA512:
-  metadata.gz: 4afd6c6ecfadff2d1237451bd8e112053f20f55ac42e3035a7557d8d4a667060ffb82d098c6134ffacc0b4736ab40896ab03b596664188510bff859b878b07db
-  data.tar.gz: c3d2ff88bdcef9ebe353035eba87992f236dd45496c68f274bbf945dddf3197e760bb5d249facd71b5003865a729b27f0c7d87f1d345ca6cfea9f6ff98bb8480
+  metadata.gz: 4c737ee3bddfcbe9308288720e1202d1dc608bdcc01ca2ebb9bdc759c8e6e0cc2f9850c25854d4b4bae0acf24a593c18eeaed6e19296e73e43c7912b08b15a0b
+  data.tar.gz: aedb81b1e86057d32427cc362e74b271f5215c2d4aa44a31fd6befd18d4c33977b6175277701a1d60f51cc3e7f0e7b67eb9ad4bd18913c66f984dc49b29d611b

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

@@ -143,9 +143,10 @@ shared_examples "comments" do
         end
       end
 
-      it "shows comment to the user and updates the comments counter" do
+      it "shows comment to the user, updates the comments counter and clears the comment textarea" 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")
+        expect(page).to have_field("add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "")
       end
     end
 
@@ -166,6 +167,55 @@ shared_examples "comments" do
       end
     end
 
+    context "when the user is writing a new comment while someone else comments" do
+      let(:new_comment_body) { "Hey, I just jumped in the conversation!" }
+      let(:new_comment) { build(:comment, commentable: commentable, body: new_comment_body) }
+
+      before do
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment"
+        end
+        new_comment.save!
+      end
+
+      it "does not clear the current user's comment" do
+        expect(page).to have_content(new_comment.body.values.first, wait: 20)
+        expect(page).to have_field(
+          "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}",
+          with: "This is a new comment"
+        )
+      end
+
+      context "when inside a thread reply form" do
+        let(:thread) { comments.first }
+        let(:new_reply_body) { "Hey, I just jumped inside the thread!" }
+        let(:new_reply) { build(:comment, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+        before do
+          within "#comment_#{thread.id}" do
+            click_button "Reply"
+
+            within ".add-comment form" do
+              fill_in "add-comment-#{thread.commentable_type.demodulize}-#{thread.id}", with: "This is a new reply"
+            end
+          end
+          new_reply.save!
+        end
+
+        it "does not clear the current user's comment" do
+          expect(page).to have_content(new_reply.body.values.first, wait: 20)
+          expect(page).to have_field(
+            "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}",
+            with: "This is a new comment"
+          )
+          expect(page).to have_field(
+            "add-comment-#{thread.commentable_type.demodulize}-#{thread.id}",
+            with: "This is a new reply"
+          )
+        end
+      end
+    end
+
     context "when the user has verified organizations" do
       let(:user_group) { create(:user_group, :verified) }
 

data/lib/decidim/core/version.rb

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

data/lib/tasks/decidim_webpacker_tasks.rake

@@ -55,12 +55,8 @@ namespace :decidim do
     end
 
     def install_decidim_npm
-      decidim_npm_packages.each do |type, package|
-        if type == :dev
-          system! "npm i -D #{package}"
-        else
-          system! "npm i #{package}"
-        end
+      decidim_npm_packages.each do |type, packages|
+        system! "npm i --save-#{type} #{packages.join(" ")}"
       end
     end
 
@@ -73,32 +69,55 @@ namespace :decidim do
     end
 
     def decidim_npm_packages
+      gem_path = unreleased_gem_path
+
+      if gem_path
+        package_spec = "./packages/%s"
+
+        # The packages folder needs to be copied to the application folder
+        # because the linked dependencies are not installed when packages
+        # are installed using file references outside the application root
+        # where the `package.json` is located at. For more information, see:
+        # https://github.com/npm/cli/issues/2339
+        FileUtils.rm_rf(rails_app_path.join("packages"))
+        FileUtils.cp_r(gem_path.join("packages"), rails_app_path)
+      else
+        package_spec = "@decidim/%s@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}"
+      end
+
+      local_npm_dependencies.transform_values { |names| names.map { |name| format(package_spec, name) } }
+    end
+
+    def unreleased_gem_path
       if decidim_gemspec.source.is_a?(Bundler::Source::Rubygems)
-        if released_version?
-          return {
-            dev: "@decidim/dev@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}",
-            prod: "@decidim/all@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}"
-          }
-        else
-          gem_path = Pathname(decidim_gemspec.full_gem_path)
-        end
+        return if released_version?
+
+        gem_path = Pathname(decidim_gemspec.full_gem_path)
       else
         gem_path = decidim_gemspec.source.path
         gem_path = Pathname(ENV["BUNDLE_GEMFILE"]).dirname.join(gem_path) if gem_path.relative?
       end
 
-      # The packages folder needs to be copied to the application folder
-      # because the linked dependencies are not installed when packages
-      # are installed using file references outside the application root
-      # where the `package.json` is located at. For more information, see:
-      # https://github.com/npm/cli/issues/2339
-      FileUtils.rm_rf(rails_app_path.join("packages"))
-      FileUtils.cp_r(gem_path.join("packages"), rails_app_path)
+      gem_path
+    end
+
+    def local_npm_dependencies
+      @local_npm_dependencies ||= begin
+        package_json = JSON.parse(File.read(decidim_path.join("package.json")))
+
+        {
+          prod: local_npm_dependencies_list(package_json["dependencies"]),
+          dev: local_npm_dependencies_list(package_json["devDependencies"])
+        }.freeze
+      end
+    end
+
+    def local_npm_dependencies_list(deps)
+      return [] unless deps
 
-      {
-        dev: "./packages/dev",
-        prod: "./packages/all"
-      }
+      deps.values
+          .select { |ref| ref.starts_with?("file:packages/") }
+          .map { |ref| ref.delete_prefix("file:packages/") }
     end
 
     def decidim_path
@@ -151,8 +170,8 @@ namespace :decidim do
       File.write(file, contents)
     end
 
-    def system!(*args)
-      system(*args) || abort("\n== Command #{args} failed ==")
+    def system!(command)
+      system("cd #{rails_app_path} && #{command}") || abort("\n== Command #{command} failed ==")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.25.0.rc2
+  version: 0.25.0.rc3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -790,28 +790,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc2
+        version: 0.25.0.rc3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com