From e3af8cb2e87f04b4b0c5c734b5506e3c89d86c19 Mon Sep 17 00:00:00 2001 From: Emil Tin Date: Mon, 8 Apr 2013 11:19:17 +0200 Subject: [PATCH] move name test --- features/bicycle/area.feature | 18 +----------------- features/bicycle/names.feature | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/features/bicycle/area.feature b/features/bicycle/area.feature index 24bfbe2db..5f23e182d 100644 --- a/features/bicycle/area.feature +++ b/features/bicycle/area.feature @@ -100,20 +100,4 @@ Feature: Bike - Squares and other areas | c | d | abcda | | d | c | abcda | | d | a | abcda | - | a | d | abcda | - - @area @name @todo - Scenario: Bike - name on - Given the node map - | x | a | b | y | - | | d | c | | - - And the ways - | nodes | highway | area | - | xaby | residential | | - | abcda | residential | yes | - - When I route I should get - | from | to | route | - | x | y | xaby | - | y | x | xaby | + | a | d | abcda | \ No newline at end of file diff --git a/features/bicycle/names.feature b/features/bicycle/names.feature index d1912472f..5064bf5dd 100644 --- a/features/bicycle/names.feature +++ b/features/bicycle/names.feature @@ -10,8 +10,8 @@ Feature: Bike - Street names in instructions | | c | And the ways - | nodes | name | - | ab | My Way | + | nodes | name | + | ab | My Way | | bc | Your Way | When I route I should get @@ -25,8 +25,24 @@ Feature: Bike - Street names in instructions And the ways | nodes | highway | name | | ab | cycleway | | - | bcd | track | | + | bcd | track | | When I route I should get | from | to | route | - | a | d | cycleway,track | \ No newline at end of file + | a | d | cycleway,track | + + @area @names @todo + Scenario: Bike - name on streets overlapping an area + Given the node map + | x | a | b | y | + | | d | c | | + + And the ways + | nodes | highway | area | + | xaby | residential | | + | abcda | residential | yes | + + When I route I should get + | from | to | route | + | x | y | xaby | + | y | x | xaby |