Merge PR #768, which solves #761. Update History.md

cucumber · Sep 3, 2014 · 48f95df · 48f95df
2 parents 8e232b4 + 98a45a4
commit 48f95df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/History.md b/History.md
@@ -1,5 +1,6 @@
 ## [1.2.0-SNAPSHOT (Git master)](https://github.com/cucumber/cucumber-jvm/compare/v1.1.8...master) (Not released)
 
+* [Scala] Fixing randomly failing tests in the Scala module ([#768](https://github.com/cucumber/cucumber-jvm/pull/768), [#761](https://github.com/cucumber/cucumber-jvm/issues/761) Manuel Bernhardt)
 * [JRuby] cucumber-jruby backend fails to build when `RUBY_VERSION` is present in environment ([#718](https://github.com/cucumber/cucumber-jvm/issues/718) Aslak Hellesøy)
 * [Core] `DataTable.asMap()` returns a `LinkedHashMap`, ensuring key iteration order is the same as in the gherkin table ([#764](https://github.com/cucumber/cucumber-jvm/issues/764) Aslak Hellesøy).
 * [Core] Spring dirty cukes test fix ([#708](https://github.com/cucumber/cucumber-jvm/pull/708) Mykola Gurov)

diff --git a/scala/src/main/scala/cucumber/api/scala/ScalaDsl.scala b/scala/src/main/scala/cucumber/api/scala/ScalaDsl.scala
@@ -492,6 +492,6 @@ trait ScalaDsl { self =>
     }
 
     private def functionParams(f: Any) =
-      f.getClass.getDeclaredMethods.filterNot(_.isBridge).head.getGenericParameterTypes
+      f.getClass.getDeclaredMethods.filter(m => "apply".equals(m.getName) && !m.isBridge).head.getGenericParameterTypes
   }
 }