From 681d05f8f45e722f6b2057e9174ec56ba6e6b705 Mon Sep 17 00:00:00 2001
From: Emil Tin <emil@tin.dk>
Date: Sun, 30 Sep 2012 13:17:19 +0200
Subject: [PATCH] minor updates of weight tests

---
 features/weight.feature | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/features/weight.feature b/features/weight.feature
index 40ae95864..4b82c0f5e 100644
--- a/features/weight.feature
+++ b/features/weight.feature
@@ -1,6 +1,9 @@
 @routing @weight
 Feature: Choosing route based on length, speed, etc
 	
+	Background:
+		Given the speedprofile "testbot"
+	
 	Scenario: Pick the geometrically shortest route, way types being equal
 		Given the node map
 		 |   | s |   |
@@ -8,22 +11,27 @@ Feature: Choosing route based on length, speed, etc
 		 | a |   | b |
 
 		And the ways
-		 | nodes |
-		 | atb   |
-		 | asb   |
+		 | nodes | highway |
+		 | atb   | primary |
+		 | asb   | primary |
 
 		When I route I should get
 		 | from | to | route |
 		 | a    | b  | atb   |
-		 | a    | b  | atb   |
+		 | b    | a  | atb   |
 
-	Scenario: Pick the fastest way type, lengths being equal
+	Scenario: Pick  the shortest travel time, even when it's longer
 		Given the node map
-		 | a | s |
-		 | p | b |
-	
+		 |   | p |   |
+		 | a | s | b |
+
 		And the ways
 		 | nodes | highway   |
 		 | apb   | primary   |
 		 | asb   | secondary |
 
+		When I route I should get
+		 | from | to | route |
+		 | a    | b  | apb   |
+		 | b    | a  | apb   |
+