Fix duplicate decleration warnings

collectiveidea · Jan 9, 2018 · 366e0e2 · 366e0e2
1 parent 03d6a9e
commit 366e0e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,8 @@ Fixed
   [#390](https://github.com/collectiveidea/audited/pull/390)
 - Passing an invalid version to `revision` returns `nil` instead of last version
   [#384](https://github.com/collectiveidea/audited/pull/384)
+- Fix duplicate deceleration warnings
+  [#398](https://github.com/collectiveidea/audited/pull/398)
 
 
 ## 4.5.0 (2017-05-22)

diff --git a/lib/audited.rb b/lib/audited.rb
@@ -2,10 +2,11 @@
 
 module Audited
   class << self
-    attr_accessor :ignored_attributes, :current_user_method, :audit_class
+    attr_accessor :ignored_attributes, :current_user_method
+    attr_writer :audit_class
 
     def audit_class
-      @audit_class || Audit
+      @audit_class ||= Audit
     end
 
     def store

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -9,7 +9,6 @@
 require 'audited'
 require 'audited_spec_helpers'
 require 'support/active_record/models'
-load "audited/sweeper.rb" # force to reload sweeper
 
 SPEC_ROOT = Pathname.new(File.expand_path('../', __FILE__))