Module#instance_methods fully compliant with rubyspec

elia · elia · commit e8c20dd6ddf9 · 2015-04-29T09:53:04.000+02:00
diff --git a/opal/corelib/module.rb b/opal/corelib/module.rb
@@ -358,17 +358,17 @@ def instance_method(name)
     }
   end
 
-  def instance_methods(include_super = false)
+  def instance_methods(include_super = true)
     %x{
       var methods = [],
           proto   = self.$$proto;
 
       for (var prop in proto) {
-        if (!prop.charAt(0) === '$') {
+        if (!(prop.charAt(0) === '$')) {
           continue;
         }
 
-        if (typeof(proto[prop]) !== "function") {
+        if (!(typeof(proto[prop]) === "function")) {
           continue;
         }
 
diff --git a/spec/filters/unsupported/private_methods.rb b/spec/filters/unsupported/private_methods.rb
@@ -47,4 +47,6 @@
   fails "Kernel#format is a private method"
   fails "Kernel#sprintf is a private method"
   fails "Kernel#warn is a private method"
+
+  fails "Module#instance_methods makes a private Object instance method public in Kernel"
 end
diff --git a/spec/opal/core/runtime/bridged_classes_spec.rb b/spec/opal/core/runtime/bridged_classes_spec.rb
@@ -49,16 +49,16 @@ def some_bridged_method
 
   describe ".instance_methdods" do
     it "should report methods for class" do
-      Array.instance_methods.should include(:shift)
+      Array.instance_methods(false).should include(:shift)
     end
 
     it "should not include methods donated from Object/Kernel" do
-      Array.instance_methods.should_not include(:class)
+      Array.instance_methods(false).should_not include(:class)
     end
 
     it "should not include methods donated from BasicObject" do
-      Array.instance_methods.should_not include(:__send__)
-      Array.instance_methods.should_not include(:send)
+      Array.instance_methods(false).should_not include(:__send__)
+      Array.instance_methods(false).should_not include(:send)
     end
   end
 end
diff --git a/spec/rubyspecs b/spec/rubyspecs
@@ -82,6 +82,7 @@ corelib/core/module/class_variable_set_spec
 corelib/core/module/module_function_spec
 corelib/core/module/const_get_spec
 corelib/core/module/include_spec
+corelib/core/module/instance_methods_spec
 
 corelib/core/range/begin_spec
 corelib/core/range/case_compare_spec

Original file line number	Diff line number	Diff line change
`@@ -358,17 +358,17 @@ def instance_method(name)`
`358`	`358`	`}`
`359`	`359`	`end`
`360`	`360`
`361`		`- def instance_methods(include_super = false)`
	`361`	`+ def instance_methods(include_super = true)`
`362`	`362`	`%x{`
`363`	`363`	`var methods = [],`
`364`	`364`	`proto = self.$$proto;`
`365`	`365`
`366`	`366`	`for (var prop in proto) {`
`367`		`- if (!prop.charAt(0) === '$') {`
	`367`	`+ if (!(prop.charAt(0) === '$')) {`
`368`	`368`	`continue;`
`369`	`369`	`}`
`370`	`370`
`371`		`- if (typeof(proto[prop]) !== "function") {`
	`371`	`+ if (!(typeof(proto[prop]) === "function")) {`
`372`	`372`	`continue;`
`373`	`373`	`}`
`374`	`374`