decidim-dev 0.30.2 → 0.31.0.rc1

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

@@ -15,8 +15,6 @@ FactoryBot.define do
     transient do
       skip_injection { false }
       users { nil }
-      # user_groups correspondence to users is by sorting order
-      user_groups { [] }
     end
     title { generate_localized_title(:dummy_resource_title, skip_injection:) }
     component { create(:dummy_component, skip_injection:) }
@@ -27,11 +25,11 @@ FactoryBot.define do
       published_at { Time.current }
     end
 
-    trait :with_endorsements do
+    trait :with_likes do
       after :create do |resource, evaluator|
         5.times.collect do
-          create(:endorsement, resource:, skip_injection: evaluator.skip_injection,
-                               author: build(:user, organization: resource.component.organization, skip_injection: evaluator.skip_injection))
+          create(:like, resource:, skip_injection: evaluator.skip_injection,
+                        author: build(:user, organization: resource.component.organization, skip_injection: evaluator.skip_injection))
         end
       end
     end
@@ -61,13 +59,8 @@ FactoryBot.define do
 
     after :build do |resource, evaluator|
       evaluator.authors_list.each do |coauthor|
-        resource.coauthorships << if coauthor.is_a?(Decidim::UserGroup)
-                                    build(:coauthorship, author: coauthor.users.first, user_group: coauthor, coauthorable: resource,
-                                                         organization: evaluator.component.organization, skip_injection: evaluator.skip_injection)
-                                  else
-                                    build(:coauthorship, author: coauthor, coauthorable: resource, organization: evaluator.component.organization,
-                                                         skip_injection: evaluator.skip_injection)
-                                  end
+        resource.coauthorships << build(:coauthorship, author: coauthor, coauthorable: resource, organization: evaluator.component.organization,
+                                                       skip_injection: evaluator.skip_injection)
       end
     end
   end

data/lib/decidim/dev/test/rspec_support/active_job.rb

@@ -1,7 +1,19 @@
 # frozen_string_literal: true
 
+module DecidimActiveJobExtensions
+  def wait_enqueued_jobs(&block)
+    while enqueued_jobs.size.positive?
+      perform_enqueued_jobs
+      sleep(1)
+    end
+
+    yield block
+  end
+end
+
 RSpec.configure do |config|
   config.include ActiveJob::TestHelper
+  config.include DecidimActiveJobExtensions
 end
 
 ActiveJob::Base.queue_adapter = :test

data/lib/decidim/dev/test/rspec_support/activestorage_matchers.rb

@@ -28,7 +28,7 @@ module ActiveStorageMatchers
         when :redirect, :representation
           ActiveStorage::Blob.find_signed(key_match)
         when :disk
-          decoded = ActiveStorage.verifier.verified(key_match, purpose: :blob_key)
+          decoded = ActiveStorage.verifier.verified(key_match, purpose: :blob_key).with_indifferent_access
           ActiveStorage::Blob.find_by(key: decoded[:key]) if decoded
         end
     end

data/lib/decidim/dev/test/rspec_support/capybara.rb

@@ -30,28 +30,21 @@ module Decidim
   end
 end
 
-1.step do
-  port = rand(5000..6999)
+# Expected values: "", "2", "3", etc. (see parallel_tests documentation)
+parallel_run_idx = ENV.fetch("TEST_ENV_NUMBER", "").to_i
+parallel_run_idx -= 1 if parallel_run_idx.positive?
+Capybara.server_port = 1.step do |num|
+  port = 4999 + num + (100 * parallel_run_idx)
+  next if port == 5432 # Reserved for PostgreSQL
   next if port == 6379 # Reserved for Redis
 
+  # Make sure the port is not reserved by any other application.
   begin
-    redis = Redis.new
-    reserved_ports = (redis.get("decidim_test_capybara_reserved_ports") || "").split(",").map(&:to_i)
-    unless reserved_ports.include?(port)
-      reserved_ports << port
-      if ParallelTests.last_process?
-        redis.del("decidim_test_capybara_reserved_ports")
-      else
-        redis.set("decidim_test_capybara_reserved_ports", reserved_ports.sort.join(","))
-      end
-      break
-    end
-  rescue Redis::CannotConnectError
-    # Redis is not available
-    break
+    Socket.tcp("127.0.0.1", port, connect_timeout: 5).close
+    warn "Port #{port} is already in use, trying another one."
+  rescue Errno::ECONNREFUSED
+    break port
   end
