@@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../../shared/enumerator/each' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do describe "Enumerator#each" do it_behaves_like(:enum_each, :each) end core/enumerator/each_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do require File.dirname(__FILE__) + '/../../shared/enumerator/with_index' describe "Enumerator#each_with_index" do core/enumerator/each_with_index_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do require File.dirname(__FILE__) + '/../../shared/enumerator/enum_for' describe "#enum_for" do core/enumerator/enum_for_spec.rb @@ -1,24 +1,26 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do require File.dirname(__FILE__) + '/../../shared/enumerator/new' describe "Enumerator.new" do it_behaves_like(:enum_new, :new) - it "accepts a block" do - enum = enumerator_class.new do |yielder| - yielder.yield 3 - yielder.yield 2 - yielder.yield 1 + ruby_version_is "1.9" do + it "accepts a block" do + enum = enumerator_class.new do |yielder| + yielder.yield 3 + yielder.yield 2 + yielder.yield 1 + end + enum.should be_kind_of(enumerator_class) + enum.to_a.should == [3,2,1] end - enum.should be_kind_of(enumerator_class) - enum.to_a.should == [3,2,1] - end - it "ignores block if arg given" do - enum = enumerator_class.new([1,2,3]){|y| y.yield 4} - enum.to_a.should == [1,2,3] + it "ignores block if arg given" do + enum = enumerator_class.new([1,2,3]){|y| y.yield 4} + enum.to_a.should == [1,2,3] + end end end end core/enumerator/new_spec.rb @@ -1,6 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +# TODO: enable for 1.8.7 as well +ruby_version_is "1.9" do require File.dirname(__FILE__) + '/../../shared/enumerator/next' describe "Enumerator#next" do core/enumerator/next_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.9" do describe "Enumerator#peek" do before(:each) do @e = (1..5).to_a.to_enum core/enumerator/peek_spec.rb @@ -1,22 +1,24 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do require File.dirname(__FILE__) + '/../../shared/enumerator/rewind' describe "Enumerator#rewind" do it_behaves_like(:enum_rewind, :rewind) - it "calls the enclosed object's rewind method if one exists" do - obj = mock('rewinder') - enum = enumerator_class.new(obj, :enum) - obj.should_receive(:rewind) - enum.rewind - end + ruby_version_is "1.9" do + it "calls the enclosed object's rewind method if one exists" do + obj = mock('rewinder') + enum = enumerator_class.new(obj, :enum) + obj.should_receive(:rewind) + enum.rewind + end - it "does nothing if the object doesn't have a #rewind method" do - obj = mock('rewinder') - enum = enumerator_class.new(obj) - lambda { enum.rewind.should == enum }.should_not raise_error + it "does nothing if the object doesn't have a #rewind method" do + obj = mock('rewinder') + enum = enumerator_class.new(obj) + lambda { enum.rewind.should == enum }.should_not raise_error + end end - end + end end core/enumerator/rewind_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do require File.dirname(__FILE__) + '/../../shared/enumerator/enum_for' describe "#to_enum" do core/enumerator/to_enum_spec.rb @@ -1,46 +1,48 @@ require File.dirname(__FILE__) + '/../../spec_helper' -ruby_version_is "1.9" do +ruby_version_is "1.8.7" do require File.dirname(__FILE__) + '/../../shared/enumerator/with_index' describe "Enumerator#with_index" do it_behaves_like(:enum_with_index, :with_index) - it "accepts an optional argument when given a block" do - lambda do - @enum.with_index(1) { |f| f} - end.should_not raise_error(ArgumentError) - end - - it "accepts an optional argument when not given a block" do - lambda do - @enum.with_index(1) - end.should_not raise_error(ArgumentError) - end - - it "numbers indices from the given index when given an offset but no block" do - @enum.with_index(1).to_a.should == [[1,1],[2,2],[3,3],[4,4]] - end - - it "numbers indices from the given index when given an offset and block" do - acc = [] - @enum.with_index(1) {|e,i| acc << [e,i] } - acc.should == [[1,1],[2,2],[3,3],[4,4]] - end - - it "raises a TypeError when the argument cannot be converted to numeric" do - lambda do - @enum.with_index('1') {|i| i} - end.should raise_error(TypeError) - end - - it "converts non-numeric arguments to Integer via #to_int" do - (o = mock('1')).should_receive(:to_int).and_return(1) - @enum.with_index(o).to_a.should == [[1,1],[2,2],[3,3],[4,4]] - end - - it "coerces the given numeric argument to an Integer" do - @enum.with_index(1.678).to_a.should == [[1,1],[2,2],[3,3],[4,4]] + ruby_version_is "1.9" do + it "accepts an optional argument when given a block" do + lambda do + @enum.with_index(1) { |f| f} + end.should_not raise_error(ArgumentError) + end + + it "accepts an optional argument when not given a block" do + lambda do + @enum.with_index(1) + end.should_not raise_error(ArgumentError) + end + + it "numbers indices from the given index when given an offset but no block" do + @enum.with_index(1).to_a.should == [[1,1],[2,2],[3,3],[4,4]] + end + + it "numbers indices from the given index when given an offset and block" do + acc = [] + @enum.with_index(1) {|e,i| acc << [e,i] } + acc.should == [[1,1],[2,2],[3,3],[4,4]] + end + + it "raises a TypeError when the argument cannot be converted to numeric" do + lambda do + @enum.with_index('1') {|i| i} + end.should raise_error(TypeError) + end + + it "converts non-numeric arguments to Integer via #to_int" do + (o = mock('1')).should_receive(:to_int).and_return(1) + @enum.with_index(o).to_a.should == [[1,1],[2,2],[3,3],[4,4]] + end + + it "coerces the given numeric argument to an Integer" do + @enum.with_index(1.678).to_a.should == [[1,1],[2,2],[3,3],[4,4]] + end end end end core/enumerator/with_index_spec.rb 1c48eb3aab34adf3bbd2e207be33c141e2ea8fc7 Vladimir Sizikov vsizikov@gmail.com http://github.com/rubyspec/rubyspec/commit/2a4c94e1aa320fdb3e085550d9048e03ca800a6a 2a4c94e1aa320fdb3e085550d9048e03ca800a6a 2009-11-08T13:30:46-08:00 2009-11-08T13:30:46-08:00 Enabled enumerator specs not only for 1.9, but for 1.8.7 as well. 4c4772b660f80340e89e96e3ea36a58dc26efd93 Vladimir Sizikov vsizikov@gmail.com