@@ -70,8 +70,4 @@ describe JoshuaSonOfNun::Space do Space('A4').linear_spaces(Space('A5'), expended, successful).should == [Space('A6')] end end - - def space_array(*coordinates) - coordinates.collect {|c| Space(c)} - end end \ No newline at end of file spec/joshua_son_of_nun/space_spec.rb @@ -83,11 +83,9 @@ describe JoshuaSonOfNun::Strategy::Diagonal do target = Space('E5') expected_next_target = Space('F6') - if @model.targets.index(target) < @model.targets.index(expected_next_target) - @model.targets[@model.targets.index(target) + 1].should == expected_next_target - else - @model.targets[@model.targets.index(expected_next_target) + 1].should == Space('G7') - end + # One of these spaces may have already been placed in the targeting array, + # so checking to make sure at least one of these spaces is the next space + space_array('F6', 'G7', 'H8', 'I9', 'J10').should include(@model.targets[@model.targets.index(target) + 1]) end end spec/joshua_son_of_nun/strategy_spec.rb @@ -15,4 +15,8 @@ def Space(string) coordinates, orientation = string.split(' ') row, column = coordinates.scan(/(\w)(\d{1,2})/).first JoshuaSonOfNun::Space.new(row, column, orientation) +end + +def space_array(*coordinates) + coordinates.collect {|c| Space(c)} end \ No newline at end of file spec/spec_helper.rb 9de3cdc5320673520a1b9010c18ce3f8a11391cd Steve Iannopollo steve@iannopollo.com http://github.com/siannopollo/joshua_son_of_nun/commit/d2191e80e3cb957259a044589eb0a73b30a9f515 d2191e80e3cb957259a044589eb0a73b30a9f515 2008-11-29T14:26:50-08:00 2008-11-29T14:26:50-08:00 tweaks to strategy spec a330db3f2748a5ca127439e72ce26a399d16edc9 Steve Iannopollo steve@iannopollo.com