From 7afa9080b8b2c3f4812117605836673e4039fc36 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Tue, 10 Jan 2017 16:21:30 +1030 Subject: [PATCH] Rubocop: signal vs raise --- .rubocop_todo.yml | 12 ------------ app/helpers/application_helper.rb | 2 +- app/models/fields/field.rb | 2 +- db/migrate/20100928030620_remove_uuid.rb | 2 +- spec/factories/shared_factories.rb | 10 +++++----- spec/factories/user_factories.rb | 6 +++--- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index f2ba99b32b..a18a90fb0f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -508,18 +508,6 @@ Style/Semicolon: - 'spec/models/fields/custom_field_spec.rb' - 'spec/support/macros.rb' -# Offense count: 11 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: only_raise, only_fail, semantic -Style/SignalException: - Exclude: - - 'app/helpers/application_helper.rb' - - 'app/models/fields/field.rb' - - 'db/migrate/20100928030620_remove_uuid.rb' - - 'spec/factories/shared_factories.rb' - - 'spec/factories/user_factories.rb' - # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist. diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3e589022fe..b006c450e4 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -10,7 +10,7 @@ def tabs(tabs = nil) @current_tab ||= tabs.first[:text] # Select first tab by default. tabs.each { |tab| tab[:active] = (@current_tab == tab[:text] || @current_tab == tab[:url][:controller]) } else - fail FatFreeCRM::MissingSettings, "Tab settings are missing, please run rake ffcrm:setup command." + raise FatFreeCRM::MissingSettings, "Tab settings are missing, please run rake ffcrm:setup command." end end diff --git a/app/models/fields/field.rb b/app/models/fields/field.rb index ce1c959bed..dedca6758e 100644 --- a/app/models/fields/field.rb +++ b/app/models/fields/field.rb @@ -63,7 +63,7 @@ class Field < ActiveRecord::Base validates_inclusion_of :as, in: proc { field_types.keys }, message: "^Invalid field type.", allow_blank: true def column_type(field_type = as) - (opts = Field.field_types[field_type]) ? opts[:type] : fail("Unknown field_type: #{field_type}") + (opts = Field.field_types[field_type]) ? opts[:type] : raise("Unknown field_type: #{field_type}") end def input_options diff --git a/db/migrate/20100928030620_remove_uuid.rb b/db/migrate/20100928030620_remove_uuid.rb index f6900da34d..57ec6f5621 100644 --- a/db/migrate/20100928030620_remove_uuid.rb +++ b/db/migrate/20100928030620_remove_uuid.rb @@ -9,7 +9,7 @@ def self.up end def self.down - fail ActiveRecord::IrreversibleMigration, "Can't recover deleted UUIDs" + raise ActiveRecord::IrreversibleMigration, "Can't recover deleted UUIDs" end private diff --git a/spec/factories/shared_factories.rb b/spec/factories/shared_factories.rb index da332167bb..fd52add2bd 100755 --- a/spec/factories/shared_factories.rb +++ b/spec/factories/shared_factories.rb @@ -6,14 +6,14 @@ FactoryGirl.define do factory :version do whodunnit "" - item { fail "Please specify :item for the version" } + item { raise "Please specify :item for the version" } event "create" created_at { FactoryGirl.generate(:time) } end factory :comment do user - commentable { fail "Please specify :commentable for the comment" } + commentable { raise "Please specify :commentable for the comment" } title { FactoryGirl.generate(:title) } private false comment { FFaker::Lorem.paragraph } @@ -25,7 +25,7 @@ factory :email do imap_message_id { "%08x" % rand(0xFFFFFFFF) } user - mediator { fail "Please specify :mediator for the email" } + mediator { raise "Please specify :mediator for the email" } sent_from { FFaker::Internet.email } sent_to { FFaker::Internet.email } cc { FFaker::Internet.email } @@ -42,7 +42,7 @@ end factory :address do - addressable { fail "Please specify :addressable for the address" } + addressable { raise "Please specify :addressable for the address" } street1 { FFaker::Address.street_address } street2 { FFaker::Address.street_address } city { FFaker::Address.city } @@ -58,7 +58,7 @@ factory :avatar do user - entity { fail "Please specify :entity for the avatar" } + entity { raise "Please specify :entity for the avatar" } image { File.new(Rails.root.join('spec', 'fixtures', 'rails.png')) } updated_at { FactoryGirl.generate(:time) } created_at { FactoryGirl.generate(:time) } diff --git a/spec/factories/user_factories.rb b/spec/factories/user_factories.rb index 0bf82f0d5d..7cda3b7c15 100755 --- a/spec/factories/user_factories.rb +++ b/spec/factories/user_factories.rb @@ -43,15 +43,15 @@ factory :permission do user - asset { fail "Please specify :asset for the permission" } + asset { raise "Please specify :asset for the permission" } updated_at { FactoryGirl.generate(:time) } created_at { FactoryGirl.generate(:time) } end factory :preference do user - name { fail "Please specify :name for the preference" } - value { fail "Please specify :value for the preference" } + name { raise "Please specify :name for the preference" } + value { raise "Please specify :value for the preference" } updated_at { FactoryGirl.generate(:time) } created_at { FactoryGirl.generate(:time) } end