Merge pull request #3620 from consul/fix_migrations

Use Rails 5.1 conventions in migrations and specs

.rubocop.yml

@@ -93,18 +93,9 @@ Performance/UnfreezeString:
 Performance/UriDefaultParser:
   Enabled: true
 
-Rails/ActionFilter:
-  Enabled: true
-
 Rails/ActiveSupportAliases:
   Enabled: true
 
-Rails/ApplicationJob:
-  Enabled: true
-
-Rails/ApplicationRecord:
-  Enabled: true
-
 Rails/Blank:
   Enabled: true
 
@@ -147,9 +138,6 @@ Rails/HasAndBelongsToMany:
 Rails/HasManyOrHasOneDependent:
   Enabled: true
 
-Rails/HttpPositionalArguments:
-  Enabled: true
-
 Rails/InverseOf:
   Enabled: true
 

.rubocop_basic.yml

@@ -14,6 +14,12 @@ AllCops:
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
 
+Capybara/FeatureMethods:
+  Enabled: true
+  EnabledMethods:
+    - scenario
+    - xscenario
+
 Layout/IndentationConsistency:
   EnforcedStyle: rails
 
@@ -38,6 +44,18 @@ Lint/UselessAssignment:
 Metrics/LineLength:
   Max: 110
 
+Rails/ActionFilter:
+  Enabled: true
+
+Rails/ApplicationJob:
+  Enabled: true
+
+Rails/ApplicationRecord:
+  Enabled: true
+
+Rails/HttpPositionalArguments:
+  Enabled: true
+
 RSpec/NotToNot:
   Enabled: true
 

app/models/budget/investment/change_log.rb

@@ -1,4 +1,4 @@
-class Budget::Investment::ChangeLog < ActiveRecord::Base
+class Budget::Investment::ChangeLog < ApplicationRecord
   belongs_to :author, -> { with_hidden }, class_name: "User", foreign_key: "author_id", required: false
 
   validates :old_value, presence: true

app/models/download_setting.rb

@@ -1,4 +1,4 @@
-class DownloadSetting < ActiveRecord::Base
+class DownloadSetting < ApplicationRecord
   validates :name_model, presence: true
   validates :name_field, presence: true
 

db/migrate/20190312100543_create_download_settings.rb

@@ -1,4 +1,4 @@
-class CreateDownloadSettings < ActiveRecord::Migration
+class CreateDownloadSettings < ActiveRecord::Migration[4.2]
   def change
     create_table :download_settings do |t|
       t.string :name_model, null: false

db/migrate/20190321144328_add_config_to_download_settings.rb

@@ -1,4 +1,4 @@
-class AddConfigToDownloadSettings < ActiveRecord::Migration
+class AddConfigToDownloadSettings < ActiveRecord::Migration[4.2]
   def change
     add_column :download_settings, :config, :integer, default: 0, null: false
 

db/migrate/20190408083819_add_actions_to_valuators.rb

@@ -1,4 +1,4 @@
-class AddActionsToValuators < ActiveRecord::Migration
+class AddActionsToValuators < ActiveRecord::Migration[4.2]
   def change
     add_column :valuators, :can_comment, :boolean, default: true
     add_column :valuators, :can_edit_dossier, :boolean, default: true

db/migrate/20190423084112_create_budget_investment_change_logs.rb

@@ -1,4 +1,4 @@
-class CreateBudgetInvestmentChangeLogs < ActiveRecord::Migration
+class CreateBudgetInvestmentChangeLogs < ActiveRecord::Migration[4.2]
   def change
     create_table :budget_investment_change_logs do |t|
       t.integer :investment_id

db/migrate/20190429214633_add_date_of_birth_to_signatures.rb

@@ -1,4 +1,4 @@
-class AddDateOfBirthToSignatures < ActiveRecord::Migration
+class AddDateOfBirthToSignatures < ActiveRecord::Migration[4.2]
   def change
     add_column :signatures, :date_of_birth, :date
   end

db/migrate/20190429214851_rename_document_numbers_to_required_fields_to_verify_in_signature_sheets.rb

@@ -1,4 +1,4 @@
-class RenameDocumentNumbersToRequiredFieldsToVerifyInSignatureSheets < ActiveRecord::Migration
+class RenameDocumentNumbersToRequiredFieldsToVerifyInSignatureSheets < ActiveRecord::Migration[4.2]
   def change
     rename_column :signature_sheets, :document_numbers, :required_fields_to_verify
   end

