1 files changed, 12 insertions, 4 deletions

diff --git a/spec/ruby/core/module/class_variables_spec.rb b/spec/ruby/core/module/class_variables_spec.rb
index fd7aa93aa8..9529df48ae 100644
--- a/spec/ruby/core/module/class_variables_spec.rb
+++ b/spec/ruby/core/module/class_variables_spec.rb
@@ -3,8 +3,8 @@ require_relative 'fixtures/classes'
 
 describe "Module#class_variables" do
   it "returns an Array with the names of class variables of self" do
-    ModuleSpecs::ClassVars::A.class_variables.should include(:@@a_cvar)
-    ModuleSpecs::ClassVars::M.class_variables.should include(:@@m_cvar)
+    ModuleSpecs::ClassVars::A.class_variables.should.include?(:@@a_cvar)
+    ModuleSpecs::ClassVars::M.class_variables.should.include?(:@@m_cvar)
   end
 
   it "returns an Array of Symbols of class variable names defined in a metaclass" do
@@ -15,12 +15,20 @@ describe "Module#class_variables" do
   end
 
   it "returns an Array with names of class variables defined in metaclasses" do
-    ModuleSpecs::CVars.class_variables.should include(:@@cls, :@@meta)
+    ModuleSpecs::CVars.class_variables.to_set.should >= Set[:@@cls, :@@meta]
   end
 
   it "does not return class variables defined in extended modules" do
     c = Class.new
     c.extend ModuleSpecs::MVars
-    c.class_variables.should_not include(:@@mvar)
+    c.class_variables.should_not.include?(:@@mvar)
+  end
+
+  it "returns the correct class variables when inherit is given" do
+    ModuleSpecs::SubCVars.class_variables(false).should == [:@@sub]
+    ModuleSpecs::SubCVars.new.singleton_class.class_variables(false).should == []
+
+    ModuleSpecs::SubCVars.class_variables(true).should == [:@@sub, :@@cls, :@@meta]
+    ModuleSpecs::SubCVars.new.singleton_class.class_variables(true).should ==  [:@@sub, :@@cls, :@@meta]
   end
 end