aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorTekin Suleyman <tekin@tekin.co.uk>2009-03-10 15:26:59 +0000
committerTekin Suleyman <tekin@tekin.co.uk>2009-03-10 15:26:59 +0000
commitf1e903aa92f9e4913f3a34135e2dee43bd0cb0c1 (patch)
treebc3ead9f6c1a703649fb06d4c6e83e5e220a8bfe /activemodel
parent7fa0a8d7f38a42d2f41a3f4aefc129d7071b0258 (diff)
parent5739626031b4d938652e5d5b84b20620dcbf6fde (diff)
downloadrails-f1e903aa92f9e4913f3a34135e2dee43bd0cb0c1.tar.gz
rails-f1e903aa92f9e4913f3a34135e2dee43bd0cb0c1.tar.bz2
rails-f1e903aa92f9e4913f3a34135e2dee43bd0cb0c1.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/test/state_machine/event_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/test/state_machine/event_test.rb b/activemodel/test/state_machine/event_test.rb
index 8fb7e82ec2..64dc8c4875 100644
--- a/activemodel/test/state_machine/event_test.rb
+++ b/activemodel/test/state_machine/event_test.rb
@@ -31,7 +31,7 @@ class EventBeingFiredTest < ActiveModel::TestCase
test 'should raise an AASM::InvalidTransition error if the transitions are empty' do
event = ActiveModel::StateMachine::Event.new(nil, :event)
- assert_raises ActiveModel::StateMachine::InvalidTransition do
+ assert_raise ActiveModel::StateMachine::InvalidTransition do
event.fire(nil)
end
end