- <%= t("mailers.unfeasible_spending_proposal.hi") %> -
- -- <%= @spending_proposal.feasible_explanation %> -
- -- <%= t("mailers.unfeasible_spending_proposal.new_html", - url: link_to(t("mailers.unfeasible_spending_proposal.new_href"), - new_spending_proposal_url, style: "color: #2895F1; text-decoration: underline;")) %> -
- -- <%= t("mailers.unfeasible_spending_proposal.sorry") %> -
- -- <%= t("mailers.unfeasible_spending_proposal.sincerely") %> -
-<%= t("management.print.spending_proposals_info") %>
-- - <%= l spending_proposal.created_at.to_date %> - - <% if spending_proposal.author.hidden? || spending_proposal.author.erased? %> - • - - <% else %> - • - - <% if spending_proposal.author.display_official_position_badge? %> - • - - <% end %> - <% end %> - - <% if spending_proposal.author.verified_organization? %> - • - - <%= t("shared.collective") %> - - <% end %> - - • - <%= geozone_name(spending_proposal) %> -
-<%= link_to spending_proposal.description, namespaced_spending_proposal_path(spending_proposal) %>
- -- <%= t("spending_proposals.show.code") %> - <%= @spending_proposal.id %> -
- - <%= safe_html_with_links @spending_proposal.description.html_safe %> - - <% if @spending_proposal.external_url.present? %> -#{Faker::Lorem.paragraphs.join("
")}
" - feasible_explanation = "#{Faker::Lorem.paragraphs.join("
")}
" - valuation_finished = [true, false].sample - feasible = [true, false].sample - created_at = rand((Time.current - 1.week)..Time.current) - spending_proposal = SpendingProposal.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - external_url: Faker::Internet.url, - description: description, - created_at: created_at, - geozone: [geozone, nil].sample, - feasible: feasible, - feasible_explanation: feasible_explanation, - valuation_finished: valuation_finished, - tag_list: tags.sample(3).join(","), - price: rand(1000000), - terms_of_service: "1") - end -end diff --git a/db/migrate/20190311215516_destroy_spending_proposals.rb b/db/migrate/20190311215516_destroy_spending_proposals.rb new file mode 100644 index 000000000..bf636e85f --- /dev/null +++ b/db/migrate/20190311215516_destroy_spending_proposals.rb @@ -0,0 +1,5 @@ +class DestroySpendingProposals < ActiveRecord::Migration + def change + drop_table :spending_proposals + end +end diff --git a/db/migrate/20190326211832_destroy_spending_proposal_associations.rb b/db/migrate/20190326211832_destroy_spending_proposal_associations.rb new file mode 100644 index 000000000..efca7826f --- /dev/null +++ b/db/migrate/20190326211832_destroy_spending_proposal_associations.rb @@ -0,0 +1,6 @@ +class DestroySpendingProposalAssociations < ActiveRecord::Migration + def change + remove_column :tags, :spending_proposals_count + remove_column :valuators, :spending_proposals_count + end +end diff --git a/db/seeds.rb b/db/seeds.rb index 4e212606d..20bc74e08 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -74,7 +74,6 @@ Setting["process.legislation"] = true # Feature flags Setting["feature.featured_proposals"] = nil -Setting["feature.spending_proposals"] = nil Setting["feature.twitter_login"] = true Setting["feature.facebook_login"] = true Setting["feature.google_login"] = true @@ -90,9 +89,6 @@ Setting["feature.allow_images"] = true Setting["feature.allow_attached_documents"] = true Setting["feature.help_page"] = true -# Spending proposals feature flags -Setting["feature.spending_proposal_features.voting_allowed"] = nil - # Proposal notifications Setting["proposal_notification_minimum_interval_in_days"] = 3 Setting["direct_message_max_per_day"] = 3 diff --git a/lib/tasks/settings.rake b/lib/tasks/settings.rake index bffddcb51..286c3e85c 100644 --- a/lib/tasks/settings.rake +++ b/lib/tasks/settings.rake @@ -10,7 +10,15 @@ namespace :settings do "banner-img.banner-img-one", "banner-img.banner-img-two", "banner-img.banner-img-three", - "verification_offices_url" + "verification_offices_url", + "feature.spending_proposals", + "feature.spending_proposal_features.phase1", + "feature.spending_proposal_features.phase2", + "feature.spending_proposal_features.phase3", + "feature.spending_proposal_features.voting_allowed", + "feature.spending_proposal_features.final_voting_allowed", + "feature.spending_proposal_features.open_results_page", + "feature.spending_proposal_features.valuation_allowed" ] deprecated_keys.each do |key| diff --git a/lib/tasks/spending_proposals.rake b/lib/tasks/spending_proposals.rake deleted file mode 100644 index 6e5f6fa35..000000000 --- a/lib/tasks/spending_proposals.rake +++ /dev/null @@ -1,22 +0,0 @@ -namespace :spending_proposals do - - desc "Check if there are any spending proposals in DB" - task check: :environment do - if !Rails.env.production? - puts "Please run this rake task in your production environment." - else - if SpendingProposal.any? - puts "WARNING" - puts "You have spending proposals in your database." - puts "This model has been deprecated in favor of budget investments." - puts "In the next CONSUL release spending proposals will be deleted." - puts "If you do not need to keep this data, you don't have to do anything else." - print "If you would like to migrate the data from spending proposals to budget investments " - puts "please check this PR https://github.com/consul/consul/pull/3431." - else - puts "All good!" - end - end - end - -end diff --git a/spec/factories/budgets.rb b/spec/factories/budgets.rb index 66cc1d24f..fc60927cc 100644 --- a/spec/factories/budgets.rb +++ b/spec/factories/budgets.rb @@ -1,13 +1,4 @@ FactoryBot.define do - factory :spending_proposal do - sequence(:title) { |n| "Spending Proposal #{n} title" } - description "Spend money on this" - feasible_explanation "This proposal is not viable because..." - external_url "http://external_documention.org" - terms_of_service "1" - association :author, factory: :user - end - factory :budget do sequence(:name) { |n| "#{Faker::Lorem.word} #{n}" } currency_symbol "€" diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb index deedb8d6a..1d2b5134b 100644 --- a/spec/features/admin/feature_flags_spec.rb +++ b/spec/features/admin/feature_flags_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe "Admin feature flags" do before do - Setting["feature.spending_proposals"] = true + Setting["process.budgets"] = true login_as(create(:administrator).user) end diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb index ca1b9be20..97443a730 100644 --- a/spec/features/admin/stats_spec.rb +++ b/spec/features/admin/stats_spec.rb @@ -103,6 +103,7 @@ describe "Stats" do end describe "Budget investments" do + context "Supporting phase" do before do @budget = create(:budget) @@ -244,6 +245,7 @@ describe "Stats" do end context "graphs" do + scenario "event graphs", :js do campaign = create(:campaign) @@ -260,6 +262,7 @@ describe "Stats" do expect(page).to have_content event_created_at.strftime("%Y-%m-%d") end end + end context "Proposal notifications" do diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb index e290b506d..7a6f38e30 100644 --- a/spec/features/admin_spec.rb +++ b/spec/features/admin_spec.rb @@ -65,8 +65,6 @@ describe "Admin" do end scenario "Admin access links" do - Setting["feature.spending_proposals"] = true - login_as(administrator) visit root_path @@ -74,8 +72,6 @@ describe "Admin" do expect(page).to have_link("Moderation") expect(page).to have_link("Valuation") expect(page).to have_link("Management") - - Setting["feature.spending_proposals"] = nil end scenario "Admin dashboard" do diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index 852156a08..ce98a6bb2 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -218,34 +218,6 @@ describe "Emails" do expect(email).to have_subject("Instrucciones de confirmación") end - scenario "Email on unfeasible spending proposal" do - Setting["feature.spending_proposals"] = true - - spending_proposal = create(:spending_proposal) - administrator = create(:administrator) - valuator = create(:valuator) - spending_proposal.update(administrator: administrator) - spending_proposal.valuators << valuator - - login_as(valuator.user) - visit edit_valuation_spending_proposal_path(spending_proposal) - - choose "spending_proposal_feasible_false" - fill_in "spending_proposal_feasible_explanation", with: "This is not legal as stated in Article 34.9" - check "spending_proposal_valuation_finished" - click_button "Save changes" - - expect(page).to have_content "Dossier updated" - spending_proposal.reload - - email = open_last_email - expect(email).to have_subject("Your investment project '#{spending_proposal.code}' has been marked as unfeasible") - expect(email).to deliver_to(spending_proposal.author.email) - expect(email).to have_body_text(spending_proposal.feasible_explanation) - - Setting["feature.spending_proposals"] = nil - end - context "Direct Message" do scenario "Receiver email" do diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index a1296409e..c998ac62e 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -129,11 +129,10 @@ describe "Notifications" do end scenario "Notification's notifiable model no longer includes Notifiable module" do - create(:notification, notifiable: create(:spending_proposal), user: user) create(:notification, notifiable: create(:poll_question), user: user) click_notifications_icon - expect(page).to have_content("This resource is not available anymore.", count: 2) + expect(page).to have_content("This resource is not available anymore.", count: 1) end context "Admin Notifications" do diff --git a/spec/features/official_positions_spec.rb b/spec/features/official_positions_spec.rb index bc4aaacef..c7f5bee2b 100644 --- a/spec/features/official_positions_spec.rb +++ b/spec/features/official_positions_spec.rb @@ -69,34 +69,5 @@ describe "Official positions" do end end - - context "Spending proposals" do - - before do - Setting["feature.spending_proposals"] = true - @spending_proposal1 = create(:spending_proposal, author: @user1) - @spending_proposal2 = create(:spending_proposal, author: @user2) - end - - after do - Setting["feature.spending_proposals"] = nil - end - - scenario "Index" do - visit spending_proposals_path - - expect_badge_for("spending_proposal", @spending_proposal1) - expect_no_badge_for("spending_proposal", @spending_proposal2) - end - - scenario "Show" do - visit spending_proposal_path(@spending_proposal1) - expect_badge_for("spending_proposal", @spending_proposal1) - - visit spending_proposal_path(@spending_proposal2) - expect_no_badge_for("spending_proposal", @spending_proposal2) - end - - end end end diff --git a/spec/features/votes_spec.rb b/spec/features/votes_spec.rb index 596f4378b..59449b123 100644 --- a/spec/features/votes_spec.rb +++ b/spec/features/votes_spec.rb @@ -368,106 +368,4 @@ describe "Votes" do end end - describe "Spending Proposals" do - before do - Setting["feature.spending_proposals"] = true - Setting["feature.spending_proposal_features.voting_allowed"] = true - login_as(@manuela) - end - - after do - Setting["feature.spending_proposals"] = nil - end - - describe "Index" do - scenario "Index shows user votes on proposals" do - spending_proposal1 = create(:spending_proposal) - spending_proposal2 = create(:spending_proposal) - spending_proposal3 = create(:spending_proposal) - create(:vote, voter: @manuela, votable: spending_proposal1, vote_flag: true) - - visit spending_proposals_path - - within("#investment-projects") do - within("#spending_proposal_#{spending_proposal1.id}_votes") do - expect(page).to have_content "You have already supported this. Share it!" - end - - within("#spending_proposal_#{spending_proposal2.id}_votes") do - expect(page).not_to have_content "You have already supported this. Share it!" - end - - within("#spending_proposal_#{spending_proposal3.id}_votes") do - expect(page).not_to have_content "You have already supported this. Share it!" - end - end - end - - scenario "Create from spending proposal index", :js do - spending_proposal = create(:spending_proposal) - visit spending_proposals_path - - within(".supports") do - find(".in-favor a").click - - expect(page).to have_content "1 support" - expect(page).to have_content "You have already supported this. Share it!" - end - end - end - - describe "Single spending proposal" do - before do - @proposal = create(:spending_proposal) - end - - scenario "Show no votes" do - visit spending_proposal_path(@proposal) - expect(page).to have_content "No supports" - end - - scenario "Trying to vote multiple times", :js do - visit spending_proposal_path(@proposal) - - within(".supports") do - find(".in-favor a").click - expect(page).to have_content "1 support" - - expect(page).not_to have_selector ".in-favor a" - end - end - - scenario "Create from proposal show", :js do - visit spending_proposal_path(@proposal) - - within(".supports") do - find(".in-favor a").click - - expect(page).to have_content "1 support" - expect(page).to have_content "You have already supported this. Share it!" - end - end - end - - scenario "Disable voting on spending proposals", :js do - login_as(@manuela) - Setting["feature.spending_proposal_features.voting_allowed"] = nil - spending_proposal = create(:spending_proposal) - - visit spending_proposals_path - - within("#spending_proposal_#{spending_proposal.id}") do - find("div.supports").hover - expect_message_voting_not_allowed - end - - visit spending_proposal_path(spending_proposal) - - within("#spending_proposal_#{spending_proposal.id}") do - find("div.supports").hover - expect_message_voting_not_allowed - end - end - end - end diff --git a/spec/helpers/geozones_helper_spec.rb b/spec/helpers/geozones_helper_spec.rb index 366be6c39..cf9f3015a 100644 --- a/spec/helpers/geozones_helper_spec.rb +++ b/spec/helpers/geozones_helper_spec.rb @@ -31,19 +31,4 @@ describe GeozonesHelper do end end - describe "#geozone_name_from_id" do - - it "returns geozone name if present" do - g1 = create(:geozone, name: "AAA") - g2 = create(:geozone, name: "BBB") - - expect(geozone_name_from_id(g1.id)).to eq "AAA" - expect(geozone_name_from_id(g2.id)).to eq "BBB" - end - - it "returns default string for no geozone if geozone is blank" do - expect(geozone_name_from_id(nil)).to eq "All city" - end - end - end diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb index 6206085bd..f9fd8fbef 100644 --- a/spec/models/abilities/common_spec.rb +++ b/spec/models/abilities/common_spec.rb @@ -73,10 +73,6 @@ describe Abilities::Common do it { should_not be_able_to(:vote, Proposal) } it { should_not be_able_to(:vote_featured, Proposal) } - it { should be_able_to(:index, SpendingProposal) } - it { should_not be_able_to(:create, SpendingProposal) } - it { should_not be_able_to(:destroy, SpendingProposal) } - it { should_not be_able_to(:comment_as_administrator, debate) } it { should_not be_able_to(:comment_as_moderator, debate) } it { should_not be_able_to(:comment_as_administrator, proposal) } @@ -189,8 +185,6 @@ describe Abilities::Common do end describe "when level 2 verified" do - let(:own_spending_proposal) { create(:spending_proposal, author: user) } - let(:own_direct_message) { create(:direct_message, sender: user) } before{ user.update(residence_verified_at: Time.current, confirmed_phone: "1") } @@ -200,12 +194,6 @@ describe Abilities::Common do it { should be_able_to(:vote_featured, Proposal) } end - describe "Spending Proposal" do - it { should be_able_to(:create, SpendingProposal) } - it { should_not be_able_to(:destroy, create(:spending_proposal)) } - it { should_not be_able_to(:destroy, own_spending_proposal) } - end - describe "Direct Message" do it { should be_able_to(:new, DirectMessage) } it { should be_able_to(:create, DirectMessage) } @@ -270,7 +258,6 @@ describe Abilities::Common do end describe "when level 3 verified" do - let(:own_spending_proposal) { create(:spending_proposal, author: user) } let(:own_direct_message) { create(:direct_message, sender: user) } before{ user.update(verified_at: Time.current) } @@ -278,10 +265,6 @@ describe Abilities::Common do it { should be_able_to(:vote, Proposal) } it { should be_able_to(:vote_featured, Proposal) } - it { should be_able_to(:create, SpendingProposal) } - it { should_not be_able_to(:destroy, create(:spending_proposal)) } - it { should_not be_able_to(:destroy, own_spending_proposal) } - it { should be_able_to(:new, DirectMessage) } it { should be_able_to(:create, DirectMessage) } it { should be_able_to(:show, own_direct_message) } diff --git a/spec/models/abilities/everyone_spec.rb b/spec/models/abilities/everyone_spec.rb index 59ba8cdbe..36fc20281 100644 --- a/spec/models/abilities/everyone_spec.rb +++ b/spec/models/abilities/everyone_spec.rb @@ -24,9 +24,6 @@ describe Abilities::Everyone do it { should be_able_to(:show, Comment) } - it { should be_able_to(:index, SpendingProposal) } - it { should_not be_able_to(:create, SpendingProposal) } - it { should be_able_to(:index, Budget) } it { should_not be_able_to(:manage, Dashboard::Action) } diff --git a/spec/models/geozone_spec.rb b/spec/models/geozone_spec.rb index cd2c4aaa8..3f3dfb9df 100644 --- a/spec/models/geozone_spec.rb +++ b/spec/models/geozone_spec.rb @@ -29,11 +29,6 @@ describe Geozone do expect(geozone).not_to be_safe_to_destroy end - it "is false when already linked to spending proposal" do - create(:spending_proposal, geozone: geozone) - expect(geozone).not_to be_safe_to_destroy - end - it "is false when already linked to debate" do create(:debate, geozone: geozone) expect(geozone).not_to be_safe_to_destroy diff --git a/spec/models/signature_sheet_spec.rb b/spec/models/signature_sheet_spec.rb index 263a94216..6110a2ef9 100644 --- a/spec/models/signature_sheet_spec.rb +++ b/spec/models/signature_sheet_spec.rb @@ -47,13 +47,6 @@ describe SignatureSheet do expect(signature_sheet.name).to eq("Citizen proposal #{proposal.id}") end - it "returns name for spending proposal signature sheets" do - spending_proposal = create(:spending_proposal) - signature_sheet.signable = spending_proposal - - expect(signature_sheet.name).to eq("Investment project #{spending_proposal.id}") - end - it "returns name for budget investment signature sheets" do budget_investment = create(:budget_investment) signature_sheet.signable = budget_investment diff --git a/spec/support/common_actions/budgets.rb b/spec/support/common_actions/budgets.rb index 5f3f3c0a3..5e7658fee 100644 --- a/spec/support/common_actions/budgets.rb +++ b/spec/support/common_actions/budgets.rb @@ -10,4 +10,5 @@ module Budgets expect(page).to have_content "Remove" end end + end