Merge branch 'master' into develop

skipoleschris · skipoleschris · commit 146ea149cea2 · 2011-09-16T17:50:44.000+01:00
diff --git a/src/main/scala/templemore/jruby/Cucumber.scala b/src/main/scala/templemore/jruby/Cucumber.scala
@@ -24,6 +24,6 @@ case class Cucumber(jRubyHome: File,
     def cuke4duke = (gemDir / "bin" / "cuke4duke").getPath
 
     jruby( (cuke4duke :: featuresDir.getPath :: "--require" :: requirePath.getPath :: "--color" :: Nil) ++
-           options ++ makeOptionsList(tags, "--tags") ++ makeOptionsList(names, "--names") )
+           options ++ makeOptionsList(tags, "--tags") ++ makeOptionsList(names, "--name") )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ case class Cucumber(jRubyHome: File,`
`24`	`24`	`def cuke4duke = (gemDir / "bin" / "cuke4duke").getPath`
`25`	`25`
`26`	`26`	`jruby( (cuke4duke :: featuresDir.getPath :: "--require" :: requirePath.getPath :: "--color" :: Nil) ++`
`27`		`- options ++ makeOptionsList(tags, "--tags") ++ makeOptionsList(names, "--names") )`
	`27`	`+ options ++ makeOptionsList(tags, "--tags") ++ makeOptionsList(names, "--name") )`
`28`	`28`	`}`
`29`	`29`	`}`