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

fix regressions

Browse source
This commit is contained in:
Reinier Balt 2012-04-04 20:03:40 +02:00
parent c7637053e1
commit 8d6b9b5dbd
4 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/todos_controller.rb
View file

@ -573,7 +573,7 @@ class TodosController < ApplicationController
@source_view = 'deferred' @source_view = 'deferred'
@page_title = t('todos.deferred_tasks_title') @page_title = t('todos.deferred_tasks_title')
@contexts_to_show = @contexts = current_user.contexts.find(:all) @contexts_to_show = @contexts = current_user.contexts
includes = params[:format]=='xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES includes = params[:format]=='xml' ? [:context, :project] : Todo::DEFAULT_INCLUDES

4
app/views/projects/edit.js.erb
View file

@ -1,8 +1,8 @@
<% <%
selector_edit = "div##{dom_id(@project, 'edit')}" selector_edit = "div##{dom_id(@project, 'edit')}"
selector_edit = "div.project-edit-current " + selector unless @source_view="project" selector_edit = "div.project-edit-current " + selector_edit unless @source_view=="project"
selector_project = "div##{dom_id(@project)}" selector_project = "div##{dom_id(@project)}"
selector_project = "div.project-edit-current " + selector unless @source_view="project" selector_project = "div.project-edit-current " + selector_project unless @source_view=="project"
-%> -%>
function html_for_edit_form() { function html_for_edit_form() {

2
features/step_definitions/recurring_todo_steps.rb
View file

@ -73,6 +73,8 @@ When /^I mark the pattern "([^"]*)" as (complete|active)$/ do |pattern_name, sta
pattern.should_not be_nil pattern.should_not be_nil
pattern.completed?.should(state=="complete" ? be_false : be_true) pattern.completed?.should(state=="complete" ? be_false : be_true)
page.find("#check_#{pattern.id}").click page.find("#check_#{pattern.id}").click
wait_for_ajax
wait_for_animations_to_end
end end
When /^I follow the recurring todo link of "([^"]*)"$/ do |action_description| When /^I follow the recurring todo link of "([^"]*)"$/ do |action_description|

36
features/view_done.feature
View file

@ -113,7 +113,7 @@ Feature: Show done
Then I should be on the done recurring todos page Then I should be on the done recurring todos page
And the page should be "2" And the page should be "2"
@selenium @javascript @wip
Scenario: I can toggle a done recurring todo active from done page Scenario: I can toggle a done recurring todo active from done page
Given I have a completed repeat pattern "test pattern" Given I have a completed repeat pattern "test pattern"
When I go to the done recurring todos page When I go to the done recurring todos page
@ -123,7 +123,7 @@ Feature: Show done
When I go to the recurring todos page When I go to the recurring todos page
Then I should see "test pattern" in the active recurring todos container Then I should see "test pattern" in the active recurring todos container
@selenium @javascript
Scenario: I can delete a recurring todo from the done page Scenario: I can delete a recurring todo from the done page
Given I have a completed repeat pattern "test pattern" Given I have a completed repeat pattern "test pattern"
When I go to the done recurring todos page When I go to the done recurring todos page
@ -133,7 +133,7 @@ Feature: Show done
When I go to the recurring todos page When I go to the recurring todos page
Then I should not see "test pattern" in the active recurring todos container Then I should not see "test pattern" in the active recurring todos container
@selenium @javascript
Scenario Outline: I can toggle a todo active from the done pages Scenario Outline: I can toggle a todo active from the done pages
When I go to the <page> When I go to the <page>
Then I should see "todo 1" Then I should see "todo 1"
@ -153,7 +153,7 @@ Feature: Show done
| all done actions page for project "test project"| "test project" project | | | all done actions page for project "test project"| "test project" project | |
| all done actions page for tag "starred" | home page | in the context container for "@pc" | | all done actions page for tag "starred" | home page | in the context container for "@pc" |
@selenium @javascript
Scenario Outline: I can toggle the star of a todo from the done pages Scenario Outline: I can toggle the star of a todo from the done pages
When I go to the <page> When I go to the <page>
Then I should see a starred "todo 1" Then I should see a starred "todo 1"
@ -171,7 +171,7 @@ Feature: Show done
| all done actions page for project "test project"| | all done actions page for project "test project"|
| all done actions page for tag "starred" | | all done actions page for tag "starred" |
@selenium @javascript
Scenario: I can edit a project to active from the project done page Scenario: I can edit a project to active from the project done page
Given I have a completed project called "completed project" Given I have a completed project called "completed project"
When I go to the done projects page When I go to the done projects page
@ -181,7 +181,6 @@ Feature: Show done
When I go to the projects page When I go to the projects page
Then I should see "completed project" Then I should see "completed project"
Scenario Outline: All pages are internationalized Scenario Outline: All pages are internationalized
Given I set the locale to "<locale>" Given I set the locale to "<locale>"
When I go to the <page> When I go to the <page>
@ -221,12 +220,19 @@ Feature: Show done
| all done actions page for context "@pc" | es | | all done actions page for context "@pc" | es |
| all done actions page for project "test project"| es | | all done actions page for project "test project"| es |
| all done actions page for tag "starred" | es | | all done actions page for tag "starred" | es |
# fr locale needs changes from preference branch | done actions page | fr |
# | done actions page | fr | | all done actions page | fr |
# | all done actions page | fr | | done actions page for context "@pc" | fr |
# | done actions page for context "@pc" | fr | | done actions page for project "test project" | fr |
# | done actions page for project "test project" | fr | | done actions page for tag "starred" | fr |
# | done actions page for tag "starred" | fr | | all done actions page for context "@pc" | fr |
# | all done actions page for context "@pc" | fr | | all done actions page for project "test project"| fr |
# | all done actions page for project "test project"| fr | | all done actions page for tag "starred" | fr |
# | all done actions page for tag "starred" | fr | | done actions page | cz |
| all done actions page | cz |
| done actions page for context "@pc" | cz |
| done actions page for project "test project" | cz |
| done actions page for tag "starred" | cz |
| all done actions page for context "@pc" | cz |
| all done actions page for project "test project"| cz |
| all done actions page for tag "starred" | cz |