fix: timestamp will work with named machine

aasm · Apr 22, 2021 · f9906ef · f9906ef
1 parent 252ade3
commit f9906ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/aasm/base.rb b/lib/aasm/base.rb
@@ -268,7 +268,7 @@ def setup_timestamps(aasm_name)
 
       after_all_transitions do
         if self.class.aasm(:"#{aasm_name}").state_machine.config.timestamps
-          ts_setter = "#{aasm.to_state}_at="
+          ts_setter = "#{aasm(aasm_name).to_state}_at="
           respond_to?(ts_setter) && send(ts_setter, ::Time.now)
         end
       end

diff --git a/spec/models/timestamps_example.rb b/spec/models/timestamps_example.rb
@@ -4,7 +4,7 @@ class TimestampsExample
   attr_accessor :opened_at
   attr_reader :closed_at
 
-  aasm timestamps: true do
+  aasm :state, timestamps: true do
     state :opened
     state :closed
 

diff --git a/spec/unit/timestamps_spec.rb b/spec/unit/timestamps_spec.rb
@@ -19,9 +19,9 @@
 
   it 'can be turned off and on' do
     object = TimestampsExample.new
-    object.class.aasm.state_machine.config.timestamps = false
+    object.class.aasm(:state).state_machine.config.timestamps = false
     expect { object.open }.not_to change { object.opened_at }
-    object.class.aasm.state_machine.config.timestamps = true
+    object.class.aasm(:state).state_machine.config.timestamps = true
     expect { object.open }.to change { object.opened_at }
   end
 end