opal 0.4.3 → 0.4.4

data/spec/rubyspec/core/array/plus_spec.rb

@@ -46,7 +46,7 @@ describe "Array#+" do
     ([5, 6] + ArraySpecs::ToAryArray[1, 2]).should == [5, 6, 1, 2]
   end
 
-  pending "does not get infected even if an original array is tainted" do
+  it "does not get infected even if an original array is tainted" do
     ([1, 2] + [3, 4]).tainted?.should be_false
     ([1, 2].taint + [3, 4]).tainted?.should be_false
     ([1, 2] + [3, 4].taint).tainted?.should be_false
@@ -54,7 +54,7 @@ describe "Array#+" do
   end
 
   ruby_version_is '1.9' do
-    pending "does not infected even if an original array is untrusted" do
+    it "does not infected even if an original array is untrusted" do
       ([1, 2] + [3, 4]).untrusted?.should be_false
       ([1, 2].untrust + [3, 4]).untrusted?.should be_false
       ([1, 2] + [3, 4].untrust).untrusted?.should be_false

data/spec/rubyspec/core/array/pop_spec.rb

@@ -30,7 +30,7 @@ describe "Array#pop" do
     array.pop.should == [1, 'two', 3.0, array, array, array, array]
   end
 
-  pending "keeps taint status" do
+  it "keeps taint status" do
     a = [1, 2].taint
     a.pop
     a.tainted?.should be_true
@@ -56,7 +56,7 @@ describe "Array#pop" do
       lambda { ArraySpecs.empty_frozen_array.pop }.should raise_error(RuntimeError)
     end
 
-    pending "keeps untrusted status" do
+    it "keeps untrusted status" do
       a = [1, 2].untrust
       a.pop
       a.untrusted?.should be_true
@@ -173,7 +173,7 @@ describe "Array#pop" do
     end
 
     ruby_version_is '1.9' do
-      pending "returns a trusted array even if the array is untrusted" do
+      it "returns a trusted array even if the array is untrusted" do
         ary = [1, 2].untrust
         ary.pop(2).untrusted?.should be_false
         ary.pop(0).untrusted?.should be_false
@@ -184,7 +184,7 @@ describe "Array#pop" do
         lambda { ArraySpecs.frozen_array.pop(0) }.should raise_error(RuntimeError)
       end
 
-      pending "keeps untrusted status" do
+      it "keeps untrusted status" do
         a = [1, 2].untrust
         a.pop(2)
         a.untrusted?.should be_true

data/spec/rubyspec/core/array/rassoc_spec.rb

@@ -20,7 +20,7 @@ describe "Array#rassoc" do
     [[empty, array]].rassoc(array).should == [empty, array]
   end
 
-  pending "calls elem == obj on the second element of each contained array" do
+  it "calls elem == obj on the second element of each contained array" do
     key = 'foobar'
     o = mock('foobar')
     def o.==(other); other == 'foobar'; end
@@ -28,7 +28,7 @@ describe "Array#rassoc" do
     [[1, :foobar], [2, o], [3, mock('foo')]].rassoc(key).should == [2, o]
   end
 
-  pending "does not check the last element in each contained but speficically the second" do
+  it "does not check the last element in each contained but speficically the second" do
     key = 'foobar'
     o = mock('foobar')
     def o.==(other); other == 'foobar'; end

data/spec/rubyspec/core/array/reject_spec.rb

@@ -57,9 +57,7 @@ describe "Array#reject" do
     end
   end
 
-  pending do
-    it_behaves_like :enumeratorize, :reject
-  end
+  it_behaves_like :enumeratorize, :reject
 end
 
 describe "Array#reject!" do
@@ -132,7 +130,5 @@ describe "Array#reject!" do
     end
   end
 
-  pending do
-    it_behaves_like :enumeratorize, :reject!
-  end
+  it_behaves_like :enumeratorize, :reject!
 end

data/spec/rubyspec/core/array/replace_spec.rb

@@ -3,7 +3,5 @@ require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/replace', __FILE__)
 
 describe "Array#replace" do
-  pending do
-    it_behaves_like(:array_replace, :replace)
-  end
+  it_behaves_like(:array_replace, :replace)
 end

data/spec/rubyspec/core/array/reverse_each_spec.rb

@@ -33,7 +33,5 @@ describe "Array#reverse_each" do
     ScratchPad.recorded.should == [array, array, array, array, array, 3.0, 'two', 1]
   end
 
