diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 00:33:32 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 00:33:32 +0000 |
| commit | 1ab84247ca4b80afbd82afe7539b3449636344c4 (patch) | |
| tree | 9ca5e3bee3a07b68c9d900ff129b69bc740405c2 /activemodel | |
| parent | b6fb79c531a0079274f7b459302e6290c9183f28 (diff) | |
| parent | 4458edc882b229ea44602da20a6440a6f233f1c8 (diff) | |
| download | rails-1ab84247ca4b80afbd82afe7539b3449636344c4.tar.gz rails-1ab84247ca4b80afbd82afe7539b3449636344c4.tar.bz2 rails-1ab84247ca4b80afbd82afe7539b3449636344c4.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/files/stylesheets/main.css
railties/guides/rails_guides/generator.rb
railties/guides/source/index.erb.textile
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/test/state_machine/event_test.rb | 2 |
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 |