db/migrate/20190430003908_add_postal_code_to_signatures.rb

@@ -1,4 +1,4 @@
-class AddPostalCodeToSignatures < ActiveRecord::Migration
+class AddPostalCodeToSignatures < ActiveRecord::Migration[4.2]
   def change
     add_column :signatures, :postal_code, :string
   end

db/schema.rb

@@ -1460,10 +1460,10 @@ ActiveRecord::Schema.define(version: 20190607160900) do
   end
 
   create_table "signature_sheets", force: :cascade do |t|
-    t.integer  "signable_id"
     t.string   "signable_type"
-    t.boolean  "processed",        default: false
+    t.integer  "signable_id"
     t.text     "required_fields_to_verify"
+    t.boolean  "processed",                 default: false
     t.integer  "author_id"
     t.datetime "created_at"
     t.datetime "updated_at"

spec/controllers/debates_controller_spec.rb

@@ -24,7 +24,7 @@ describe DebatesController do
       }
       sign_in create(:user)
 
-      post :create, debate: debate_attributes
+      post :create, params: { debate: debate_attributes }
       expect(Ahoy::Event.where(name: :debate_created).count).to eq 1
       expect(Ahoy::Event.last.properties["debate_id"]).to eq Debate.last.id
     end

spec/controllers/remote_translation_controller_spec.rb

@@ -18,7 +18,7 @@ describe RemoteTranslationsController do
     end
 
     it "create correctly remote translation" do
-      post :create, remote_translations: @remote_translations_params
+      post :create, params: { remote_translations: @remote_translations_params }
 
       expect(RemoteTranslation.count).to eq(1)
     end
@@ -26,7 +26,7 @@ describe RemoteTranslationsController do
     it "create remote translation when same remote translation with error_message is enqueued" do
       create(:remote_translation, remote_translatable: debate, locale: :es, error_message: "Has errors")
 
-      post :create, remote_translations: @remote_translations_params
+      post :create, params: { remote_translations: @remote_translations_params }
 
       expect(RemoteTranslation.count).to eq(2)
     end
@@ -34,13 +34,13 @@ describe RemoteTranslationsController do
     it "not create remote translation when same remote translation is enqueued" do
       create(:remote_translation, remote_translatable: debate, locale: :es)
 
-      post :create, remote_translations: @remote_translations_params
+      post :create, params: { remote_translations: @remote_translations_params }
 
       expect(RemoteTranslation.count).to eq(1)
     end
 
     it "redirect_to request referer after create" do
-      post :create, remote_translations: @remote_translations_params
+      post :create, params: { remote_translations: @remote_translations_params }
 
       expect(subject).to redirect_to("any_path")
     end

spec/features/admin/change_log_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-feature "Admin change log" do
+describe "Admin change log" do
   let(:budget) {create(:budget)}
   let(:administrator) do
     create(:administrator, user: create(:user, username: "Ana", email: "ana@admins.org"))
@@ -8,7 +8,7 @@ feature "Admin change log" do
 
   context "Investments Participatory Budgets" do
 
-    background do
+    before do
       @admin = create(:administrator)
       login_as(@admin.user)
     end

spec/features/admin/download_settings_spec.rb

@@ -1,8 +1,8 @@
 require "rails_helper"
 
-feature "Admin download settings" do
+describe "Admin download settings" do
 
-  background do
+  before do
     admin = create(:administrator)
     login_as(admin.user)
   end
@@ -31,7 +31,7 @@ feature "Admin download settings" do
 
   context "Download debates" do
 
-    background do
+    before do
       create(:debate)
     end
 
@@ -84,7 +84,7 @@ feature "Admin download settings" do
 
   context "Download proposals" do
 
-    background do
+    before do
       create(:proposal)
     end
 
@@ -177,7 +177,7 @@ feature "Admin download settings" do
 
   context "Download legislation process" do
 
-    background do
+    before do
       create(:legislation_process, :open)
       create(:legislation_process, :published)
     end
@@ -286,7 +286,7 @@ feature "Admin download settings" do
                                ballot_lines_count: 600) }
     let(:budget) {create :budget}
 
-    background do
+    before do
       Budget::Result.new(budget_finished, heading).calculate_winners
     end
 

spec/features/admin/local_census_records/imports_spec.rb

@@ -1,10 +1,10 @@
 require "rails_helper"
 
-feature "Imports", type: :feature do
+describe "Imports" do
 
   let(:base_files_path) { %w[spec fixtures files local_census_records import] }
 
