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

rename repeating -> recurring, repeat -> recurrence

Browse source
This commit is contained in:
Carsten Otto 2015-02-10 16:25:27 +01:00
parent ab02d09830
commit dfe8735c0d
35 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/logging_in.feature
View file

@ -35,7 +35,7 @@ Feature: Existing user logging in
| contexts page | contexts page | Logout (Test User) |
| projects page | projects page | Logout (Test User) |
| notes page | notes page | Logout (Test User) |
| repeating todos page | repeating todos page | Logout (Test User) |
| recurring todos page | recurring todos page | Logout (Test User) |
| statistics page | statistics page | Logout (Test User) |
| manage users page | manage users page | 401 Unauthorized |
| integrations page | integrations page | Logout (Test User) |

34
features/recurring_todos.feature
View file

@ -1,7 +1,7 @@
Feature: Manage recurring todos
In order to manage repeating todos
In order to manage recurring todos
As a Tracks user
I want to view, edit, add, or remove recurrence patterns of repeating todos
I want to view, edit, add, or remove recurrence patterns of recurring todos
Background:
Given the following user record
@ -9,11 +9,11 @@ Feature: Manage recurring todos
| testuser | secret | false |
And I have logged in as "testuser" with password "secret"
And I have a context called "test context"
And I have a repeat pattern called "run tests"
And I have a recurrence pattern called "run tests"
@javascript
Scenario: Being able to select daily, weekly, monthly and yearly pattern
When I go to the repeating todos page
When I go to the recurring todos page
And I follow "Add a new recurring action"
Then I should see the form for "Daily" recurrence pattern
When I select "Weekly" recurrence pattern
@ -26,27 +26,27 @@ Feature: Manage recurring todos
Then I should see the form for "Daily" recurrence pattern
@javascript
Scenario: I can mark a repeat pattern as starred
When I go to the repeating todos page
Scenario: I can mark a recurrence pattern as starred
When I go to the recurring todos page
And I star the pattern "run tests"
Then the pattern "run tests" should be starred
@javascript
Scenario: I can edit a repeat pattern
When I go to the repeating todos page
Scenario: I can edit a recurrence pattern
When I go to the recurring todos page
And I edit the name of the pattern "run tests" to "report test results"
Then the pattern "report test results" should be in the state list "active"
And I should not see "run tests"
@javascript
Scenario: I can delete a repeat pattern
When I go to the repeating todos page
Scenario: I can delete a recurrence pattern
When I go to the recurring todos page
And I delete the pattern "run tests"
And I should not see "run tests"
@javascript
Scenario: I can mark a repeat pattern as done
When I go to the repeating todos page
Scenario: I can mark a recurrence pattern as done
When I go to the recurring todos page
Then the pattern "run tests" should be in the state list "active"
And the state list "completed" should be empty
When I mark the pattern "run tests" as complete
@ -54,9 +54,9 @@ Feature: Manage recurring todos
And the state list "active" should be empty
@javascript
Scenario: I can reactivate a repeat pattern
Given I have a completed repeat pattern "I'm done"
When I go to the repeating todos page
Scenario: I can reactivate a recurrence pattern
Given I have a completed recurrence pattern "I'm done"
When I go to the recurring todos page
Then the pattern "I'm done" should be in the state list "completed"
When I mark the pattern "I'm done" as active
Then the pattern "I'm done" should be in the state list "active"
@ -67,11 +67,11 @@ Feature: Manage recurring todos
When I go to the home page
Then I should see the todo "run tests"
When I follow the recurring todo link of "run tests"
Then I should be on the repeating todos page
Then I should be on the recurring todos page
@javascript
Scenario: Deleting a recurring todo with ending pattern will show message
When I go to the repeating todos page
When I go to the recurring todos page
And I mark the pattern "run tests" as complete
And I go to the home page
Then I should see "run tests"

22
features/step_definitions/container_steps.rb
View file