-  pending do
-    it_behaves_like :enumeratorize, :reverse_each
-  end
+  it_behaves_like :enumeratorize, :reverse_each
 end

data/spec/rubyspec/core/array/reverse_spec.rb

@@ -7,7 +7,7 @@ describe "Array#reverse" do
     [1, 3, 5, 2].reverse.should == [2, 5, 3, 1]
   end
 
-  pending "properly handles recursive arrays" do
+  it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
     empty.reverse.should == empty
 
@@ -16,7 +16,7 @@ describe "Array#reverse" do
   end
 
   ruby_version_is "" ... "1.9.3" do
-    pending "returns subclass instance on Array subclasses" do
+    it "returns subclass instance on Array subclasses" do
       ArraySpecs::MyArray[1, 2, 3].reverse.should be_kind_of(ArraySpecs::MyArray)
     end
   end
@@ -29,14 +29,14 @@ describe "Array#reverse" do
 end
 
 describe "Array#reverse!" do
-  pending "reverses the elements in place" do
+  it "reverses the elements in place" do
     a = [6, 3, 4, 2, 1]
     a.reverse!.should equal(a)
     a.should == [1, 2, 4, 3, 6]
     [].reverse!.should == []
   end
 
-  pending "properly handles recursive arrays" do
+  it "properly handles recursive arrays" do
     empty = ArraySpecs.empty_recursive_array
     empty.reverse!.should == [empty]
 

data/spec/rubyspec/core/array/rindex_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path('../fixtures/classes', __FILE__)
 # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/23633
 
 describe "Array#rindex" do
-  pending "returns the first index backwards from the end where element == to object" do
+  it "returns the first index backwards from the end where element == to object" do
     key = 3
     uno = mock('one')
     dos = mock('two')

data/spec/rubyspec/core/array/select_spec.rb

@@ -4,11 +4,9 @@ require File.expand_path('../shared/enumeratorize', __FILE__)
 require File.expand_path('../shared/keep_if', __FILE__)
 
 describe "Array#select" do
-  pending do
-    it_behaves_like :enumeratorize, :select
-  end
+  it_behaves_like :enumeratorize, :select
 
-  pending "returns a new array of elements for which block is true" do
+  it "returns a new array of elements for which block is true" do
     [1, 3, 4, 5, 6, 9].select { |i| i % ((i + 1) / 2) == 0}.should == [1, 4, 6]
   end
 
@@ -33,8 +31,6 @@ ruby_version_is "1.9" do
       [1, 2, 3].select! { true }.should be_nil
     end
 
-    pending do
-      it_behaves_like :keep_if, :select!
-    end
+    it_behaves_like :keep_if, :select!
   end
 end

data/spec/rubyspec/core/array/shared/collect.rb

@@ -0,0 +1,7 @@
+describe :array_collect, :shared => true do
+
+end
+
+describe :array_collect_b, :shared => true do
+
+end

data/spec/rubyspec/core/array/shared/index.rb

@@ -32,6 +32,6 @@ describe :array_index, :shared => true do
       it "produces an Enumerator" do
         [].send(@method).should be_kind_of(enumerator_class)
       end
-    end
+    end if false
   end
 end

data/spec/rubyspec/core/array/shared/keep_if.rb

@@ -0,0 +1,3 @@
+describe :keep_if, :shared => true do
+
+end

data/spec/rubyspec/core/array/shared/length.rb

@@ -0,0 +1,3 @@
+describe :array_length, :shared => true do
+
+end

data/spec/rubyspec/core/array/shared/replace.rb

@@ -0,0 +1,3 @@
+describe :array_replace, :shared => true do
+
+end

data/spec/rubyspec/core/array/shared/slice.rb

@@ -0,0 +1,3 @@
+describe :array_slice, :shared => true do
+
+end

data/spec/rubyspec/core/array/shuffle_spec.rb

@@ -24,7 +24,7 @@ describe "Array#shuffle" do
   end
 
   ruby_version_is "1.8.7" ... "1.9.3" do
-    pending "returns subclass instances with Array subclass" do
+    it "returns subclass instances with Array subclass" do
       ArraySpecs::MyArray[1, 2, 3].shuffle.should be_an_instance_of(ArraySpecs::MyArray)
     end
   end

data/spec/rubyspec/core/array/size_spec.rb

@@ -3,7 +3,5 @@ require File.expand_path('../fixtures/classes', __FILE__)
 require File.expand_path('../shared/length', __FILE__)
 
 describe "Array#size" do
