aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/state_machine/machine_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-15 20:25:14 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-15 20:25:14 -0800
commitd7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a (patch)
treec22938f72fb2c26d3208ad44465df287e1b477c2 /activemodel/test/state_machine/machine_test.rb
parent9e9dde617f45c24c2cf3193f639b2a9eb0332a34 (diff)
downloadrails-d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a.tar.gz
rails-d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a.tar.bz2
rails-d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a.zip
Use the Ruby load path for test_helper requires. Fix AM::TestCase.
Diffstat (limited to 'activemodel/test/state_machine/machine_test.rb')
-rw-r--r--activemodel/test/state_machine/machine_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/test/state_machine/machine_test.rb b/activemodel/test/state_machine/machine_test.rb
index 2cdfcd9554..d23c223160 100644
--- a/activemodel/test/state_machine/machine_test.rb
+++ b/activemodel/test/state_machine/machine_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+require 'test_helper'
class MachineTestSubject
include ActiveModel::StateMachine
@@ -40,4 +40,4 @@ class StateMachineMachineTest < ActiveModel::TestCase
assert events.include?(:shutdown)
assert events.include?(:timeout)
end
-end \ No newline at end of file
+end