decidim-elections 0.31.0.rc2 → 0.31.1

data/lib/decidim/elections/test/per_question_vote_examples.rb

@@ -10,6 +10,7 @@ shared_examples "a csv token per question votable election" do
     click_on "Access"
     expect(page).to have_current_path(election_vote_path(question1))
     expect(page).to have_content(translated_attribute(question1.body))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     choose translated_attribute(question1.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_content("Your vote has been successfully cast.")
@@ -18,6 +19,7 @@ shared_examples "a csv token per question votable election" do
     # wait for javascript to update the page
     sleep 2
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     click_on "Cast vote"
     expect(page).to have_content("There was a problem casting your vote.")
     check translated_attribute(question2.response_options.first.body)
@@ -29,7 +31,7 @@ shared_examples "a csv token per question votable election" do
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
     expect(election.votes.where(voter_uid:).size).to eq(3)
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(new_election_vote_path)
     fill_in "Email", with: election.voters.first.data["email"]
     fill_in "Token", with: election.voters.first.data["token"]
@@ -52,6 +54,7 @@ shared_examples "a per question votable election" do
     expect(page).to have_content(translated_attribute(question1.body))
     expect(page).to have_content(translated_attribute(question2.body))
     click_on "Vote"
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     choose translated_attribute(question1.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_current_path(waiting_election_votes_path)
@@ -61,6 +64,7 @@ shared_examples "a per question votable election" do
     # wait for javascript to update the page
     sleep 2
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     check translated_attribute(question2.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_current_path(receipt_election_votes_path)
@@ -69,7 +73,7 @@ shared_examples "a per question votable election" do
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
     expect(election.votes.where(voter_uid:).size).to eq(2)
-    click_on "Vote"
+    click_on "Edit vote"
     expect(find("input[value='#{question1.response_options.first.id}']")).to be_checked
     choose translated_attribute(question1.response_options.second.body)
     click_on "Cast vote"
@@ -101,6 +105,7 @@ shared_examples "a per question votable election with published results" do
     # wait for javascript to update the page
     sleep 2
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     check translated_attribute(question2.response_options.first.body)
     click_on "Cast vote"
     expect(page).to have_current_path(receipt_election_votes_path)
@@ -109,7 +114,7 @@ shared_examples "a per question votable election with published results" do
     expect(page).to have_current_path(election_path)
     expect(page).to have_content("You have already voted.")
     expect(election.votes.where(voter_uid:).size).to eq(1)
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(election_vote_path(question2))
     expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
     expect(find("input[value='#{question2.response_options.second.id}']")).not_to be_checked
@@ -137,6 +142,7 @@ shared_examples "a per question votable election with already voted questions" d
     expect(page).to have_content(translated_attribute(question2.body))
     expect(page).to have_content(translated_attribute(question3.body))
     click_on "Vote"
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     choose translated_attribute(question1.response_options.first.body)
     click_on "Cast vote"
     check translated_attribute(question2.response_options.first.body)
@@ -144,10 +150,12 @@ shared_examples "a per question votable election with already voted questions" d
     expect(page).to have_current_path(waiting_election_votes_path)
     click_on "Edit your vote"
     expect(page).to have_current_path(election_vote_path(question1))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
     expect(find("input[value='#{question1.response_options.first.id}']")).to be_checked
     choose translated_attribute(question1.response_options.second.body)
     click_on "Cast vote"
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
     expect(find("input[value='#{question2.response_options.second.id}']")).not_to be_checked
     check translated_attribute(question2.response_options.second.body)
@@ -156,9 +164,112 @@ shared_examples "a per question votable election with already voted questions" d
     question1.update!(published_results_at: Time.current)
     click_on "Edit your vote"
     expect(page).to have_current_path(election_vote_path(question2))
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
     question2.update!(published_results_at: Time.current)
     click_on "Cast vote"
     expect(page).to have_current_path(waiting_election_votes_path)
     expect(page).to have_no_content("Edit your vote")
   end
 end
+
+shared_examples "a per question votable election with automatic redirect when question closes" do
+  it "redirects to the waiting room when admin closes voting while user is on question page" do
+    expect(page).to have_content(translated_attribute(election.title))
+    click_on "Vote"
+    expect(page).to have_current_path(election_vote_path(question1))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
+
+    # Simulate admin closing voting for question1 (publishing results)
+    question1.update!(published_results_at: Time.current)
+
+    # Wait for JavaScript polling to detect the change and redirect
+    expect(page).to have_current_path(waiting_election_votes_path, wait: 3)
+    expect(page).to have_content("Waiting for the next question")
+  end
+
+  it "redirects to next question when admin closes current question and next is available" do
+    # Enable question2 from the start
+    question2.update!(voting_enabled_at: Time.current)
+
+    expect(page).to have_content(translated_attribute(election.title))
+    click_on "Vote"
+    expect(page).to have_current_path(election_vote_path(question1))
+    expect(page).to have_content(strip_tags(translated_attribute(question1.description)))
+
+    # Simulate admin closing voting for question1
+    question1.update!(published_results_at: Time.current)
+
+    # Wait for JavaScript polling to detect the change and redirect
+    expect(page).to have_current_path(election_vote_path(question2), wait: 3)
+    expect(page).to have_content(strip_tags(translated_attribute(question2.description)))
+  end
+end
+
+shared_examples "a per question votable election with edit from receipt" do
+  it "allows editing votes from receipt page" do
+    click_on "Vote"
+    choose translated_attribute(question1.response_options.first.body)
+    click_on "Cast vote"
+    check translated_attribute(question2.response_options.first.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+    expect(page).to have_link("Edit your vote")
+    expect(page).to have_link("Exit the voting booth")
+
+    click_on "Edit your vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+    expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
+
+    click_on "Back"
+    expect(page).to have_current_path(election_vote_path(question1))
+    expect(find("input[value='#{question1.response_options.first.id}']")).to be_checked
+
+    choose translated_attribute(question1.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+
+    check translated_attribute(question2.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+    expect(election.votes.where(voter_uid:).size).to eq(3)
+
+    click_on "Exit the voting booth"
+    expect(page).to have_current_path(election_path)
+    expect(page).to have_content("You have already voted.")
+  end
+end
+
+shared_examples "a per question votable election with edit from receipt when all questions enabled" do
+  it "allows editing any question from receipt page" do
+    click_on "Vote"
+    choose translated_attribute(question1.response_options.first.body)
+    click_on "Cast vote"
+    check translated_attribute(question2.response_options.first.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+
+    click_on "Edit your vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+
+    click_on "Back"
+    expect(page).to have_current_path(election_vote_path(question1))
+
+    choose translated_attribute(question1.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(election_vote_path(question2))
+    expect(find("input[value='#{question2.response_options.first.id}']")).to be_checked
+
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+
+    click_on "Edit your vote"
+    click_on "Back"
+    choose translated_attribute(question1.response_options.first.body)
+    click_on "Cast vote"
+    uncheck translated_attribute(question2.response_options.first.body)
+    check translated_attribute(question2.response_options.second.body)
+    click_on "Cast vote"
+    expect(page).to have_current_path(receipt_election_votes_path)
+    expect(election.votes.where(voter_uid:).size).to eq(2)
+  end
+end

data/lib/decidim/elections/test/vote_examples.rb

@@ -22,10 +22,12 @@ end
 def fill_in_votes
   expect(page).to have_current_path(election_vote_path(election.questions.first))
   expect(page).to have_content(translated_attribute(election.questions.first.body))
+  expect(page).to have_content(strip_tags(translated_attribute(election.questions.first.description)))
   choose translated_attribute(election.questions.first.response_options.first.body)
   click_on "Next"
   expect(page).to have_current_path(election_vote_path(election.questions.second))
   expect(page).to have_content(translated_attribute(election.questions.second.body))
+  expect(page).to have_content(strip_tags(translated_attribute(election.questions.second.description)))
   check translated_attribute(election.questions.second.response_options.first.body)
   check translated_attribute(election.questions.second.response_options.second.body)
   click_on "Next"
@@ -50,7 +52,7 @@ shared_examples "a votable election" do
     click_on "Vote"
 
     fill_in_votes
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(election_vote_path(election.questions.first))
   end
 end
@@ -129,7 +131,7 @@ shared_examples "a csv token votable election" do
     fill_in "Token", with: election.voters.first.data["token"]
     click_on "Access"
     fill_in_votes
-    click_on "Vote"
+    click_on "Edit vote"
     expect(page).to have_current_path(new_election_vote_path)
     fill_in "Email", with: election.voters.first.data["email"]
     fill_in "Token", with: election.voters.first.data["token"]
@@ -167,7 +169,8 @@ end
 
 shared_examples "an editable votable election" do
   it "Allows the user to edit the vote" do
-    click_on "Vote"
+    expect(page).to have_link("Edit vote")
+    click_on "Edit vote"
     expect(page).to have_current_path(election_vote_path(election.questions.first))
     expect(find("input[value='#{election.questions.first.response_options.first.id}']")).to be_checked
     expect(find("input[value='#{election.questions.first.response_options.second.id}']")).not_to be_checked
@@ -189,6 +192,7 @@ end
 
 shared_examples "a csv token editable votable election" do
   it "Allows the user to edit the vote" do
+    expect(page).to have_link("Vote")
     click_on "Vote"
     expect(page).to have_current_path(new_election_vote_path)
     expect(page).to have_content("Verify your identity")

data/lib/decidim/elections/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     def self.version
-      "0.31.0.rc2"
+      "0.31.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-elections
 version: !ruby/object:Gem::Version
-  version: 0.31.0.rc2
+  version: 0.31.1
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-28 00:00:00.000000000 Z
+date: 2026-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.0.rc2
+        version: 0.31.1
 description: A module that aims to provide a set of tools to create elections in Decidim.
 email:
 - ivan@pokecode.net
@@ -155,6 +155,7 @@ files:
 - app/packs/src/decidim/elections/admin/census_form.js
 - app/packs/src/decidim/elections/admin/election_form.js
 - app/packs/src/decidim/elections/live_results_update.js
+- app/packs/src/decidim/elections/question_status_checker.js
 - app/packs/src/decidim/elections/waiting_room.js
 - app/packs/stylesheets/decidim/elections/elections.scss
 - app/packs/stylesheets/decidim/elections/live_results_update.scss