-  pending do
-    it_behaves_like(:array_length, :size)
-  end
+  it_behaves_like(:array_length, :size)
 end

data/spec/rubyspec/core/array/slice_spec.rb

@@ -48,7 +48,7 @@ describe "Array#slice!" do
     array.slice(0..3).should == [1, 'two', 3.0, array]
   end
 
-  pending "calls to_int on start and length arguments" do
+  it "calls to_int on start and length arguments" do
     obj = mock('2')
     def obj.to_int() 2 end
 
@@ -61,7 +61,7 @@ describe "Array#slice!" do
     a.should == []
   end
 
-  pending "removes and return elements in range" do
+  it "removes and return elements in range" do
     a = [1, 2, 3, 4, 5, 6, 7, 8]
     a.slice!(1..4).should == [2, 3, 4, 5]
     a.should == [1, 6, 7, 8]
@@ -79,7 +79,7 @@ describe "Array#slice!" do
     a.should == []
   end
 
-  pending "calls to_int on range arguments" do
+  it "calls to_int on range arguments" do
     from = mock('from')
     to = mock('to')
 
@@ -162,7 +162,5 @@ describe "Array#slice!" do
 end
 
 describe "Array#slice" do
-  pending do
-    it_behaves_like(:array_slice, :slice)
-  end
+  it_behaves_like(:array_slice, :slice)
 end

data/spec/rubyspec/core/array/sort_spec.rb

@@ -96,7 +96,7 @@ describe "Array#sort" do
     a.sort { -1 }.should be_kind_of(Array)
   end
 
-  pending "does not freezes self during being sorted" do
+  it "does not freezes self during being sorted" do
     a = [1, 2, 3]
     a.sort { |x,y| a.frozen?.should == false; x <=> y }
   end
@@ -159,7 +159,7 @@ describe "Array#sort" do
   end
 
   ruby_version_is "" ... "1.9.3" do
-    pending "returns subclass instance on Array subclasses" do
+    it "returns subclass instance on Array subclasses" do
       ary = ArraySpecs::MyArray[1, 2, 3]
       ary.sort.should be_kind_of(ArraySpecs::MyArray)
     end

data/spec/rubyspec/core/array/to_a_spec.rb

@@ -8,7 +8,7 @@ describe "Array#to_a" do
     a.should equal(a.to_a)
   end
 
-  pending "does not return subclass instance on Array subclasses" do
+  it "does not return subclass instance on Array subclasses" do
     e = ArraySpecs::MyArray.new(1, 2)
     e.to_a.should be_an_instance_of(Array)
     e.to_a.should == [1, 2]

data/spec/rubyspec/core/array/try_convert_spec.rb

@@ -8,42 +8,42 @@ ruby_version_is "1.9" do
       Array.try_convert(x).should equal(x)
     end
 
-    pending "returns the argument if it's a kind of Array" do
+    it "returns the argument if it's a kind of Array" do
       x = ArraySpecs::MyArray[]
       Array.try_convert(x).should equal(x)
     end
 
-    pending "returns nil when the argument does not respond to #to_ary" do
+    it "returns nil when the argument does not respond to #to_ary" do
       Array.try_convert(Object.new).should be_nil
     end
 
-    pending "sends #to_ary to the argument and returns the result if it's nil" do
+    it "sends #to_ary to the argument and returns the result if it's nil" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(nil)
       Array.try_convert(obj).should be_nil
     end
 
-    pending "sends #to_ary to the argument and returns the result if it's an Array" do
+    it "sends #to_ary to the argument and returns the result if it's an Array" do
       x = Array.new
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(x)
       Array.try_convert(obj).should equal(x)
     end
 
-    pending "sends #to_ary to the argument and returns the result if it's a kind of Array" do
+    it "sends #to_ary to the argument and returns the result if it's a kind of Array" do
       x = ArraySpecs::MyArray[]
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(x)
       Array.try_convert(obj).should equal(x)
     end
 
-    pending "sends #to_ary to the argument and raises TypeError if it's not a kind of Array" do
+    it "sends #to_ary to the argument and raises TypeError if it's not a kind of Array" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_return(Object.new)
       lambda { Array.try_convert obj }.should raise_error(TypeError)
     end
 
-    pending "does not rescue exceptions raised by #to_ary" do
+    it "does not rescue exceptions raised by #to_ary" do
       obj = mock("to_ary")
       obj.should_receive(:to_ary).and_raise(RuntimeError)
       lambda { Array.try_convert obj }.should raise_error(RuntimeError)

