Merge branch 'master' of github.com:fatfreecrm/fat_free_crm into ffcrm

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 : ''

spec/factories.rb

@@ -42,7 +42,3 @@
   Date.today - x.days
 end
 
-
-
-
-

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}