From 474dd09f904a1b2c64ebbde7a767109e07ff3432 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Aug 2021 20:45:29 +0000 Subject: [PATCH 1/3] Bump view_component from 2.28.0 to 2.37.0 Bumps [view_component](https://github.com/github/view_component) from 2.28.0 to 2.37.0. - [Release notes](https://github.com/github/view_component/releases) - [Changelog](https://github.com/github/view_component/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/github/view_component/compare/v2.28.0...v2.37.0) --- updated-dependencies: - dependency-name: view_component dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 549f7bf44..2cc2631d5 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem "translator-text", "~> 0.1.0" gem "turbolinks", "~> 5.2.1" gem "turnout", "~> 2.5.0" gem "uglifier", "~> 4.2.0" -gem "view_component", "~> 2.28.0", require: "view_component/engine" +gem "view_component", "~> 2.37.0", require: "view_component/engine" gem "whenever", "~> 1.0.0", require: false gem "wicked_pdf", "~> 2.1.0" gem "wkhtmltopdf-binary", "~> 0.12.4" diff --git a/Gemfile.lock b/Gemfile.lock index 1abc42d1c..e0f3b32bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -668,8 +668,9 @@ GEM uniform_notifier (1.14.2) user_agent_parser (2.6.0) uuidtools (2.1.5) - view_component (2.28.0) - activesupport (>= 5.0.0, < 7.0) + view_component (2.37.0) + activesupport (>= 5.0.0, < 8.0) + method_source (~> 1.0) warden (1.2.9) rack (>= 2.0.9) wasabi (3.6.1) @@ -797,7 +798,7 @@ DEPENDENCIES turbolinks (~> 5.2.1) turnout (~> 2.5.0) uglifier (~> 4.2.0) - view_component (~> 2.28.0) + view_component (~> 2.37.0) web-console (~> 3.7.0) webdrivers (~> 4.6.0) whenever (~> 1.0.0) From 5f19d73b400a22398bee2a7bc211821b4f2dd196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 12 Aug 2021 22:50:40 +0200 Subject: [PATCH 2/3] Use with_request_url in component specs This method is available since view component 2.31.0, and greatly simplifies tests depending on the current URL. --- spec/components/budgets/investments/form_component_spec.rb | 5 ++++- spec/components/layout/locale_switcher_component_spec.rb | 6 ++---- .../sdg_management/relations/index_component_spec.rb | 4 +--- spec/components/shared/filter_selector_component_spec.rb | 3 +-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/spec/components/budgets/investments/form_component_spec.rb b/spec/components/budgets/investments/form_component_spec.rb index 8e6bcfb11..2402cba81 100644 --- a/spec/components/budgets/investments/form_component_spec.rb +++ b/spec/components/budgets/investments/form_component_spec.rb @@ -7,7 +7,10 @@ describe Budgets::Investments::FormComponent, type: :component do before do allow(controller).to receive(:current_user).and_return(create(:user)) - allow(request).to receive(:path_parameters).and_return(budget_id: budget.id) + end + + around do |example| + with_request_url(new_budget_investment_path(budget)) { example.run } end describe "accept terms of services field" do diff --git a/spec/components/layout/locale_switcher_component_spec.rb b/spec/components/layout/locale_switcher_component_spec.rb index 5d1462e49..e0dd29474 100644 --- a/spec/components/layout/locale_switcher_component_spec.rb +++ b/spec/components/layout/locale_switcher_component_spec.rb @@ -3,10 +3,8 @@ require "rails_helper" describe Layout::LocaleSwitcherComponent, type: :component do let(:component) { Layout::LocaleSwitcherComponent.new } - before do - allow(request).to receive(:path_parameters).and_return( - Rails.application.routes.recognize_path("/") - ) + around do |example| + with_request_url("/") { example.run } end context "with only one language" do diff --git a/spec/components/sdg_management/relations/index_component_spec.rb b/spec/components/sdg_management/relations/index_component_spec.rb index 6e9eb90ad..ce6308811 100644 --- a/spec/components/sdg_management/relations/index_component_spec.rb +++ b/spec/components/sdg_management/relations/index_component_spec.rb @@ -6,14 +6,12 @@ describe SDGManagement::Relations::IndexComponent, type: :component, controller: .and_return(SDGManagement::RelationsController::FILTERS) allow_any_instance_of(SDGManagement::RelationsController).to receive(:current_filter) .and_return(SDGManagement::RelationsController::FILTERS.first) - allow_any_instance_of(ApplicationHelper).to receive(:current_path_with_query_params) - .and_return("/anything") end it "renders the search form" do component = SDGManagement::Relations::IndexComponent.new(Proposal.none.page(1)) - render_inline component + with_request_url("/anything") { render_inline component } expect(page).to have_css "form.complex" end diff --git a/spec/components/shared/filter_selector_component_spec.rb b/spec/components/shared/filter_selector_component_spec.rb index 6943a1a9e..9af8eeea9 100644 --- a/spec/components/shared/filter_selector_component_spec.rb +++ b/spec/components/shared/filter_selector_component_spec.rb @@ -3,11 +3,10 @@ require "rails_helper" describe Shared::FilterSelectorComponent, type: :component do it "renders a form with a select" do component = Shared::FilterSelectorComponent.new(i18n_namespace: "budgets.investments.index") - allow(component).to receive(:url_for).and_return("/") allow(component).to receive(:valid_filters).and_return(["unfeasible", "winners"]) allow(component).to receive(:current_filter).and_return(nil) - render_inline component + with_request_url("/") { render_inline component } expect(page).to have_select "Filtering projects by" expect(page).to have_selector "form[method='get'].filter-selector select" From a9095d1b6a5c1e1ce8922c2a89eceed67c6b599e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 12 Aug 2021 22:59:47 +0200 Subject: [PATCH 3/3] Simplify component test stubbing controller path This is possible due to the changes in commit 6df7f7d05. --- spec/components/shared/advanced_search_component_spec.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/components/shared/advanced_search_component_spec.rb b/spec/components/shared/advanced_search_component_spec.rb index 1bb232cb0..0348d7389 100644 --- a/spec/components/shared/advanced_search_component_spec.rb +++ b/spec/components/shared/advanced_search_component_spec.rb @@ -17,12 +17,10 @@ describe Shared::AdvancedSearchComponent, type: :component do end end - describe "SDG filter" do + describe "SDG filter", controller: ProposalsController do before do Setting["feature.sdg"] = true Setting["sdg.process.proposals"] = true - - allow(component).to receive(:controller_path).and_return("proposals") end it "does not render when the feature is disabled" do