-ensure
-  Capybara.server_port = port
 end
 
 Capybara.register_driver :headless_chrome do |app|

data/lib/decidim/dev/test/rspec_support/comments.rb

@@ -3,7 +3,7 @@
 module CommentsHelpers
   def have_comment_from(user, text, opts = {})
     within "#comments" do
-      have_content(user.name, **opts) && have_content(text, **opts)
+      have_content(user.name, **opts).and have_content(text, **opts)
     end
   end
 

data/lib/decidim/dev/test/rspec_support/component.rb

@@ -18,7 +18,7 @@ RSpec.configure do |config|
           t.datetime :published_at
           t.datetime :deleted_at
           t.integer :coauthorships_count, null: false, default: 0
-          t.integer :endorsements_count, null: false, default: 0
+          t.integer :likes_count, null: false, default: 0
           t.integer :comments_count, null: false, default: 0
           t.integer :follows_count, null: false, default: 0
 
@@ -53,7 +53,7 @@ RSpec.configure do |config|
           t.datetime :published_at
           t.datetime :deleted_at
           t.integer :coauthorships_count, null: false, default: 0
-          t.integer :endorsements_count, null: false, default: 0
+          t.integer :likes_count, null: false, default: 0
           t.integer :comments_count, null: false, default: 0
 
           t.references :decidim_component, index: false

data/lib/decidim/dev/test/rspec_support/editor_context.rb

@@ -1,32 +1,20 @@
 # frozen_string_literal: true
 
-shared_context "with editor content containing hashtags and mentions" do
-  let(:hashtag) { create(:hashtag, organization:) }
-  let(:hashtag2) { create(:hashtag, organization:) }
+shared_context "with editor content containing mentions" do
   let(:user) { create(:user, :confirmed, organization:) }
   let(:user2) { create(:user, :confirmed, organization:) }
-  let(:user_group) { create(:user_group, :confirmed, organization:) }
-  let(:user_group2) { create(:user_group, :confirmed, organization:) }
 
   let(:html) do
     <<~HTML
-      <p>Paragraph with a hashtag #{hashtag.to_global_id} and another hashtag #{hashtag2.to_global_id}</p>
       <p>Paragraph with a user mention #{user.to_global_id} and another user mention #{user2.to_global_id}</p>
-      <p>Paragraph with a user group mention #{user_group.to_global_id} and another user group mention #{user_group2.to_global_id}</p>
     HTML
   end
   let(:editor_html) do
     <<~HTML
-      <p>Paragraph with a hashtag #{html_hashtag(hashtag)} and another hashtag #{html_hashtag(hashtag2)}</p>
       <p>Paragraph with a user mention #{html_mention(user)} and another user mention #{html_mention(user2)}</p>
-      <p>Paragraph with a user group mention #{html_mention(user_group)} and another user group mention #{html_mention(user_group2)}</p>
     HTML
   end
 
-  def html_hashtag(hashtag)
-    %(<span data-type="hashtag" data-label="##{hashtag.name}">##{hashtag.name}</span>)
-  end
-
   def html_mention(mentionable)
     mention = "@#{mentionable.nickname}"
     label = "#{mention} (#{CGI.escapeHTML(mentionable.name)})"

data/lib/decidim/dev/test/rspec_support/gamification.rb

@@ -4,7 +4,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     Decidim::Gamification.register_badge(:test) do |badge|
       badge.levels = [1, 5, 10]
-      badge.valid_for = [:user, :user_group]
+      badge.valid_for = [:user]
       badge.reset = ->(_user) { 100 }
     end
   end

data/lib/decidim/dev/test/rspec_support/helpers.rb

@@ -134,6 +134,22 @@ module Decidim
         JS
       )
     end
+
+    def select_text(selector)
+      page.execute_script(
+        <<~JS
+          var selection = document.getSelection();
+          var range = document.createRange();
+          var element = document.querySelector("#{selector}");
+
+          range.selectNodeContents(element);
+          selection.removeAllRanges();
+          selection.addRange(range);
+          document.dispatchEvent(new MouseEvent("selectstart"));
+          document.dispatchEvent(new MouseEvent("mouseup"));
+        JS
+      )
+    end
   end
 
   module FrontEndFileTestHelpers

