enable setting query params in cuke tests

This commit is contained in:
Emil Tin 2014-07-22 11:50:31 +02:00
parent 11e6e74f09
commit 73b32bb45e
4 changed files with 7 additions and 3 deletions

View File

@ -47,3 +47,7 @@ end
Then /^stdout should contain (\d+) lines?$/ do |lines| Then /^stdout should contain (\d+) lines?$/ do |lines|
expect(@stdout.lines.count).to eq( lines.to_i ) expect(@stdout.lines.count).to eq( lines.to_i )
end end
Given (/^the query options$/) do |table|
@query_params = table.rows_hash
end

View File

@ -4,7 +4,7 @@ def test_routability_row i
a = Location.new @origin[0]+(1+WAY_SPACING*i)*@zoom, @origin[1] a = Location.new @origin[0]+(1+WAY_SPACING*i)*@zoom, @origin[1]
b = Location.new @origin[0]+(3+WAY_SPACING*i)*@zoom, @origin[1] b = Location.new @origin[0]+(3+WAY_SPACING*i)*@zoom, @origin[1]
r = {} r = {}
r[:response] = request_route direction=='forw' ? [a,b] : [b,a] r[:response] = request_route (direction=='forw' ? [a,b] : [b,a]), @query_params
r[:query] = @query r[:query] = @query
r[:json] = JSON.parse(r[:response].body) r[:json] = JSON.parse(r[:response].body)

View File

@ -7,7 +7,7 @@ When /^I route I should get$/ do |table|
got = {'request' => row['request'] } got = {'request' => row['request'] }
response = request_url row['request'] response = request_url row['request']
else else
params = {} params = @query_params
waypoints = [] waypoints = []
if row['from'] and row['to'] if row['from'] and row['to']
node = find_node_by_name(row['from']) node = find_node_by_name(row['from'])

View File

@ -18,7 +18,7 @@ Before do |scenario|
@scenario_title = scenario.scenario_outline.name @scenario_title = scenario.scenario_outline.name
end end
@query_params = {}
@scenario_time = Time.now.strftime("%Y-%m-%dT%H:%m:%SZ") @scenario_time = Time.now.strftime("%Y-%m-%dT%H:%m:%SZ")
reset_data reset_data
@has_logged_preprocess_info = false @has_logged_preprocess_info = false