diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index f6125c214d7..8522352e371 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -103,7 +103,7 @@ def set_random_seed def investment_params params.require(:budget_investment) - .permit(:title, :description, :external_url, :heading_id, :tag_list, + .permit(:title, :description, :heading_id, :tag_list, :organization_name, :location, :terms_of_service, :skip_map, image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index fffafcb0d8d..cc24ad651e3 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -17,10 +17,6 @@ <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale } %> -
<%= text_with_links @investment.external_url %>
-<% end %> -<%= t("valuation.budget_investments.show.by") %>: @@ -142,4 +138,4 @@
#{Faker::Lorem.paragraphs.join('
')}
", created_at: rand((Time.current - 1.week)..Time.current), feasibility: %w{undecided unfeasible feasible feasible feasible feasible}.sample, @@ -468,7 +467,6 @@ def unique_document_number group: heading.group, budget: heading.group.budget, title: Faker::Lorem.sentence(3).truncate(60), - external_url: Faker::Internet.url, description: "#{Faker::Lorem.paragraphs.join('
')}
", created_at: rand((Time.current - 1.week)..Time.current), feasibility: "feasible", diff --git a/spec/factories.rb b/spec/factories.rb index fd67fc4fc1e..bcc31b0dc9d 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -279,7 +279,6 @@ description 'Spend money on this' price 10 unfeasibility_explanation '' - external_url 'http://external_documention.org' skip_map '1' terms_of_service '1' incompatible false diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 62fbeb7251e..d4c9a0176e4 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -311,7 +311,6 @@ def investments_order select 'Health: More hospitals', from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a skyscraper' fill_in 'budget_investment_description', with: 'I want to live in a high tower over the clouds' - fill_in 'budget_investment_external_url', with: 'http://http://skyscraperpage.com/' fill_in 'budget_investment_location', with: 'City center' fill_in 'budget_investment_organization_name', with: 'T.I.A.' fill_in 'budget_investment_tag_list', with: 'Towers' @@ -322,7 +321,6 @@ def investments_order expect(page).to have_content 'Investment created successfully' expect(page).to have_content 'Build a skyscraper' expect(page).to have_content 'I want to live in a high tower over the clouds' - expect(page).to have_content 'http://http://skyscraperpage.com/' expect(page).to have_content 'City center' expect(page).to have_content 'T.I.A.' expect(page).to have_content 'Towers' diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index ca418de10e7..f4bd7e08e46 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -369,7 +369,6 @@ select "#{group.name}: #{heading.name}", from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a hospital' fill_in 'budget_investment_description', with: 'We have lots of people that require medical attention' - fill_in 'budget_investment_external_url', with: 'http://http://hospitalsforallthepeople.com/' check 'budget_investment_terms_of_service' click_button 'Create Investment' diff --git a/spec/features/management/budget_investments_spec.rb b/spec/features/management/budget_investments_spec.rb index 27aa25f8d9b..5a9fa28134d 100644 --- a/spec/features/management/budget_investments_spec.rb +++ b/spec/features/management/budget_investments_spec.rb @@ -32,7 +32,6 @@ select "Whole city: Health", from: 'budget_investment_heading_id' fill_in 'budget_investment_title', with: 'Build a park in my neighborhood' fill_in 'budget_investment_description', with: 'There is no parks here...' - fill_in 'budget_investment_external_url', with: 'http://moarparks.com' fill_in 'budget_investment_location', with: 'City center' fill_in 'budget_investment_organization_name', with: 'T.I.A.' fill_in 'budget_investment_tag_list', with: 'green' @@ -44,7 +43,6 @@ expect(page).to have_content 'Health' expect(page).to have_content 'Build a park in my neighborhood' expect(page).to have_content 'There is no parks here...' - expect(page).to have_content 'http://moarparks.com' expect(page).to have_content 'City center' expect(page).to have_content 'T.I.A.' expect(page).to have_content 'green'