data/spec/rubyspec/core/array/uniq_spec.rb

@@ -16,7 +16,7 @@ describe "Array#uniq" do
     end
   end
 
-  pending "uses eql? semantics" do
+  it "uses eql? semantics" do
     [1.0, 1].uniq.should == [1.0, 1]
   end
 
@@ -43,7 +43,7 @@ describe "Array#uniq" do
     [x, y].uniq.should == [x, y]
   end
 
-  pending "compares elements with matching hash codes with #eql?" do
+  it "compares elements with matching hash codes with #eql?" do
     # Can't use should_receive because it uses hash and eql? internally
     a = Array.new(2) do
       obj = mock('0')
@@ -81,14 +81,14 @@ describe "Array#uniq" do
   end
 
   ruby_version_is "1.9" do
-    pending "compares elements based on the value returned from the block" do
+    it "compares elements based on the value returned from the block" do
       a = [1, 2, 3, 4]
       a.uniq { |x| x >= 2 ? 1 : 0 }.should == [1, 2]
     end
   end
 
   ruby_version_is "" ... "1.9.3" do
-    pending "returns subclass instance on Array subclasses" do
+    it "returns subclass instance on Array subclasses" do
       ArraySpecs::MyArray[1, 2, 3].uniq.should be_kind_of(ArraySpecs::MyArray)
     end
   end
@@ -113,7 +113,7 @@ describe "Array#uniq!" do
   end
 
   ruby_bug "#", "1.8.6.277" do
-    pending "properly handles recursive arrays" do
+    it "properly handles recursive arrays" do
       empty = ArraySpecs.empty_recursive_array
       empty_dup = empty.dup
       empty.uniq!
@@ -143,7 +143,7 @@ describe "Array#uniq!" do
   end
 
   ruby_version_is "1.9" do
-    pending "raises a RuntimeError on a frozen array when the array is modified" do
+    it "raises a RuntimeError on a frozen array when the array is modified" do
       dup_ary = [1, 1, 2]
       dup_ary.freeze
       lambda { dup_ary.uniq! }.should raise_error(RuntimeError)
@@ -159,7 +159,7 @@ describe "Array#uniq!" do
       lambda { ArraySpecs.frozen_array.uniq!{ raise RangeError, "shouldn't yield"}}.should raise_error(RuntimeError)
     end
 
-    pending "compares elements based on the value returned from the block" do
+    it "compares elements based on the value returned from the block" do
       a = [1, 2, 3, 4]
       a.uniq! { |x| x >= 2 ? 1 : 0 }.should == [1, 2]
     end

data/spec/rubyspec/core/array/zip_spec.rb

@@ -22,7 +22,7 @@ describe "Array#zip" do
     b.zip(b).should == [ [b[0], b[0]], [b[1], b[1]] ]
   end
 
-  pending "calls #to_ary to convert the argument to an Array" do
+  it "calls #to_ary to convert the argument to an Array" do
     obj = mock('[3,4]')
     obj.should_receive(:to_ary).and_return([3, 4])
     [1, 2].zip(obj).should == [[1, 3], [2, 4]]

data/spec/rubyspec/core/enumerable/collect_spec.rb

@@ -12,4 +12,28 @@ describe "Enumerable#collect" do
     numerous.collect { |i| i % 2 }.should == [0, 1, 1, 0, 1, 0]
     numerous.collect { |i| i }.should == entries
   end
+
+  ruby_version_is ""..."1.9" do
+    it "gathers whole arrays as elements when each yields multiple" do
+      multi = EnumerableSpecs::YieldsMulti.new
+      multi.send(@method) {|e| e}.should == [[1,2],[3,4,5],[6,7,8,9]]
+    end
+
+    it "returns to_a when no block given" do
+      EnumerableSpecs::Numerous.new.send(@method).should == [2, 5, 3, 6, 1, 4]
+    end
+  end
+
+  ruby_version_is "1.9" do
+    it "gathers initial args as elements when each yields multiple" do
+      multi = EnumerableSpecs::YieldsMulti.new
+      multi.collect {|e| e}.should == [1, 3, 6]
+    end
+
+    it "returns an enumerator when no block given" do
+      enum = EnumerableSpecs::Numerous.new.collect
+      enum.should be_an_instance_of(enumerator_class)
+      enum.each { |i| -i }.should == [-2, -5, -3, -6, -1, -4]
+    end
+  end
 end