Merge pull request #10142 from CitizenLabDotCo/master

.circleci/config.yml

@@ -178,15 +178,7 @@ jobs:
     environment:
       RAILS_ENV: development
     steps:
-      # GHSA-xc9x-jj77-9p9j
-      # Solutions: upgrade Nokogiri (requires newer Ruby) or
-      # Compile and link Nokogiri against new libxml2
-      # https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-xc9x-jj77-9p9j
-      #
-      # CVE-2023-51774
-      # It has been fixed by upgrading to json-jwt to 1.16.6, but the CVE data has not
-      # been updated yet. So we can safely ignore it.
-      - run: bundle exec bundle-audit check --update --ignore GHSA-xc9x-jj77-9p9j CVE-2023-51774
+      - run: bundle exec bundle-audit check --update
 
   back-license-check:
     resource_class: small

Makefile

@@ -8,7 +8,6 @@
 # 1. replacing $$ with $
 # 2. replacing variables in ${} with some values, so `-u ${CIRCLE_CI_TOKEN}:` becomes `-u XXX:`
 
-# in a makefile, "release_pr" is called a target
 release_pr:
 	@./scripts/create_release_pr.sh
 

back/Gemfile.lock

@@ -1031,17 +1031,17 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
@@ -1067,7 +1067,7 @@ GEM
     rspec-sqlimit (0.0.6)
       activerecord (>= 4.2.0, < 8)
       rspec (~> 3.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_api_documentation (6.1.0)
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)

back/spec/lib/participation_method/ideation_spec.rb

@@ -209,7 +209,6 @@
 
   its(:additional_export_columns) { is_expected.to eq %w[manual_votes] }
   its(:allowed_ideas_orders) { is_expected.to eq %w[trending random popular -new new comments_count] }
-  its(:proposed_budget_in_form?) { is_expected.to be true }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be true }
   its(:supports_built_in_fields?) { is_expected.to be true }
@@ -229,4 +228,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be true }
   its(:supports_private_attributes_in_export?) { is_expected.to be true }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be true' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be true
+    end
+  end
 end

back/spec/lib/participation_method/information_spec.rb

@@ -88,7 +88,6 @@
 
   its(:additional_export_columns) { is_expected.to eq [] }
   its(:allowed_ideas_orders) { is_expected.to be_empty }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be false }
   its(:supports_built_in_fields?) { is_expected.to be false }
@@ -108,4 +107,10 @@
   its(:transitive?) { is_expected.to be false }
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:supports_private_attributes_in_export?) { is_expected.to be false }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/native_survey_spec.rb

@@ -170,7 +170,6 @@
 
   its(:additional_export_columns) { is_expected.to eq [] }
   its(:allowed_ideas_orders) { is_expected.to be_empty }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be true }
   its(:supports_assignment?) { is_expected.to be false }
   its(:supports_built_in_fields?) { is_expected.to be false }
@@ -189,4 +188,10 @@
   its(:supports_toxicity_detection?) { is_expected.to be false }
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be false }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/none_spec.rb

@@ -71,7 +71,6 @@
 
   its(:additional_export_columns) { is_expected.to eq [] }
   its(:allowed_ideas_orders) { is_expected.to be_empty }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be false }
   its(:supports_built_in_fields?) { is_expected.to be false }
@@ -91,4 +90,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be false }
   its(:supports_private_attributes_in_export?) { is_expected.to be false }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/poll_spec.rb

@@ -87,7 +87,6 @@
 
   its(:additional_export_columns) { is_expected.to eq [] }
   its(:allowed_ideas_orders) { is_expected.to be_empty }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be false }
   its(:supports_built_in_fields?) { is_expected.to be false }
@@ -107,4 +106,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be false }
   its(:supports_private_attributes_in_export?) { is_expected.to be false }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/proposals_spec.rb

@@ -216,7 +216,6 @@
 
   its(:additional_export_columns) { is_expected.to eq %w[manual_votes] }
   its(:allowed_ideas_orders) { is_expected.to eq %w[trending random popular -new new comments_count] }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be true }
   its(:supports_built_in_fields?) { is_expected.to be true }
@@ -236,4 +235,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be true }
   its(:transitive?) { is_expected.to be false }
   its(:supports_private_attributes_in_export?) { is_expected.to be true }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/survey_spec.rb

@@ -88,7 +88,6 @@
 
   its(:additional_export_columns) { is_expected.to eq [] }
   its(:allowed_ideas_orders) { is_expected.to be_empty }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be false }
   its(:supports_built_in_fields?) { is_expected.to be false }
@@ -108,4 +107,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be false }
   its(:supports_private_attributes_in_export?) { is_expected.to be false }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/volunteering_spec.rb

@@ -87,7 +87,6 @@
 
   its(:additional_export_columns) { is_expected.to eq [] }
   its(:allowed_ideas_orders) { is_expected.to be_empty }
-  its(:proposed_budget_in_form?) { is_expected.to be false }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be false }
   its(:supports_built_in_fields?) { is_expected.to be false }
@@ -107,4 +106,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be false }
   its(:supports_private_attributes_in_export?) { is_expected.to be false }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be false' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be false
+    end
+  end
 end

back/spec/lib/participation_method/voting_spec.rb

@@ -165,7 +165,6 @@
   end
 
   its(:allowed_ideas_orders) { is_expected.to eq ['random'] }
-  its(:proposed_budget_in_form?) { is_expected.to be true }
   its(:return_disabled_actions?) { is_expected.to be false }
   its(:supports_assignment?) { is_expected.to be true }
   its(:supports_built_in_fields?) { is_expected.to be true }
@@ -185,4 +184,10 @@
   its(:use_reactions_as_votes?) { is_expected.to be false }
   its(:transitive?) { is_expected.to be true }
   its(:supports_private_attributes_in_export?) { is_expected.to be true }
+
+  describe 'proposed_budget_in_form?' do # private method
+    it 'is expected to be true' do
+      expect(participation_method.send(:proposed_budget_in_form?)).to be true
+    end
+  end
 end