Merge pull request #183 from kbrock/class_vars

Minor tweaks to class vars and spec running modifications

Author: Fryguy

lib/active_record/virtual_attributes.rb

@@ -38,8 +38,7 @@ def type
     ActiveRecord::Type.register(:symbol, Type::Symbol)
 
     included do
-      class_attribute :virtual_attributes_to_define, :instance_accessor => false
-      self.virtual_attributes_to_define = {}
+      class_attribute :virtual_attributes_to_define, :instance_accessor => false, :default => {}
     end
 
     module ClassMethods

lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -10,8 +10,7 @@ module VirtualDelegates
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :virtual_delegates_to_define, :instance_accessor => false
-        self.virtual_delegates_to_define = {}
+        class_attribute :virtual_delegates_to_define, :instance_accessor => false, :default => {}
       end
 
       module ClassMethods

lib/active_record/virtual_attributes/virtual_fields.rb

@@ -170,6 +170,8 @@ def call
       class Branch
         prepend(Module.new {
           # from branched.rb 7.0
+          # not going to modify rails code for rubocops
+          # rubocop:disable Lint/AmbiguousOperatorPrecedence
           def grouped_records
             h = {}
             polymorphic_parent = !root? && parent.polymorphic?
@@ -184,6 +186,7 @@ def grouped_records
             end
             h
           end
+          # rubocop:enable Lint/AmbiguousOperatorPrecedence
 
           # branched.rb 7.0
           def preloaders_for_reflection(reflection, reflection_records)

spec/spec_helper.rb

@@ -1,6 +1,8 @@
 if ENV['CI']
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter %r{^/spec/}
+  end
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')