From 7154228fbb072f1bc3d8386725cf55e712ba8fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 17 Oct 2021 16:17:05 +0200 Subject: [PATCH] Move budget map icon tests back to system specs These tests don't work without JavaScript. They were passing because the `within` method always passes in component tests. This reverts most of commit 822140a14. --- .../budgets/budget_component_spec.rb | 90 ------------------ spec/system/budgets/budgets_spec.rb | 92 +++++++++++++++++++ 2 files changed, 92 insertions(+), 90 deletions(-) diff --git a/spec/components/budgets/budget_component_spec.rb b/spec/components/budgets/budget_component_spec.rb index 95fd023c7..02d94bc6a 100644 --- a/spec/components/budgets/budget_component_spec.rb +++ b/spec/components/budgets/budget_component_spec.rb @@ -36,94 +36,4 @@ describe Budgets::BudgetComponent do end end end - - describe "map" do - before do - Setting["feature.map"] = true - end - - it "displays investment's map location markers" do - investment1 = create(:budget_investment, heading: heading) - investment2 = create(:budget_investment, heading: heading) - investment3 = create(:budget_investment, heading: heading) - - create(:map_location, longitude: 40.1234, latitude: -3.634, investment: investment1) - create(:map_location, longitude: 40.1235, latitude: -3.635, investment: investment2) - create(:map_location, longitude: 40.1236, latitude: -3.636, investment: investment3) - - render_inline Budgets::BudgetComponent.new(budget) - - within ".map_location" do - expect(page).to have_css(".map-icon", count: 3) - end - end - - it "displays all investment's map location if there are no selected" do - budget.update!(phase: :publishing_prices) - - investment1 = create(:budget_investment, heading: heading) - investment2 = create(:budget_investment, heading: heading) - investment3 = create(:budget_investment, heading: heading) - investment4 = create(:budget_investment, heading: heading) - - investment1.create_map_location(longitude: 40.1234, latitude: 3.1234, zoom: 10) - investment2.create_map_location(longitude: 40.1235, latitude: 3.1235, zoom: 10) - investment3.create_map_location(longitude: 40.1236, latitude: 3.1236, zoom: 10) - investment4.create_map_location(longitude: 40.1240, latitude: 3.1240, zoom: 10) - - render_inline Budgets::BudgetComponent.new(budget) - - within ".map_location" do - expect(page).to have_css(".map-icon", count: 4) - end - end - - it "displays only selected investment's map location from publishing prices phase" do - budget.update!(phase: :publishing_prices) - - investment1 = create(:budget_investment, :selected, heading: heading) - investment2 = create(:budget_investment, :selected, heading: heading) - investment3 = create(:budget_investment, heading: heading) - investment4 = create(:budget_investment, heading: heading) - - investment1.create_map_location(longitude: 40.1234, latitude: 3.1234, zoom: 10) - investment2.create_map_location(longitude: 40.1235, latitude: 3.1235, zoom: 10) - investment3.create_map_location(longitude: 40.1236, latitude: 3.1236, zoom: 10) - investment4.create_map_location(longitude: 40.1240, latitude: 3.1240, zoom: 10) - - render_inline Budgets::BudgetComponent.new(budget) - - within ".map_location" do - expect(page).to have_css(".map-icon", count: 2) - end - end - - scenario "skips invalid map markers" do - map_locations = [] - - investment = create(:budget_investment, heading: heading) - - map_locations << { longitude: 40.123456789, latitude: 3.12345678 } - map_locations << { longitude: 40.123456789, latitude: "********" } - map_locations << { longitude: "**********", latitude: 3.12345678 } - - coordinates = map_locations.map do |map_location| - { - lat: map_location[:latitude], - long: map_location[:longitude], - investment_title: investment.title, - investment_id: investment.id, - budget_id: budget.id - } - end - - allow_any_instance_of(Budgets::BudgetComponent).to receive(:coordinates).and_return(coordinates) - - render_inline Budgets::BudgetComponent.new(budget) - - within ".map_location" do - expect(page).to have_css(".map-icon", count: 1) - end - end - end end diff --git a/spec/system/budgets/budgets_spec.rb b/spec/system/budgets/budgets_spec.rb index 6848923a9..01ae866a8 100644 --- a/spec/system/budgets/budgets_spec.rb +++ b/spec/system/budgets/budgets_spec.rb @@ -232,6 +232,98 @@ describe "Budgets" do expect(page).to have_css(".tabs-panel.is-active", count: 1) end + context "Index map" do + let(:heading) { create(:budget_heading, budget: budget) } + + before do + Setting["feature.map"] = true + end + + scenario "Display investment's map location markers" do + investment1 = create(:budget_investment, heading: heading) + investment2 = create(:budget_investment, heading: heading) + investment3 = create(:budget_investment, heading: heading) + + create(:map_location, longitude: 40.1234, latitude: -3.634, investment: investment1) + create(:map_location, longitude: 40.1235, latitude: -3.635, investment: investment2) + create(:map_location, longitude: 40.1236, latitude: -3.636, investment: investment3) + + visit budgets_path + + within ".map_location" do + expect(page).to have_css(".map-icon", count: 3, visible: :all) + end + end + + scenario "Display all investment's map location if there are no selected" do + budget.update!(phase: :publishing_prices) + + investment1 = create(:budget_investment, heading: heading) + investment2 = create(:budget_investment, heading: heading) + investment3 = create(:budget_investment, heading: heading) + investment4 = create(:budget_investment, heading: heading) + + investment1.create_map_location(longitude: 40.1234, latitude: 3.1234, zoom: 10) + investment2.create_map_location(longitude: 40.1235, latitude: 3.1235, zoom: 10) + investment3.create_map_location(longitude: 40.1236, latitude: 3.1236, zoom: 10) + investment4.create_map_location(longitude: 40.1240, latitude: 3.1240, zoom: 10) + + visit budgets_path + + within ".map_location" do + expect(page).to have_css(".map-icon", count: 4, visible: :all) + end + end + + scenario "Display only selected investment's map location from publishing prices phase" do + budget.update!(phase: :publishing_prices) + + investment1 = create(:budget_investment, :selected, heading: heading) + investment2 = create(:budget_investment, :selected, heading: heading) + investment3 = create(:budget_investment, heading: heading) + investment4 = create(:budget_investment, heading: heading) + + investment1.create_map_location(longitude: 40.1234, latitude: 3.1234, zoom: 10) + investment2.create_map_location(longitude: 40.1235, latitude: 3.1235, zoom: 10) + investment3.create_map_location(longitude: 40.1236, latitude: 3.1236, zoom: 10) + investment4.create_map_location(longitude: 40.1240, latitude: 3.1240, zoom: 10) + + visit budgets_path + + within ".map_location" do + expect(page).to have_css(".map-icon", count: 2, visible: :all) + end + end + + scenario "Skip invalid map markers" do + map_locations = [] + + investment = create(:budget_investment, heading: heading) + + map_locations << { longitude: 40.123456789, latitude: 3.12345678 } + map_locations << { longitude: 40.123456789, latitude: "********" } + map_locations << { longitude: "**********", latitude: 3.12345678 } + + coordinates = map_locations.map do |map_location| + { + lat: map_location[:latitude], + long: map_location[:longitude], + investment_title: investment.title, + investment_id: investment.id, + budget_id: budget.id + } + end + + allow_any_instance_of(Budgets::BudgetComponent).to receive(:coordinates).and_return(coordinates) + + visit budgets_path + + within ".map_location" do + expect(page).to have_css(".map-icon", count: 1, visible: :all) + end + end + end + context "Show" do let!(:budget) { create(:budget, :selecting) } let!(:group) { create(:budget_group, budget: budget) }