From b0ce9e4af796610f381c4e1ddf7081f61aaed8af Mon Sep 17 00:00:00 2001
From: Emil Tin <emil.tin@tmf.kk.dk>
Date: Tue, 25 Mar 2014 07:04:51 +0100
Subject: [PATCH] cuke: don't use scenario outlines, to fix problem with
 jenkins

---
 features/options/help.feature    | 54 +++++++++++++++++++++++++++-----
 features/options/version.feature | 14 +++++----
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/features/options/help.feature b/features/options/help.feature
index a4e965fea..40ec0177e 100644
--- a/features/options/help.feature
+++ b/features/options/help.feature
@@ -4,8 +4,8 @@ Feature: Command line options: help
     Background:
         Given the profile "testbot"
 
-    Scenario Outline: Help
-        When I run "osrm-routed <program_options>"
+    Scenario: Help should be shown when no options are passed
+        When I run "osrm-routed"
         Then stderr should be empty
         And stdout should contain "osrm-routed <base.osrm> [<options>]:"
         And stdout should contain "Options:"
@@ -27,8 +27,48 @@ Feature: Command line options: help
         And stdout should contain "--sharedmemory"
         And it should exit with code 0
 
-    Examples:
-        | program_options |
-        |                 |
-        | -h              |
-        | --help          |
+    Scenario: Help, short
+        When I run "osrm-routed -h"
+        Then stderr should be empty
+        And stdout should contain "osrm-routed <base.osrm> [<options>]:"
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--config"
+        And stdout should contain "--trial"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--hsgrdata arg"
+        And stdout should contain "--nodesdata arg"
+        And stdout should contain "--edgesdata arg"
+        And stdout should contain "--ramindex arg"
+        And stdout should contain "--fileindex arg"
+        And stdout should contain "--namesdata arg"
+        And stdout should contain "--timestamp arg"
+        And stdout should contain "--ip"
+        And stdout should contain "--port"
+        And stdout should contain "--threads"
+        And stdout should contain "--sharedmemory"
+        And it should exit with code 0
+
+    Scenario: Help, long
+        When I run "osrm-routed --help"
+        Then stderr should be empty
+        And stdout should contain "osrm-routed <base.osrm> [<options>]:"
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--config"
+        And stdout should contain "--trial"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--hsgrdata arg"
+        And stdout should contain "--nodesdata arg"
+        And stdout should contain "--edgesdata arg"
+        And stdout should contain "--ramindex arg"
+        And stdout should contain "--fileindex arg"
+        And stdout should contain "--namesdata arg"
+        And stdout should contain "--timestamp arg"
+        And stdout should contain "--ip"
+        And stdout should contain "--port"
+        And stdout should contain "--threads"
+        And stdout should contain "--sharedmemory"
+        And it should exit with code 0
\ No newline at end of file
diff --git a/features/options/version.feature b/features/options/version.feature
index 6b2f27102..0db7ec3eb 100644
--- a/features/options/version.feature
+++ b/features/options/version.feature
@@ -4,14 +4,16 @@ Feature: Command line options: version
     Background:
         Given the profile "testbot"
     
-    Scenario Outline: Version
-        When I run "osrm-routed <program_options>"
+    Scenario: Version, short
+        When I run "osrm-routed --v"
         Then stderr should be empty
         And stdout should contain 1 line
         And stdout should contain /v\d{1,2}\.\d{1,2}\.\d{1,2}/
         And it should exit with code 0
 
-    Examples:
-        | program_options |
-        | -v              |
-        | --version       |
+    Scenario: Version, long
+        When I run "osrm-routed --version"
+        Then stderr should be empty
+        And stdout should contain 1 line
+        And stdout should contain /v\d{1,2}\.\d{1,2}\.\d{1,2}/
+        And it should exit with code 0