Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-29 21:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #1146

Browse source
This commit is contained in:
Reinier Balt 2011-04-19 17:22:23 +02:00
parent cb58318858
commit 4658ca8655
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/todos_helper.rb
View file

@ -234,7 +234,9 @@ module TodosHelper
}
page.project {
return (@todo.active? && @todo.project && @todo.project.id == @default_project.id) ||
(@todo.project.hidden? && @todo.project_hidden?) || @todo.deferred? || @todo.pending?
(@todo.project.hidden? && @todo.project_hidden?) ||
( @todo.deferred? && (@todo.project.id == @default_project.id) ) ||
@todo.pending?
}
end

10
features/shared_add_new_todo.feature
View file

@ -128,6 +128,16 @@ Feature: Add new next action from every page
When I go to the "another project" project
Then I should see "can you see me?"
@selenium
Scenario: Adding a deferred todo to another project does not show the todo
# scenario for #1146
Given I have a project called "another project"
When I go to the "test project" project
And I submit a deferred new action with description "a new next action" to project "another project" in the context "test context"
Then I should not see "a new next action"
And I submit a deferred new action with description "another new next action" to project "test project" in the context "test context"
Then I should see "another new next action"
@selenium
Scenario Outline: Adding a todo with a new context shows the new context
When I go to the <page>

4
features/step_definitions/todo_create_steps.rb
View file

@ -38,6 +38,10 @@ When /^I submit a new deferred action with description "([^"]*)" to project "([^
submit_next_action_form
end
When /^I submit a deferred new action with description "([^"]*)" to project "([^"]*)" in the context "([^"]*)"$/ do |description, project_name, context_name|
When "I submit a new deferred action with description \"#{description}\" to project \"#{project_name}\" with tags \"\" in the context \"#{context_name}\""
end
When /^I submit a new action with description "([^"]*)" to project "([^"]*)" with tags "([^"]*)" in the context "([^"]*)"$/ do |description, project_name, tags, context_name|
fill_in "todo[description]", :with => description