@ -111,27 +111,27 @@ Then /^I should see "([^"]*)" in the due next month container$/ do |todo_descrip
end
end
####### Repeat patterns #######
####### Recurrence patterns #######
Then /^I should (see|not see) "([^"]*)" in the active recurring todos container$/ do |visibility, repeat_pattern|
repeat = @current_user.recurring_todos.where(:description => repeat_pattern).first
Then /^I should (see|not see) "([^"]*)" in the active recurring todos container$/ do |visibility, recurrence_pattern|
recurrence = @current_user.recurring_todos.where(:description => recurrence_pattern).first
unless repeat.nil?
xpath = "//div[@id='active_recurring_todos_container']//div[@id='recurring_todo_#{repeat.id}']"
unless recurrence.nil?
xpath = "//div[@id='active_recurring_todos_container']//div[@id='recurring_todo_#{recurrence.id}']"
check_xpath_visibility(visibility, xpath)
else
step "I should #{visibility} \"#{repeat_pattern}\""
step "I should #{visibility} \"#{recurrence_pattern}\""
end
end
Then /^I should (see|not see) "([^"]*)" in the completed recurring todos container$/ do |visible, repeat_pattern|
repeat = @current_user.todos.where(:description => repeat_pattern).first
Then /^I should (see|not see) "([^"]*)" in the completed recurring todos container$/ do |visible, recurrence_pattern|
recurrence = @current_user.todos.where(:description => recurrence_pattern).first
unless repeat.nil?
xpath = "//div[@id='completed_recurring_todos_container']//div[@id='recurring_todo_#{repeat.id}']"
unless recurrence.nil?
xpath = "//div[@id='completed_recurring_todos_container']//div[@id='recurring_todo_#{recurrence.id}']"
check_xpath_visibility(visible, xpath)
else
step "I should #{visible} \"#{repeat_pattern}\""
step "I should #{visible} \"#{recurrence_pattern}\""
end
end

2
features/step_definitions/context_list_steps.rb
View file

@ -4,7 +4,7 @@ When /^I delete the context "([^\"]*)"$/ do |context_name|
handle_js_confirm do
click_link "delete_context_#{context.id}"
end
expect(get_confirm_text).to eq("Are you sure that you want to delete the context '#{context_name}'? Be aware that this will also delete all (repeating) actions in this context!")
expect(get_confirm_text).to eq("Are you sure that you want to delete the context '#{context_name}'? Be aware that this will also delete all (recurring) actions in this context!")
# wait until the context is removed
expect(page).to_not have_css("a#delete_context_#{context.id}")

10
features/step_definitions/recurring_todo_steps.rb
View file

@ -1,4 +1,4 @@
Given /^I have a repeat pattern called "([^"]*)"$/ do |pattern_name|
Given /^I have a recurrence pattern called "([^"]*)"$/ do |pattern_name|
context = @current_user.contexts.first
@recurring_todo = @current_user.recurring_todos.create!(
@ -21,15 +21,15 @@ Given /^I have a repeat pattern called "([^"]*)"$/ do |pattern_name|
:recurring_todo_id => @recurring_todo.id)
end
Given /^I have a completed repeat pattern "([^"]*)"$/ do |pattern_name|
step "I have a repeat pattern called \"#{pattern_name}\""
Given /^I have a completed recurrence pattern "([^"]*)"$/ do |pattern_name|
step "I have a recurrence pattern called \"#{pattern_name}\""
@recurring_todo.toggle_completion!
expect(@recurring_todo.completed?).to be true
end
Given /^I have (\d+) completed repeat patterns$/ do |number_of_patterns|
Given /^I have (\d+) completed recurrence patterns$/ do |number_of_patterns|
1.upto number_of_patterns.to_i do |i|
step "I have a completed repeat pattern \"Repeating Todo #{i}\""
step "I have a completed recurrence pattern \"Recurring Todo #{i}\""
end
end

2
features/support/paths.rb
View file

@ -74,7 +74,7 @@ module NavigationHelpers
projects_path(options)
when /the manage users page/
users_path(options)
when /the repeating todos page/
when /the recurring todos page/
recurring_todos_path(options)
when /the integrations page/
integrations_path(options)

10
features/view_done.feature
View file

@ -16,7 +16,7 @@ Feature: Show done
When I go to the done page
Then I should see "Last Completed Actions"
And I should see "Last Completed Projects"
And I should see "Last Completed Repeating Actions"
And I should see "Last Completed Recurring Actions"
Scenario Outline: Page with actions links to show all completed actions
When I go to the <page>
@ -95,7 +95,7 @@ Feature: Show done
And the page should be "2"
Scenario: The recurring todos page shows a link to all completed recurring todos
Given I have a completed repeat pattern "finished"
Given I have a completed recurrence pattern "finished"
When I go to the recurring todos page
Then I should see "finished"
And I should see "Show all"
@ -104,7 +104,7 @@ Feature: Show done
And I should see "finished"
Scenario: I can browse all completed recurring todos by page
Given I have 40 completed repeat patterns
Given I have 40 completed recurrence patterns
When I go to the recurring todos page
And I follow "Show all"
Then I should see the page selector
@ -115,7 +115,7 @@ Feature: Show done
@javascript
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 recurrence pattern "test pattern"
When I go to the done recurring todos page
Then I should see "test pattern"
When I mark the pattern "test pattern" as active
@ -125,7 +125,7 @@ Feature: Show done
@javascript
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 recurrence pattern "test pattern"
When I go to the done recurring todos page
Then I should see "test pattern"
When I delete the pattern "test pattern"