kotovalexarian-likes-github
/
aasm
mirror of https://github.com/aasm/aasm
1
0
Fork 0
Code Releases Activity

allow providing any argument for :on_transition callback (fix for issue #126)

This commit is contained in:
Thorsten Böttger 2014-05-11 23:19:06 +01:00
parent d9472c7a29
commit 7f9be4a97e
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/aasm/event.rb
View File

@ -103,8 +103,7 @@ module AASM
# If to_state is not nil it either contains a potential
# to_state or an arg
unless to_state == nil
if to_state.respond_to?(:to_sym) &&
!transitions.map(&:to).flatten.include?(to_state.to_sym)
if !to_state.respond_to?(:to_sym) || !transitions.map(&:to).flatten.include?(to_state.to_sym)
args.unshift(to_state)
to_state = nil
end

27
spec/unit/callbacks_spec.rb
View File

@ -33,7 +33,23 @@ describe 'callbacks for the new DSL' do
cb.close!(:arg1, :arg2)
end
it "should call the proper methods given a to state as the first arg" do
it "should call the callbacks given the to-state as argument" do
cb = CallbackWithStateArg.new
cb.should_receive(:before_method).with(:arg1).once.ordered
cb.should_receive(:transition_method).never
cb.should_receive(:transition_method2).with(:arg1).once.ordered
cb.should_receive(:after_method).with(:arg1).once.ordered
cb.close!(:out_to_lunch, :arg1)
cb = CallbackWithStateArg.new
some_object = double('some object')
cb.should_receive(:before_method).with(some_object).once.ordered
cb.should_receive(:transition_method2).with(some_object).once.ordered
cb.should_receive(:after_method).with(some_object).once.ordered
cb.close!(:out_to_lunch, some_object)
end
it "should call the proper methods just with arguments" do
cb = CallbackWithStateArg.new
cb.should_receive(:before_method).with(:arg1).once.ordered
cb.should_receive(:transition_method).with(:arg1).once.ordered
@ -42,11 +58,12 @@ describe 'callbacks for the new DSL' do
cb.close!(:arg1)
cb = CallbackWithStateArg.new
cb.should_receive(:before_method).with(:arg1).once.ordered
some_object = double('some object')
cb.should_receive(:before_method).with(some_object).once.ordered
cb.should_receive(:transition_method).with(some_object).once.ordered
cb.should_receive(:transition_method).never
cb.should_receive(:transition_method2).with(:arg1).once.ordered
cb.should_receive(:after_method).with(:arg1).once.ordered
cb.close!(:out_to_lunch, :arg1)
cb.should_receive(:after_method).with(some_object).once.ordered
cb.close!(some_object)
end
end