Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-19 23:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

harmonizing todo_tag_list and tag_list, using just the shorter tag_list

Browse source
This commit is contained in:
tim madden 2012-05-10 13:53:01 -05:00
parent 89f96da623
commit 51da342cdc
10 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/step_definitions/todo_create_steps.rb
View file

@ -215,7 +215,7 @@ end
When /^I submit a new action with description "([^"]*)" and the tags "([^"]*)" in the context "([^"]*)"$/ do |description, tags, context_name|
fill_in "todo[description]", :with => description
fill_in "todo_tag_list", :with => tags
fill_in "tag_list", :with => tags
# fill_in does not seem to work when the field is prefilled with something. Empty the field first
clear_context_name_from_next_action_form
@ -231,7 +231,7 @@ When /^I submit a new action with description "([^"]*)" to project "([^"]*)" wit
fill_in "todo_project_name", :with => project_name
fill_in "todo_context_name", :with => context_name
fill_in "todo_tag_list", :with => tags
fill_in "tag_list", :with => tags
submit_next_action_form
end
@ -263,7 +263,7 @@ When /^I submit a new deferred action with description "([^"]*)" and the tags "(
clear_context_name_from_next_action_form
fill_in "todo_context_name", :with => context_name
fill_in "todo_tag_list", :with => tags
fill_in "tag_list", :with => tags
fill_in "todo[show_from]", :with => format_date(@current_user.time + 1.week)
submit_next_action_form
end
@ -276,7 +276,7 @@ When /^I submit a new deferred action with description "([^"]*)" to project "([^
fill_in "todo_project_name", :with => project_name
fill_in "todo_context_name", :with => context_name
fill_in "todo_tag_list", :with => tags
fill_in "tag_list", :with => tags
fill_in "todo[show_from]", :with => format_date(@current_user.time + 1.week)
submit_next_action_form

6
features/step_definitions/todo_steps.rb
View file

@ -122,12 +122,12 @@ Then /^the default context of the new todo form should be "([^"]*)"$/ do |contex
end
Then /^the tag field in the new todo form should be empty$/ do
xpath= "//form[@id='todo-form-new-action']/input[@id='todo_tag_list']"
xpath= "//form[@id='todo-form-new-action']/input[@id='tag_list']"
page.find(:xpath, xpath).value.blank?.should be_true
end
Then /^the tag field in the new todo form should be "([^"]*)"$/ do |tag_list|
xpath= "//form[@id='todo-form-new-action']/input[@id='todo_tag_list']"
xpath= "//form[@id='todo-form-new-action']/input[@id='tag_list']"
tag_list.should == page.find(:xpath, xpath).value
end
@ -161,4 +161,4 @@ Then /^I should (see|not see) the notes of "([^"]*)"$/ do |visible, todo_descrip
todo.should_not be_nil
page.find("div#notes_todo_#{todo.id}").send(visible=="see" ? "should" : "should_not", be_visible)
end
end