-  background do
+  before do
     admin = create(:administrator)
     login_as(admin.user)
   end

spec/features/admin/local_census_records_spec.rb

@@ -1,8 +1,8 @@
 require "rails_helper"
 
-feature "Admin local census records" do
+describe "Admin local census records" do
 
-  background do
+  before do
     login_as(create(:administrator).user)
   end
 
@@ -50,7 +50,7 @@ feature "Admin local census records" do
     end
 
     context "Search" do
-      background do
+      before do
         create(:local_census_record, document_number: "X66777888" )
       end
 

spec/features/legislation/resume_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-feature "Legislation" do
+describe "Legislation" do
   context "process resume page" do
 
     scenario "resume tab not show" do

spec/features/polls/votation_type_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-feature "Poll Votation Type" do
+describe "Poll Votation Type" do
 
   context "Unique" do
 
@@ -10,7 +10,7 @@ feature "Poll Votation Type" do
     let!(:answer1) { create(:poll_question_answer, question: unique, title: "answer_1") }
     let!(:answer2) { create(:poll_question_answer, question: unique, title: "answer_2") }
 
-    background do
+    before do
       login_as(user)
     end
 
@@ -64,7 +64,7 @@ feature "Poll Votation Type" do
     let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") }
     let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") }
 
-    background do
+    before do
       login_as(user)
     end
 
@@ -148,7 +148,7 @@ feature "Poll Votation Type" do
     let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") }
     let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") }
 
-    background do
+    before do
       login_as(user)
     end
 
@@ -210,7 +210,7 @@ feature "Poll Votation Type" do
     let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") }
     let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") }
 
-    background do
+    before do
       login_as(user)
     end
 
@@ -306,7 +306,7 @@ feature "Poll Votation Type" do
     let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") }
     let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") }
 
-    background do
+    before do
       login_as(user)
     end
 

spec/features/tracking/budget_investments_spec.rb

@@ -1,13 +1,13 @@
 require "rails_helper"
 
-feature "Valuation budget investments" do
+describe "Valuation budget investments" do
 
   let(:budget) { create(:budget) }
   let(:tracker) do
     create(:tracker, user: create(:user, username: "Rachel", email: "rachel@trackers.org"))
   end
 
-  background do
+  before do
     login_as(tracker.user)
   end
 
@@ -23,7 +23,7 @@ feature "Valuation budget investments" do
     expect(page).to have_link "Tracking", href: tracking_root_path
   end
 
-  feature "Index" do
+  describe "Index" do
     scenario "Index shows budget investments assigned to current tracker" do
       investment1 = create(:budget_investment, budget: budget)
       investment2 = create(:budget_investment, budget: budget)
@@ -108,7 +108,7 @@ feature "Valuation budget investments" do
     end
   end
 
-  feature "Show" do
+  describe "Show" do
     let(:administrator) do
       create(:administrator, user: create(:user, username: "Ana", email: "ana@admins.org"))
     end
@@ -119,7 +119,7 @@ feature "Valuation budget investments" do
       create(:budget_investment, budget: budget, administrator: administrator)
     end
 
-    background do
+    before do
       investment.trackers << [tracker, second_tracker]
     end
 
@@ -168,7 +168,7 @@ feature "Valuation budget investments" do
 
   end
 
-  feature "Milestones" do
+  describe "Milestones" do
     let(:admin) { create(:administrator) }
     let(:investment) do
       heading = create(:budget_heading)
@@ -176,7 +176,7 @@ feature "Valuation budget investments" do
                                  administrator: admin)
     end
 
-    background do
+    before do
       investment.trackers << tracker
     end
 
@@ -250,7 +250,7 @@ feature "Valuation budget investments" do
 
   end
 
-  feature "Progress Bars" do
+  describe "Progress Bars" do
 
     let(:admin) { create(:administrator) }
     let(:investment) do
@@ -259,7 +259,7 @@ feature "Valuation budget investments" do
              administrator: admin)
     end
 
-    background do
+    before do
       investment.trackers << tracker
     end
 

spec/features/tracking/budgets_spec.rb

@@ -1,8 +1,8 @@
 require "rails_helper"
 
-feature "Tracking budgets" do
+describe "Tracking budgets" do
 
-  background do
+  before do
     @tracker = create(:tracker, user: create(:user, username: "Rachel",
                                              email: "rachel@trackers.org"))
     login_as(@tracker.user)