From 0492759db338a01623672674408a0bed62951ac6 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 22 Nov 2008 18:21:48 -0800 Subject: MiniTest compat: don't shadow @name --- activemodel/test/state_machine/state_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activemodel/test/state_machine/state_test.rb') diff --git a/activemodel/test/state_machine/state_test.rb b/activemodel/test/state_machine/state_test.rb index 319ac82d9b..fbf9ce7b0a 100644 --- a/activemodel/test/state_machine/state_test.rb +++ b/activemodel/test/state_machine/state_test.rb @@ -9,13 +9,13 @@ end class StateTest < ActiveModel::TestCase def setup - @name = :astate + @state_name = :astate @machine = StateTestSubject.state_machine @options = { :crazy_custom_key => 'key', :machine => @machine } end def new_state(options={}) - ActiveModel::StateMachine::State.new(@name, @options.merge(options)) + ActiveModel::StateMachine::State.new(@state_name, @options.merge(options)) end test 'sets the name' do -- cgit v1.2.3