Update to ruby/spec@4eec3dc

5 files changed, 59 insertions, 1 deletions

diff --git a/spec/ruby/core/struct/clone_spec.rb b/spec/ruby/core/struct/clone_spec.rb
new file mode 100644
index 0000000000..40c4d52d57
--- /dev/null
+++ b/spec/ruby/core/struct/clone_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require_relative 'shared/dup'
+
+describe "Struct-based class#clone" do
+  it_behaves_like :struct_dup, :clone
+end
diff --git a/spec/ruby/core/struct/dup_spec.rb b/spec/ruby/core/struct/dup_spec.rb
index cb54b7ceee..8b50c39014 100644
--- a/spec/ruby/core/struct/dup_spec.rb
+++ b/spec/ruby/core/struct/dup_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/dup'
 
 describe "Struct-based class#dup" do
 
+  it_behaves_like :struct_dup, :dup
+
   # From https://github.com/jruby/jruby/issues/3686
   it "retains an included module in the ancestor chain for the struct's singleton class" do
     klass = Struct.new(:foo)
diff --git a/spec/ruby/core/struct/instance_variable_get_spec.rb b/spec/ruby/core/struct/instance_variable_get_spec.rb
new file mode 100644
index 0000000000..e4a3ea87dc
--- /dev/null
+++ b/spec/ruby/core/struct/instance_variable_get_spec.rb
@@ -0,0 +1,16 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Struct#instance_variable_get" do
+  it "returns nil for attributes" do
+    car = StructClasses::Car.new("Hugo", "Foo", "1972")
+    car.instance_variable_get(:@make).should be_nil
+  end
+
+  it "returns a user value for variables with the same name as attributes" do
+    car = StructClasses::Car.new("Hugo", "Foo", "1972")
+    car.instance_variable_set :@make, "explicit"
+    car.instance_variable_get(:@make).should == "explicit"
+    car.make.should == "Hugo"
+  end
+end
diff --git a/spec/ruby/core/struct/new_spec.rb b/spec/ruby/core/struct/new_spec.rb
index f888106950..564c49af01 100644
--- a/spec/ruby/core/struct/new_spec.rb
+++ b/spec/ruby/core/struct/new_spec.rb
@@ -74,6 +74,10 @@ describe "Struct.new" do
     end
   end
 
+  it "raises ArgumentError when there is a duplicate member" do
+    -> { Struct.new(:foo, :foo) }.should raise_error(ArgumentError, "duplicate member: foo")
+  end
+
   it "raises a TypeError if object is not a Symbol" do
     obj = mock(':ruby')
     def obj.to_sym() :ruby end
@@ -147,7 +151,6 @@ describe "Struct.new" do
     context "keyword_init: true option" do
       before :all do
         @struct_with_kwa = Struct.new(:name, :legs, keyword_init: true)
-        @struct_without_kwa = Struct.new(:name, :legs, keyword_init: false)
       end
 
       it "creates a class that accepts keyword arguments to initialize" do
@@ -156,6 +159,10 @@ describe "Struct.new" do
         obj.legs.should == 4
       end
 
+      it "raises when there is a duplicate member" do
+        -> { Struct.new(:foo, :foo, keyword_init: true) }.should raise_error(ArgumentError, "duplicate member: foo")
+      end
+
       describe "new class instantiation" do
         it "accepts arguments as hash as well" do
           obj = @struct_with_kwa.new({name: "elefant", legs: 4})
@@ -163,6 +170,18 @@ describe "Struct.new" do
           obj.legs.should == 4
         end
 
+        it "allows missing arguments" do
+          obj = @struct_with_kwa.new(name: "elefant")
+          obj.name.should == "elefant"
+          obj.legs.should be_nil
+        end
+
+        it "allows no arguments" do
+          obj = @struct_with_kwa.new
+          obj.name.should be_nil
+          obj.legs.should be_nil
+        end
+
         it "raises ArgumentError when passed not declared keyword argument" do
           -> {
             @struct_with_kwa.new(name: "elefant", legs: 4, foo: "bar")
@@ -184,6 +203,10 @@ describe "Struct.new" do
     end
 
     context "keyword_init: false option" do
+      before :all do
+        @struct_without_kwa = Struct.new(:name, :legs, keyword_init: false)
+      end
+
       it "behaves like it does without :keyword_init option" do
         obj = @struct_without_kwa.new("elefant", 4)
         obj.name.should == "elefant"
diff --git a/spec/ruby/core/struct/shared/dup.rb b/spec/ruby/core/struct/shared/dup.rb
new file mode 100644
index 0000000000..994f3f443e
--- /dev/null
+++ b/spec/ruby/core/struct/shared/dup.rb
@@ -0,0 +1,9 @@
+describe :struct_dup, shared: true do
+  it "duplicates members" do
+    klass = Struct.new(:foo, :bar)
+    instance = klass.new(14, 2)
+    duped = instance.send(@method)
+    duped.foo.should == 14
+    duped.bar.should == 2
+  end
+end