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

Merge pull request #1757 from C-Otto/typos

Browse source 
Fix typos and an error message description
This commit is contained in:
Dan Rice 2015-02-10 09:23:14 -05:00
commit d1cd4b68eb
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/recurring_todos_controller.rb
View file

@ -157,7 +157,7 @@ class RecurringTodosController < ApplicationController
:recurring_show_always, :weekly_every_x_week, :weekly_return_monday, :recurring_show_always, :weekly_every_x_week, :weekly_return_monday,
:yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day, :yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day,
:yearly_month_of_year2, :yearly_month_of_year, :yearly_month_of_year2, :yearly_month_of_year,
# derived attribues # derived attributes
:weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday, :weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday,
:weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday :weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday
) )

2
features/logging_in.feature
View file

@ -9,7 +9,7 @@ Feature: Existing user logging in
| testuser | secret | false | Test | User | | testuser | secret | false | Test | User |
| admin | secret | true | Admin | User | | admin | secret | true | Admin | User |
Scenario Outline: Succesfull and unsuccesfull login Scenario Outline: Successful and unsuccessful login
When I go to the login page When I go to the login page
And I submit the login form as user "<user>" with password "<password>" And I submit the login form as user "<user>" with password "<password>"
Then I should be <there> Then I should be <there>

4
test/controllers/todos_controller_test.rb
View file

@ -776,7 +776,7 @@ class TodosControllerTest < ActionController::TestCase
todo = Todo.find(todo.id) #reload does not seem to work here todo = Todo.find(todo.id) #reload does not seem to work here
assert todo.completed? assert todo.completed?
# Then there should not be an active todo beloning to the repeat pattern # Then there should not be an active todo belonging to the repeat pattern
next_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'active').first next_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'active').first
assert next_todo.nil? assert next_todo.nil?
@ -814,7 +814,7 @@ class TodosControllerTest < ActionController::TestCase
todo.reload todo.reload
assert todo.completed? assert todo.completed?
# Then there should not be an active todo beloning to the repeat pattern # Then there should not be an active todo belonging to the repeat pattern
next_todo = Todo.where(:recurring_todo_id => recurring_todo.id, :state => 'active').first next_todo = Todo.where(:recurring_todo_id => recurring_todo.id, :state => 'active').first
assert next_todo.nil? assert next_todo.nil?

2
test/models/recurring_todo_test.rb
View file

@ -29,7 +29,7 @@ class RecurringTodoTest < ActiveSupport::TestCase
# assume that target due_date works fine, i.e. don't do the same tests over # assume that target due_date works fine, i.e. don't do the same tests over
@every_day.target='show_from_date' @every_day.target='show_from_date'
# when recurrence is targeted on show_from, due date shoult remain nil # when recurrence is targeted on show_from, due date should remain nil
assert_equal nil, @every_day.get_due_date(nil) assert_equal nil, @every_day.get_due_date(nil)
assert_equal nil, @every_day.get_due_date(@today-3.days) assert_equal nil, @every_day.get_due_date(@today-3.days)

2
test/models/recurring_todos/yearly_repeat_pattern_test.rb
View file

@ -30,7 +30,7 @@ module RecurringTodos
assert builder.save, "should save: #{builder.errors.full_messages}" assert builder.save, "should save: #{builder.errors.full_messages}"
rt = builder.saved_recurring_todo rt = builder.saved_recurring_todo
assert builder.pattern.is_a?(YearlyRepeatPattern), "should be monthly pattern, but is #{builder.pattern.class}" assert builder.pattern.is_a?(YearlyRepeatPattern), "should be yearly pattern, but is #{builder.pattern.class}"
assert_equal rt.recurrence_selector, builder.pattern.recurrence_selector assert_equal rt.recurrence_selector, builder.pattern.recurrence_selector
assert_equal rt.every_other2, builder.pattern.month_of_year assert_equal rt.every_other2, builder.pattern.month_of_year