From f284d5c09e3710ca6f348e1525ecfc8f7db10ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2019 12:07:56 +0200 Subject: [PATCH 1/5] Remove `record_tag_helper` It was only used in one place, and could easily be replaced. Note we usually use HTML classes like `map-location` instead of `map_location`, but I've kept the underscore for compatibility with the previous version. --- Gemfile | 1 - Gemfile.lock | 3 --- app/helpers/map_locations_helper.rb | 8 ++++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index e1981df89..2f2e1d3b9 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,6 @@ gem "paperclip", "~> 5.2.1" gem "paranoia", "~> 2.4.1" gem "pg", "~> 0.21.0" gem "pg_search", "~> 2.0.1" -gem "record_tag_helper", "~> 1.0" gem "redcarpet", "~> 3.4.0" gem "responders", "~> 2.4.0" gem "rinku", "~> 2.0.2", require: "rails_rinku" diff --git a/Gemfile.lock b/Gemfile.lock index 1773e702f..4c8321b6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -385,8 +385,6 @@ GEM rake (12.3.2) recipient_interceptor (0.2.0) mail - record_tag_helper (1.0.0) - actionview (~> 5.x) redcarpet (3.4.0) referer-parser (0.3.0) request_store (1.4.0) @@ -591,7 +589,6 @@ DEPENDENCIES rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! recipient_interceptor (~> 0.2.0) - record_tag_helper (~> 1.0) redcarpet (~> 3.4.0) responders (~> 2.4.0) rinku (~> 2.0.2) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 4d17efb2d..eeab8681a 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -26,10 +26,10 @@ module MapLocationsHelper def render_map(map_location, parent_class, editable, remove_marker_label, investments_coordinates=nil) map_location = MapLocation.new if map_location.nil? - map = content_tag_for :div, - map_location, - class: "map", - data: prepare_map_settings(map_location, editable, parent_class, investments_coordinates) + map = content_tag :div, "", + id: dom_id(map_location), + class: "map_location map", + data: prepare_map_settings(map_location, editable, parent_class, investments_coordinates) map += map_location_remove_marker(map_location, remove_marker_label) if editable map end From 80944178284902d681c26f866b45f6f04cf80212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2019 12:21:46 +0200 Subject: [PATCH 2/5] Remove best_in_place It was only used in one place, so it's best to remove it and use the patterns we use everywhere else. --- Gemfile | 1 - Gemfile.lock | 4 ---- app/assets/javascripts/application.js | 3 --- .../best_in_place_initialize.js.coffee | 3 --- app/views/dashboard/polls/_poll.html.erb | 15 ++++++--------- 5 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 app/assets/javascripts/best_in_place_initialize.js.coffee diff --git a/Gemfile b/Gemfile index 2f2e1d3b9..99e0a723c 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gem "acts_as_votable", "~> 0.11.1" gem "ahoy_matey", "~> 1.6.0" gem "ancestry", "~> 3.0.2" gem "autoprefixer-rails", "~> 8.2.0" -gem "best_in_place", "~> 3.0.1" gem "browser", "~> 2.5.3" gem "cancancan", "~> 2.3.0" gem "ckeditor", "~> 4.2.3" diff --git a/Gemfile.lock b/Gemfile.lock index 4c8321b6c..164c451de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,9 +79,6 @@ GEM babel-source (>= 4.0, < 6) execjs (~> 2.0) bcrypt (3.1.12) - best_in_place (3.0.3) - actionpack (>= 3.2) - railties (>= 3.2) better_html (1.0.13) actionview (>= 4.0) activesupport (>= 4.0) @@ -533,7 +530,6 @@ DEPENDENCIES ahoy_matey (~> 1.6.0) ancestry (~> 3.0.2) autoprefixer-rails (~> 8.2.0) - best_in_place (~> 3.0.1) browser (~> 2.5.3) bullet (~> 5.7.0) byebug (~> 10.0.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 61eb7a869..f8903dd30 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,7 +17,6 @@ //= require jquery-ui/widgets/autocomplete //= require jquery-ui/widgets/sortable //= require jquery-fileupload/basic -//= require best_in_place //= require foundation //= require turbolinks //= require ckeditor/loader @@ -83,7 +82,6 @@ //= require send_newsletter_alert //= require managers //= require globalize -//= require best_in_place_initialize //= require send_admin_notification_alert //= require settings @@ -133,7 +131,6 @@ var initialize_modules = function() { App.SendNewsletterAlert.initialize(); App.Managers.initialize(); App.Globalize.initialize(); - App.BestInPlace.initialize(); App.SendAdminNotificationAlert.initialize(); App.Settings.initialize(); }; diff --git a/app/assets/javascripts/best_in_place_initialize.js.coffee b/app/assets/javascripts/best_in_place_initialize.js.coffee deleted file mode 100644 index 0b833b921..000000000 --- a/app/assets/javascripts/best_in_place_initialize.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -App.BestInPlace = - initialize: -> - $(".best_in_place").best_in_place() diff --git a/app/views/dashboard/polls/_poll.html.erb b/app/views/dashboard/polls/_poll.html.erb index 99da065f6..d41fa54e1 100644 --- a/app/views/dashboard/polls/_poll.html.erb +++ b/app/views/dashboard/polls/_poll.html.erb @@ -24,15 +24,12 @@ <% end %> - <%= best_in_place poll, - :results_enabled, - as: :checkbox, - url: proposal_dashboard_poll_url(proposal, poll), - collection: { - false: raw(''), - true: raw('') - } %> - <%= t("dashboard.polls.poll.show_results") %> + <%= form_for poll, remote: true, data: { type: :json }, + url: proposal_dashboard_poll_path(proposal, poll) do |f| %> + <%= f.check_box :results_enabled, + label: t("dashboard.polls.poll.show_results"), + class: "js-submit-on-change" %> + <% end %>

<%= t("dashboard.polls.poll.show_results_help") %>

From c43b0fea64786c296c7d5b15946b8da33c7efb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2019 15:18:23 +0200 Subject: [PATCH 3/5] Use Rails 5 conventions in Dashboard These models and migrations were added on a branch based on Rails 4. --- app/models/administrator_task.rb | 2 +- app/models/dashboard/action.rb | 2 +- app/models/dashboard/administrator_task.rb | 2 +- app/models/dashboard/executed_action.rb | 2 +- app/models/link.rb | 2 +- db/migrate/20180606085420_add_published_at_to_proposal.rb | 2 +- db/migrate/20180611072816_create_proposal_dashboard_actions.rb | 2 +- ...80612072003_add_action_type_to_proposal_dashboard_actions.rb | 2 +- ...20180614122630_create_proposal_executed_dashboard_actions.rb | 2 +- db/migrate/20180615102215_create_administrator_tasks.rb | 2 +- db/migrate/20180625075520_add_related_to_polls.rb | 2 +- ...50717_add_short_description_to_proposal_dashboard_actions.rb | 2 +- db/migrate/20180702060913_create_links.rb | 2 +- ...7_remove_comments_from_proposal_executed_dashboard_action.rb | 2 +- ...34_rename_proposal_dashboard_actions_to_dashboard_actions.rb | 2 +- ..._executed_dashboard_actions_to_dashboard_executed_actions.rb | 2 +- ...rename_administrator_task_to_dashboard_administrator_task.rb | 2 +- .../20180723112930_rename_dashboard_action_id_to_action_id.rb | 2 +- .../20180726055120_add_timestamps_to_dashboard_actions.rb | 2 +- ...0190108133246_add_published_proposal_to_dashboard_actions.rb | 2 +- db/migrate/20190411090023_remove_open_in_new_tab_from_links.rb | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/models/administrator_task.rb b/app/models/administrator_task.rb index 64c59cfdc..58185fbea 100644 --- a/app/models/administrator_task.rb +++ b/app/models/administrator_task.rb @@ -1,4 +1,4 @@ -class AdministratorTask < ActiveRecord::Base +class AdministratorTask < ApplicationRecord belongs_to :source, polymorphic: true belongs_to :user diff --git a/app/models/dashboard/action.rb b/app/models/dashboard/action.rb index 8794f677d..afe61c075 100644 --- a/app/models/dashboard/action.rb +++ b/app/models/dashboard/action.rb @@ -1,4 +1,4 @@ -class Dashboard::Action < ActiveRecord::Base +class Dashboard::Action < ApplicationRecord include Documentable documentable max_documents_allowed: 3, max_file_size: 3.megabytes, diff --git a/app/models/dashboard/administrator_task.rb b/app/models/dashboard/administrator_task.rb index 9a928ccea..8fd78a28a 100644 --- a/app/models/dashboard/administrator_task.rb +++ b/app/models/dashboard/administrator_task.rb @@ -1,4 +1,4 @@ -class Dashboard::AdministratorTask < ActiveRecord::Base +class Dashboard::AdministratorTask < ApplicationRecord belongs_to :source, polymorphic: true belongs_to :user diff --git a/app/models/dashboard/executed_action.rb b/app/models/dashboard/executed_action.rb index 8a463f693..1acf53cd9 100644 --- a/app/models/dashboard/executed_action.rb +++ b/app/models/dashboard/executed_action.rb @@ -1,4 +1,4 @@ -class Dashboard::ExecutedAction < ActiveRecord::Base +class Dashboard::ExecutedAction < ApplicationRecord belongs_to :proposal belongs_to :action, class_name: "Dashboard::Action" diff --git a/app/models/link.rb b/app/models/link.rb index c8a4a0a5b..c7327cf33 100644 --- a/app/models/link.rb +++ b/app/models/link.rb @@ -1,4 +1,4 @@ -class Link < ActiveRecord::Base +class Link < ApplicationRecord belongs_to :linkable, polymorphic: true validates :label, presence: true diff --git a/db/migrate/20180606085420_add_published_at_to_proposal.rb b/db/migrate/20180606085420_add_published_at_to_proposal.rb index 62999f939..7fa04a2dc 100644 --- a/db/migrate/20180606085420_add_published_at_to_proposal.rb +++ b/db/migrate/20180606085420_add_published_at_to_proposal.rb @@ -1,4 +1,4 @@ -class AddPublishedAtToProposal < ActiveRecord::Migration +class AddPublishedAtToProposal < ActiveRecord::Migration[4.2] def change add_column :proposals, :published_at, :datetime, null: true end diff --git a/db/migrate/20180611072816_create_proposal_dashboard_actions.rb b/db/migrate/20180611072816_create_proposal_dashboard_actions.rb index 1eee05027..de2f46ce8 100644 --- a/db/migrate/20180611072816_create_proposal_dashboard_actions.rb +++ b/db/migrate/20180611072816_create_proposal_dashboard_actions.rb @@ -1,4 +1,4 @@ -class CreateProposalDashboardActions < ActiveRecord::Migration +class CreateProposalDashboardActions < ActiveRecord::Migration[4.2] def change create_table :proposal_dashboard_actions do |t| t.string :title, limit: 80 diff --git a/db/migrate/20180612072003_add_action_type_to_proposal_dashboard_actions.rb b/db/migrate/20180612072003_add_action_type_to_proposal_dashboard_actions.rb index 8d7991fa6..241228cb3 100644 --- a/db/migrate/20180612072003_add_action_type_to_proposal_dashboard_actions.rb +++ b/db/migrate/20180612072003_add_action_type_to_proposal_dashboard_actions.rb @@ -1,4 +1,4 @@ -class AddActionTypeToProposalDashboardActions < ActiveRecord::Migration +class AddActionTypeToProposalDashboardActions < ActiveRecord::Migration[4.2] def change add_column :proposal_dashboard_actions, :action_type, :integer, null: false, default: 0 end diff --git a/db/migrate/20180614122630_create_proposal_executed_dashboard_actions.rb b/db/migrate/20180614122630_create_proposal_executed_dashboard_actions.rb index 1af6170cc..b407532d9 100644 --- a/db/migrate/20180614122630_create_proposal_executed_dashboard_actions.rb +++ b/db/migrate/20180614122630_create_proposal_executed_dashboard_actions.rb @@ -1,4 +1,4 @@ -class CreateProposalExecutedDashboardActions < ActiveRecord::Migration +class CreateProposalExecutedDashboardActions < ActiveRecord::Migration[4.2] def change create_table :proposal_executed_dashboard_actions do |t| t.references :proposal, index: true, foreign_key: true diff --git a/db/migrate/20180615102215_create_administrator_tasks.rb b/db/migrate/20180615102215_create_administrator_tasks.rb index 08bda8cf4..40e8d54a8 100644 --- a/db/migrate/20180615102215_create_administrator_tasks.rb +++ b/db/migrate/20180615102215_create_administrator_tasks.rb @@ -1,4 +1,4 @@ -class CreateAdministratorTasks < ActiveRecord::Migration +class CreateAdministratorTasks < ActiveRecord::Migration[4.2] def change create_table :administrator_tasks do |t| t.references :source, polymorphic: true, index: true diff --git a/db/migrate/20180625075520_add_related_to_polls.rb b/db/migrate/20180625075520_add_related_to_polls.rb index 2c3466367..7bea3cf47 100644 --- a/db/migrate/20180625075520_add_related_to_polls.rb +++ b/db/migrate/20180625075520_add_related_to_polls.rb @@ -1,4 +1,4 @@ -class AddRelatedToPolls < ActiveRecord::Migration +class AddRelatedToPolls < ActiveRecord::Migration[4.2] def change add_reference :polls, :related, index: true, polymorphic: true end diff --git a/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb b/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb index 5921b93c0..2a6143d57 100644 --- a/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb +++ b/db/migrate/20180702050717_add_short_description_to_proposal_dashboard_actions.rb @@ -1,4 +1,4 @@ -class AddShortDescriptionToProposalDashboardActions < ActiveRecord::Migration +class AddShortDescriptionToProposalDashboardActions < ActiveRecord::Migration[4.2] def change add_column :proposal_dashboard_actions, :short_description, :string change_column :proposal_dashboard_actions, :description, :text diff --git a/db/migrate/20180702060913_create_links.rb b/db/migrate/20180702060913_create_links.rb index cbe0ac431..339234c50 100644 --- a/db/migrate/20180702060913_create_links.rb +++ b/db/migrate/20180702060913_create_links.rb @@ -1,4 +1,4 @@ -class CreateLinks < ActiveRecord::Migration +class CreateLinks < ActiveRecord::Migration[4.2] def change create_table :links do |t| t.string :label diff --git a/db/migrate/20180702085737_remove_comments_from_proposal_executed_dashboard_action.rb b/db/migrate/20180702085737_remove_comments_from_proposal_executed_dashboard_action.rb index 1f15c7bb1..859eb00ee 100644 --- a/db/migrate/20180702085737_remove_comments_from_proposal_executed_dashboard_action.rb +++ b/db/migrate/20180702085737_remove_comments_from_proposal_executed_dashboard_action.rb @@ -1,4 +1,4 @@ -class RemoveCommentsFromProposalExecutedDashboardAction < ActiveRecord::Migration +class RemoveCommentsFromProposalExecutedDashboardAction < ActiveRecord::Migration[4.2] def change remove_column :proposal_executed_dashboard_actions, :comments, :text end diff --git a/db/migrate/20180723084734_rename_proposal_dashboard_actions_to_dashboard_actions.rb b/db/migrate/20180723084734_rename_proposal_dashboard_actions_to_dashboard_actions.rb index 5e6238a68..392043d58 100644 --- a/db/migrate/20180723084734_rename_proposal_dashboard_actions_to_dashboard_actions.rb +++ b/db/migrate/20180723084734_rename_proposal_dashboard_actions_to_dashboard_actions.rb @@ -1,4 +1,4 @@ -class RenameProposalDashboardActionsToDashboardActions < ActiveRecord::Migration +class RenameProposalDashboardActionsToDashboardActions < ActiveRecord::Migration[4.2] def change rename_table :proposal_dashboard_actions, :dashboard_actions rename_column :proposal_executed_dashboard_actions, :proposal_dashboard_action_id, :dashboard_action_id diff --git a/db/migrate/20180723084804_rename_proposal_executed_dashboard_actions_to_dashboard_executed_actions.rb b/db/migrate/20180723084804_rename_proposal_executed_dashboard_actions_to_dashboard_executed_actions.rb index b62f4370e..b623b1ccc 100644 --- a/db/migrate/20180723084804_rename_proposal_executed_dashboard_actions_to_dashboard_executed_actions.rb +++ b/db/migrate/20180723084804_rename_proposal_executed_dashboard_actions_to_dashboard_executed_actions.rb @@ -1,4 +1,4 @@ -class RenameProposalExecutedDashboardActionsToDashboardExecutedActions < ActiveRecord::Migration +class RenameProposalExecutedDashboardActionsToDashboardExecutedActions < ActiveRecord::Migration[4.2] def change rename_table :proposal_executed_dashboard_actions, :dashboard_executed_actions end diff --git a/db/migrate/20180723102010_rename_administrator_task_to_dashboard_administrator_task.rb b/db/migrate/20180723102010_rename_administrator_task_to_dashboard_administrator_task.rb index 7f9904b85..6fea362bc 100644 --- a/db/migrate/20180723102010_rename_administrator_task_to_dashboard_administrator_task.rb +++ b/db/migrate/20180723102010_rename_administrator_task_to_dashboard_administrator_task.rb @@ -1,4 +1,4 @@ -class RenameAdministratorTaskToDashboardAdministratorTask < ActiveRecord::Migration +class RenameAdministratorTaskToDashboardAdministratorTask < ActiveRecord::Migration[4.2] def change rename_index :administrator_tasks, 'index_administrator_tasks_on_source_type_and_source_id', 'index_dashboard_administrator_tasks_on_source' rename_table :administrator_tasks, :dashboard_administrator_tasks diff --git a/db/migrate/20180723112930_rename_dashboard_action_id_to_action_id.rb b/db/migrate/20180723112930_rename_dashboard_action_id_to_action_id.rb index 1fb5589d3..958b567ab 100644 --- a/db/migrate/20180723112930_rename_dashboard_action_id_to_action_id.rb +++ b/db/migrate/20180723112930_rename_dashboard_action_id_to_action_id.rb @@ -1,4 +1,4 @@ -class RenameDashboardActionIdToActionId < ActiveRecord::Migration +class RenameDashboardActionIdToActionId < ActiveRecord::Migration[4.2] def change rename_column :dashboard_executed_actions, :dashboard_action_id, :action_id end diff --git a/db/migrate/20180726055120_add_timestamps_to_dashboard_actions.rb b/db/migrate/20180726055120_add_timestamps_to_dashboard_actions.rb index 34e95396b..26ef73368 100644 --- a/db/migrate/20180726055120_add_timestamps_to_dashboard_actions.rb +++ b/db/migrate/20180726055120_add_timestamps_to_dashboard_actions.rb @@ -1,4 +1,4 @@ -class AddTimestampsToDashboardActions < ActiveRecord::Migration +class AddTimestampsToDashboardActions < ActiveRecord::Migration[4.2] def change add_column :dashboard_actions, :created_at, :datetime add_column :dashboard_actions, :updated_at, :datetime diff --git a/db/migrate/20190108133246_add_published_proposal_to_dashboard_actions.rb b/db/migrate/20190108133246_add_published_proposal_to_dashboard_actions.rb index 7b1f14e74..a777aa4d7 100644 --- a/db/migrate/20190108133246_add_published_proposal_to_dashboard_actions.rb +++ b/db/migrate/20190108133246_add_published_proposal_to_dashboard_actions.rb @@ -1,4 +1,4 @@ -class AddPublishedProposalToDashboardActions < ActiveRecord::Migration +class AddPublishedProposalToDashboardActions < ActiveRecord::Migration[4.2] def change add_column :dashboard_actions, :published_proposal, :boolean, default: :false end diff --git a/db/migrate/20190411090023_remove_open_in_new_tab_from_links.rb b/db/migrate/20190411090023_remove_open_in_new_tab_from_links.rb index ae7aa20a6..4cdf83842 100644 --- a/db/migrate/20190411090023_remove_open_in_new_tab_from_links.rb +++ b/db/migrate/20190411090023_remove_open_in_new_tab_from_links.rb @@ -1,4 +1,4 @@ -class RemoveOpenInNewTabFromLinks < ActiveRecord::Migration +class RemoveOpenInNewTabFromLinks < ActiveRecord::Migration[4.2] def change remove_column :links, :open_in_new_tab, :boolean end From 825367145c312420481de4ea868c8ad758268cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2019 15:23:35 +0200 Subject: [PATCH 4/5] Remove redundant test order option The test order is now random by default. --- config/environments/test.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 06430ed91..77cd9ed14 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -38,9 +38,6 @@ Rails.application.configure do } config.action_mailer.asset_host = "http://consul.test" - # Randomize the order test cases are executed. - config.active_support.test_order = :random - # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr From 44d9ba66b7dcc89361a7d46e223f15e21df13183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2019 16:37:14 +0200 Subject: [PATCH 5/5] Use puma as development web server It seems to be the default in Rails 5 (we even have a configuration file for it under `config/puma.rb`) and Capybara seems to need it to run system specs in Rails 5.1: https://github.com/teamcapybara/capybara/#setup --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 99e0a723c..1c04aea44 100644 --- a/Gemfile +++ b/Gemfile @@ -72,6 +72,7 @@ group :development, :test do gem "knapsack_pro", "~> 1.1.0" gem "launchy", "~> 2.4.3" gem "letter_opener_web", "~> 1.3.4" + gem "puma", "~> 3.12.1" gem "spring", "~> 2.0.1" gem "spring-commands-rspec", "~> 1.0.4" end diff --git a/Gemfile.lock b/Gemfile.lock index 164c451de..bef18a154 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -345,6 +345,7 @@ GEM arel (>= 6) powerpack (0.1.2) public_suffix (3.0.3) + puma (3.12.1) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -581,6 +582,7 @@ DEPENDENCIES paranoia (~> 2.4.1) pg (~> 0.21.0) pg_search (~> 2.0.1) + puma (~> 3.12.1) rails (= 5.0.7.2) rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)!