data/lib/decidim/dev/test/rspec_support/rake_tasks.rb

@@ -40,22 +40,6 @@ module RakeTaskOutputHelpers
       $stdout = original_stdout
     end
   end
-
-  def check_no_errors_have_been_printed
-    expect($stdout.string).not_to include("ERROR:")
-  end
-
-  def check_some_errors_have_been_printed
-    expect($stdout.string).to include("ERROR:")
-  end
-
-  def check_error_printed(type)
-    expect($stdout.string).to include("ERROR: [#{type}]")
-  end
-
-  def check_message_printed(message)
-    expect($stdout.string).to include(message)
-  end
 end
 
 RSpec.configure do |config|

data/lib/decidim/dev/test/rspec_support/screenshot_helper.rb

@@ -20,9 +20,9 @@ module ActionDispatch
         end
 
         # Add the file URI scheme so terminal emulators can open one click
-        def display_image
+        def display_image(html:, **)
           message = "[Screenshot Image]: file://#{image_path}\n"
-          message << "[Screenshot HTML]: file://#{html_path}\n" if save_html?
+          message << "[Screenshot HTML]: file://#{html_path}\n" if html
 
           case output_type
           when "artifact"

data/lib/decidim/dev/test/rspec_support/{webpacker.rb → shakapacker.rb}

@@ -6,12 +6,12 @@ RSpec.configure do |config|
     raise "package.json file does not exist" unless Rails.root.join("package.json").exist?
     raise "Node modules directory does not exist" unless Rails.root.join("node_modules").exist?
 
-    Dir.chdir(Rails.root) { Webpacker.compile }
+    Dir.chdir(Rails.root) { Shakapacker.compile }
   rescue Errno::ENOENT
     node_modules_contents = `ls #{Rails.root.join("node_modules")}`
 
     message = <<~ERROR
-      There was an error during the Webpacker compilation
+      There was an error during the Shakapacker compilation
       #{"=" * 80}
       Node version: #{`node -v`}
       #{"=" * 80}

data/lib/decidim/dev/test/spec_helper.rb

@@ -24,7 +24,7 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
   config.example_status_persistence_file_path = ".rspec-failures"
   config.filter_run_when_matching :focus
-  config.profile_examples = 10
+  config.profile_examples = 10 unless ENV.fetch("CI", false)
   config.default_formatter = "doc" if config.files_to_run.one?
 
   # If you are not using ActiveRecord, or you'd prefer not to run each of your

data/lib/decidim/dev/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-dev version.
   module Dev
     def self.version
-      "0.30.2"
+      "0.31.0.rc1"
     end
   end
 end

data/rubocop-decidim.yml

@@ -5,16 +5,24 @@
 # For further details, see:
 # https://github.com/rubocop/rubocop/issues/4154#issuecomment-316004878
 
-require:
+plugins:
   - rubocop-rubycw
-  - rubocop-capybara
-  - rubocop-factory_bot
 
 inherit_from:
-  - config/rubocop/performance.yml
-  - config/rubocop/ruby.yml
-  - config/rubocop/rails.yml
-  - config/rubocop/rspec.yml
-  - config/rubocop/faker.yml
-  - config/rubocop/graphql.yml
+  - config/rubocop/capybara/configuration.yml
+  - config/rubocop/capybara/disabled.yml
+  - config/rubocop/performance/configuration.yml
+  - config/rubocop/performance/disabled.yml
+  - config/rubocop/ruby/configuration.yml
+  - config/rubocop/ruby/disabled.yml
+  - config/rubocop/rails/configuration.yml
+  - config/rubocop/rails/disabled.yml
+  - config/rubocop/rspec/configuration.yml
+  - config/rubocop/rspec/disabled.yml
+  - config/rubocop/faker/configuration.yml
+  - config/rubocop/faker/disabled.yml
+  - config/rubocop/graphql/configuration.yml
+  - config/rubocop/graphql/disabled.yml
+  - config/rubocop/factory_bot/configuration.yml
+  - config/rubocop/factory_bot/disabled.yml
   - config/rubocop/disabled.yml