diff --git a/lib/fat_free_crm/exportable.rb b/lib/fat_free_crm/exportable.rb index 556d30a6f7..cca1a2649c 100644 --- a/lib/fat_free_crm/exportable.rb +++ b/lib/fat_free_crm/exportable.rb @@ -38,14 +38,14 @@ def user_id_full_name end def self.included(base) - if base.instance_methods.include?(:assignee) + if base.instance_methods.include?(:assignee) or base.instance_methods.include?('assignee') define_method :assigned_to_full_name do user = self.assignee user ? user.full_name : '' end end - if base.instance_methods.include?(:completor) + if base.instance_methods.include?(:completor) or base.instance_methods.include?('completor') define_method :completed_by_full_name do user = self.completor user ? user.full_name : '' diff --git a/spec/controllers/admin/field_groups_controller_spec.rb b/spec/controllers/admin/field_groups_controller_spec.rb deleted file mode 100644 index d075d5339d..0000000000 --- a/spec/controllers/admin/field_groups_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe Admin::FieldGroupsController do - -end diff --git a/spec/factories.rb b/spec/factories.rb index b07b540049..694aa816f0 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -42,7 +42,3 @@ Date.today - x.days end - - - - diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4f4e0d6b58..329ea57cdf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,6 @@ if ENV["COVERAGE"] require 'simplecov' - SimpleCov.start 'rails' + SimpleCov.start 'rails' end # This file is copied to spec/ when you run 'rails generate rspec:install' @@ -14,7 +14,6 @@ # Load factories from plugins (to allow extra validations / etc.) Dir.glob(Rails.root.join("vendor/plugins/**/spec/factories.rb")).each{ |f| require File.expand_path(f) } - # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}