Fix broken method chains on methods donated by modules

adambeynon · adambeynon · commit 2c13270f71d4 · 2014-11-27T13:04:03.000Z
diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -935,10 +935,23 @@
         }
         else if (dest.hasOwnProperty(jsid) && !current.$$stub) {
           // target class includes another module that has defined this method
-          // FIXME: we should resolve the order of modules to check if we
-          // should define it
-          dest[jsid] = body;
-          dest[jsid].$$donated = true;
+          var klass_includees = includee.$$inc;
+
+          for (var j = 0, jj = klass_includees.length; j < jj; j++) {
+            if (klass_includees[j] === current.$$owner) {
+              var current_owner_index = j;
+            }
+            if (klass_includees[j] === module) {
+              var module_index = j;
+            }
+          }
+
+          // only redefine method on class if the module was included AFTER
+          // the module which defined the current method body
+          if (current_owner_index < module_index) {
+            dest[jsid] = body;
+            dest[jsid].$$donated = true;
+          }
         }
         else {
           // neither a class, or module included by class, has defined method
diff --git a/spec/filters/bugs/module.rb b/spec/filters/bugs/module.rb
@@ -24,4 +24,5 @@
   fails "Module#module_function with specific method names can make accessible private methods"
   fails "Module#module_function as a toggle (no arguments) in a Module body does not affect module_evaled method definitions also if outside the eval itself"
   fails "Module#module_function as a toggle (no arguments) in a Module body has no effect if inside a module_eval if the definitions are outside of it"
+  fails "Module#module_function with specific method names creates an independent copy of the method, not a redirect"
 end
