Skip to content

Commit

Permalink
Correct timer urls to use plural form
Browse files Browse the repository at this point in the history
  • Loading branch information
cdubz committed Feb 7, 2020
1 parent 6333b0b commit 005a4f1
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
6 changes: 3 additions & 3 deletions core/tests/tests_forms.py
Expand Up @@ -474,7 +474,7 @@ def test_add(self):
'name': 'Test Timer',
'start': self.localtime_string()
}
page = self.c.post('/timer/add/', params, follow=True)
page = self.c.post('/timers/add/', params, follow=True)
self.assertEqual(page.status_code, 200)
self.assertContains(page, params['name'])
self.assertContains(page, params['child'])
Expand All @@ -485,7 +485,7 @@ def test_edit(self):
'name': 'New Timer Name',
'start': self.localtime_string(start_time)
}
page = self.c.post('/timer/{}/edit/'.format(self.timer.id), params,
page = self.c.post('/timers/{}/edit/'.format(self.timer.id), params,
follow=True)
self.assertEqual(page.status_code, 200)
self.assertContains(page, params['name'])
Expand All @@ -500,7 +500,7 @@ def test_edit_stopped(self):
'start': self.localtime_string(self.timer.start),
'end': self.localtime_string(self.timer.end),
}
page = self.c.post('/timer/{}/edit/'.format(self.timer.id), params,
page = self.c.post('/timers/{}/edit/'.format(self.timer.id), params,
follow=True)
self.assertEqual(page.status_code, 200)

Expand Down
14 changes: 7 additions & 7 deletions core/tests/tests_views.py
Expand Up @@ -112,21 +112,21 @@ def test_temperature_views(self):
def test_timer_views(self):
page = self.c.get('/timers/')
self.assertEqual(page.status_code, 200)
page = self.c.get('/timer/add/')
page = self.c.get('/timers/add/')
self.assertEqual(page.status_code, 200)

page = self.c.get('/timer/add/quick/')
page = self.c.get('/timers/add/quick/')
self.assertEqual(page.status_code, 302)
entry = models.Timer.objects.first()
page = self.c.get('/timer/{}/'.format(entry.id))
page = self.c.get('/timers/{}/'.format(entry.id))
self.assertEqual(page.status_code, 200)
page = self.c.get('/timer/{}/edit/'.format(entry.id))
page = self.c.get('/timers/{}/edit/'.format(entry.id))
self.assertEqual(page.status_code, 200)
page = self.c.get('/timer/{}/delete/'.format(entry.id))
page = self.c.get('/timers/{}/delete/'.format(entry.id))
self.assertEqual(page.status_code, 200)
page = self.c.get('/timer/{}/stop/'.format(entry.id))
page = self.c.get('/timers/{}/stop/'.format(entry.id))
self.assertEqual(page.status_code, 302)
page = self.c.get('/timer/{}/restart/'.format(entry.id))
page = self.c.get('/timers/{}/restart/'.format(entry.id))
self.assertEqual(page.status_code, 302)

def test_tummytime_views(self):
Expand Down
18 changes: 11 additions & 7 deletions core/urls.py
Expand Up @@ -94,26 +94,30 @@
),

path('timers/', views.TimerList.as_view(), name='timer-list'),
path('timer/add/', views.TimerAdd.as_view(), name='timer-add'),
path('timers/add/', views.TimerAdd.as_view(), name='timer-add'),
path(
'timer/add/quick/',
'timers/add/quick/',
views.TimerAddQuick.as_view(),
name='timer-add-quick'
),
path('timer/<int:pk>/', views.TimerDetail.as_view(), name='timer-detail'),
path('timers/<int:pk>/', views.TimerDetail.as_view(), name='timer-detail'),
path(
'timer/<int:pk>/edit/',
'timers/<int:pk>/edit/',
views.TimerUpdate.as_view(),
name='timer-update'
),
path(
'timer/<int:pk>/delete/',
'timers/<int:pk>/delete/',
views.TimerDelete.as_view(),
name='timer-delete'
),
path('timer/<int:pk>/stop/', views.TimerStop.as_view(), name='timer-stop'),
path(
'timer/<int:pk>/restart/',
'timers/<int:pk>/stop/',
views.TimerStop.as_view(),
name='timer-stop'
),
path(
'timers/<int:pk>/restart/',
views.TimerRestart.as_view(),
name='timer-restart'
),
Expand Down

0 comments on commit 005a4f1

Please sign in to comment.