Merge pull request #5199 from consuldemocracy/dependabot/bundler/view_component-3.5.0

Bump view_component from 2.78.0 to 3.5.0

Gemfile

@@ -61,7 +61,7 @@ gem "turbolinks", "~> 5.2.1"
 gem "turnout", "~> 2.5.0"
 gem "uglifier", "~> 4.2.0"
 gem "uuidtools", "~> 2.2.0"
-gem "view_component", "~> 2.78.0"
+gem "view_component", "~> 3.5.0"
 gem "whenever", "~> 1.0.0", require: false
 gem "wicked_pdf", "~> 2.7.0"
 gem "wkhtmltopdf-binary", "~> 0.12.6"

Gemfile.lock

@@ -636,8 +636,8 @@ GEM
     uniform_notifier (1.16.0)
     uuidtools (2.2.0)
     version_gem (1.1.3)
-    view_component (2.78.0)
-      activesupport (>= 5.0.0, < 8.0)
+    view_component (3.5.0)
+      activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     warden (1.2.9)
@@ -765,7 +765,7 @@ DEPENDENCIES
   turnout (~> 2.5.0)
   uglifier (~> 4.2.0)
   uuidtools (~> 2.2.0)
-  view_component (~> 2.78.0)
+  view_component (~> 3.5.0)
   web-console (~> 4.2.0)
   whenever (~> 1.0.0)
   wicked_pdf (~> 2.7.0)

spec/components/admin/budgets/index_component_spec.rb

@@ -2,8 +2,8 @@ require "rails_helper"
 
 describe Admin::Budgets::IndexComponent, controller: Admin::BudgetsController do
   before do
-    allow_any_instance_of(Admin::BudgetsController).to receive(:valid_filters).and_return(["all"])
-    allow_any_instance_of(Admin::BudgetsController).to receive(:current_filter).and_return("all")
+    allow(vc_test_controller).to receive(:valid_filters).and_return(["all"])
+    allow(vc_test_controller).to receive(:current_filter).and_return("all")
   end
 
   describe "#phase_progress_text" do

spec/components/admin/search_component_spec.rb

@@ -4,7 +4,7 @@ describe Admin::SearchComponent do
   describe "#hidden_current_filter_tag" do
     context "controller responds to current_filter", controller: ApplicationController do
       it "is present when the controller has a current filter" do
-        allow(controller).to receive(:current_filter).and_return("all")
+        allow(vc_test_controller).to receive(:current_filter).and_return("all")
 
         render_inline Admin::SearchComponent.new(label: "Search")
 

spec/components/budgets/ballot/ballot_component_spec.rb

@@ -2,7 +2,7 @@ require "rails_helper"
 
 describe Budgets::Ballot::BallotComponent do
   include Rails.application.routes.url_helpers
-  before { request.session[:ballot_referer] = "/" }
+  before { vc_test_request.session[:ballot_referer] = "/" }
 
   describe "link to group" do
     let(:budget) { create(:budget, :balloting) }

spec/components/budgets/investments/ballot_component_spec.rb

@@ -8,7 +8,7 @@ describe Budgets::Investments::BallotComponent do
       Budgets::Investments::BallotComponent.new(
         investment: investment,
         investment_ids: [],
-        ballot: Budget::Ballot.where(budget: budget, user: controller.current_user).first_or_create!
+        ballot: Budget::Ballot.where(budget: budget, user: vc_test_controller.current_user).first_or_create!
       )
     end
 
@@ -51,7 +51,7 @@ describe Budgets::Investments::BallotComponent do
       Budgets::Investments::BallotComponent.new(
         investment: investment,
         investment_ids: [],
-        ballot: Budget::Ballot.where(budget: budget, user: controller.current_user).first_or_create!
+        ballot: Budget::Ballot.where(budget: budget, user: vc_test_controller.current_user).first_or_create!
       )
     end
 

spec/components/budgets/investments/filters_component_spec.rb

@@ -2,7 +2,7 @@ require "rails_helper"
 
 describe Budgets::Investments::FiltersComponent do
   let(:budget) { create(:budget) }
-  before { allow(controller).to receive(:valid_filters) { budget.investments_filters } }
+  before { allow(vc_test_controller).to receive(:valid_filters) { budget.investments_filters } }
 
   around do |example|
     with_request_url(Rails.application.routes.url_helpers.budget_investments_path(budget)) do

spec/components/sdg_management/relations/index_component_spec.rb

@@ -2,9 +2,9 @@ require "rails_helper"
 
 describe SDGManagement::Relations::IndexComponent, controller: SDGManagement::RelationsController do
   before do
-    allow_any_instance_of(SDGManagement::RelationsController).to receive(:valid_filters)
+    allow(vc_test_controller).to receive(:valid_filters)
       .and_return(SDGManagement::RelationsController::FILTERS)
-    allow_any_instance_of(SDGManagement::RelationsController).to receive(:current_filter)
+    allow(vc_test_controller).to receive(:current_filter)
       .and_return(SDGManagement::RelationsController::FILTERS.first)
   end
 

spec/rails_helper.rb

@@ -24,7 +24,7 @@ require "view_component/test_helpers"
 module ViewComponent
   module TestHelpers
     def sign_in(user)
-      allow(controller).to receive(:current_user).and_return(user)
+      allow(vc_test_controller).to receive(:current_user).and_return(user)
     end
 
     def within(...)