Skip to content

Commit

Permalink
Refactor testruns search view to class-based
Browse files Browse the repository at this point in the history
  • Loading branch information
RMadjev authored and atodorov committed Aug 31, 2019
1 parent 9a075cf commit 08c77ca
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
8 changes: 8 additions & 0 deletions tcms/testruns/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,14 @@ def test_search_page_is_shown(self):
response = self.client.get(self.search_runs_url)
self.assertContains(response, '<input id="id_summary" type="text"')

def test_search_page_is_shown_with_get_parameter_used(self):
product_id = str(self.product.id)
url = self.search_runs_url + '?product=' + product_id
response = self.client.get(url)
self.assertContains(response,
'<option value="' + product_id + '" selected>Kiwi</option>',
html=True)


class TestAddRemoveRunCC(BaseCaseRun):
"""Test view tcms.testruns.views.cc"""
Expand Down
2 changes: 1 addition & 1 deletion tcms/testruns/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
url(r'^case-run-update-status/$', views.UpdateCaseRunStatusView.as_view(),
name='testruns-update_caserun_status'),

url(r'^search/$', views.search, name='testruns-search'),
url(r'^search/$', views.SearchTestRunView.as_view(), name='testruns-search'),
]
18 changes: 10 additions & 8 deletions tcms/testruns/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,17 @@ def post(self, request):
return render(request, self.template_name, context_data)


@require_GET
def search(request): # pylint: disable=missing-permission-required
form = SearchRunForm(request.GET)
form.populate(product_id=request.GET.get('product'))
class SearchTestRunView(TemplateView): # pylint: disable=missing-permission-required

context_data = {
'form': form,
}
return render(request, 'testruns/search.html', context_data)
template_name = 'testruns/search.html'

def get_context_data(self, **kwargs):
form = SearchRunForm(self.request.GET)
form.populate(product_id=self.request.GET.get('product'))

return {
'form': form,
}


def _open_run_get_executions(request, run): # pylint: disable=missing-permission-required
Expand Down

0 comments on commit 08c77ca

Please sign in to comment.