fixed tests

short_urls/tests/test_model.py

@@ -8,13 +8,13 @@ class UrlModelTestCase(TestCase):
  def setUpTestData(cls):
  Url.objects.create(
  long_url='http://test.ru/some-long-url-from-the-internet',
- short_url='test',
+ short_url_hash='test',
  password=00000,
  user_ip='0.0.0.0'
  )
 
  def test_url_model_str_method(self):
- url_obj = Url.objects.get(short_url='test')
+ url_obj = Url.objects.get(short_url_hash='test')
  self.assertEqual(
  url_obj.__str__(), '[http://test.ru/some-long-url-from-the-in] from ip [0.0.0.0]'
  )

short_urls/tests/test_views.py

@@ -12,7 +12,7 @@ def setUp(self):
 
  @classmethod
  def setUpTestData(cls):
- Url.objects.create(long_url='http://site.ru', short_url='hf6', password=0000, user_ip='0.0.0.0')
+ Url.objects.create(long_url='http://site.ru', short_url_hash='hf6', password=0000, user_ip='0.0.0.0')
 
  # status code 200 tests
  def test_url_cuccess_create_view_status_code_200(self):
@@ -30,23 +30,23 @@ def test_url_create_by_form_view_status_code_200(self):
  # this test does not work in django 3.2 properly
  # def test_url_open_view_status_code_200(self):
  # url_obj = Url.objects.first()
- # print(reverse('url-open', args=[url_obj.short_url]))
- # response = self.c.get(reverse('url-open', args=[url_obj.short_url]), follow=True)
+ # print(reverse('url-open', args=[url_obj.short_url_hash]))
+ # response = self.c.get(reverse('url-open', args=[url_obj.short_url_hash]), follow=True)
  # self.assertEqual(response.status_code, 200)
 
  def test_url_information_view_status_code_200(self):
  url_obj = Url.objects.first()
  response = self.c.get(
  reverse(
- 'url-information', kwargs={'short_url': url_obj.short_url, 'password': url_obj.password})
+ 'url-information', kwargs={'short_url_hash': url_obj.short_url_hash, 'password': url_obj.password})
  )
  self.assertEqual(response.status_code, 200)
 
  def test_url_delete_view_status_code_200(self):
  url_obj = Url.objects.first()
  response = self.c.get(
  reverse(
- 'url-information', kwargs={'short_url': url_obj.short_url, 'password': url_obj.password})
+ 'url-information', kwargs={'short_url_hash': url_obj.short_url_hash, 'password': url_obj.password})
  )
  self.assertEqual(response.status_code, 200)
 
@@ -63,7 +63,7 @@ def test_url_create_by_form_view_status_code_302(self):
 
  def test_url_open_view_status_code_302(self):
  url_obj = Url.objects.first()
- response = self.c.get(reverse('url-open', args=[url_obj.short_url]))
+ response = self.c.get(reverse('url-open', args=[url_obj.short_url_hash]))
  self.assertEqual(response.status_code, 302)
 
  # template used tests
@@ -90,28 +90,28 @@ def test_url_create_by_form_view_invalid_data_template_used(self):
  def test_url_information_view_password_is_correct_template_used(self):
  url_obj = Url.objects.first()
  response = self.c.get(reverse(
- 'url-information', kwargs={'short_url': url_obj.short_url, 'password': url_obj.password}
+ 'url-information', kwargs={'short_url_hash': url_obj.short_url_hash, 'password': url_obj.password}
  ))
  self.assertTemplateUsed(response, 'short_urls/url_information.html')
 
  def test_url_information_view_password_is_not_correct_template_used(self):
  url_obj = Url.objects.first()
  response = self.c.get(reverse(
- 'url-information', kwargs={'short_url': url_obj.short_url, 'password': 1234}
+ 'url-information', kwargs={'short_url_hash': url_obj.short_url_hash, 'password': 1234}
  ))
  self.assertTemplateUsed(response, 'short_urls/url_password_error.html')
 
  def test_url_delete_view_password_is_correct_template_used(self):
  url_obj = Url.objects.first()
  response = self.c.get(reverse(
- 'url-delete', kwargs={'short_url': url_obj.short_url, 'password': url_obj.password}
+ 'url-delete', kwargs={'short_url_hash': url_obj.short_url_hash, 'password': url_obj.password}
  ))
  self.assertTemplateUsed(response, 'short_urls/url_delete.html')
 
  def test_url_delete_view_password_is_not_correct_template_used(self):
  url_obj = Url.objects.first()
  response = self.c.get(reverse(
- 'url-delete', kwargs={'short_url': url_obj.short_url, 'password': 1234}
+ 'url-delete', kwargs={'short_url_hash': url_obj.short_url_hash, 'password': 1234}
  ))
  self.assertTemplateUsed(response, 'short_urls/url_password_error.html')
 
@@ -120,7 +120,7 @@ def test_url_create_success_view_context_data_is_correct_passed_from_url_create_
  response = self.c.get('/https://test-site.com', follow=True)
  url_obj = Url.objects.get(long_url='https://test-site.com')
  self.assertEqual(response.context.get('long_url'), url_obj.long_url)
- self.assertEqual(response.context.get('short_url'), url_obj.short_url)
+ self.assertEqual(response.context.get('short_url_hash'), url_obj.short_url_hash)
  self.assertEqual(response.context.get('password'), url_obj.password)
 
  def test_url_create_success_view_context_data_is_correct_passed_from_url_create_by_form_view(self):
@@ -129,19 +129,19 @@ def test_url_create_success_view_context_data_is_correct_passed_from_url_create_
  )
  url_obj = Url.objects.get(long_url='https://test-site-another.com')
  self.assertEqual(response.context.get('long_url'), url_obj.long_url)
- self.assertEqual(response.context.get('short_url'), url_obj.short_url)
+ self.assertEqual(response.context.get('short_url_hash'), url_obj.short_url_hash)
  self.assertEqual(response.context.get('password'), url_obj.password)
 
  def test_open_url_view_get_method_click_counter_works(self):
  url_open_view = UrlOpen()
- url_open_view.get(request=None, short_url='hf6')
- url_obj = Url.objects.get(short_url='hf6')
+ url_open_view.get(request=None, short_url_hash='hf6')
+ url_obj = Url.objects.get(short_url_hash='hf6')
  self.assertEqual(url_obj.clicks, 1)
 
  def test_url_information_view_get_context_data_method(self):
- url_obj = Url.objects.get(short_url='hf6')
+ url_obj = Url.objects.get(short_url_hash='hf6')
  response = self.c.get(
- reverse('url-information', kwargs={'short_url': 'hf6', 'password': 0000})
+ reverse('url-information', kwargs={'short_url_hash': 'hf6', 'password': 0000})
  )
  self.assertEqual(response.context_data.get('url_clicks'), url_obj.clicks)
  self.assertEqual(response.context_data.get('long_url'), url_obj.long_url)
@@ -151,7 +151,7 @@ def test_url_delete_view_get_method(self):
  url_obj = Url.objects.last()
  self.c.get(
  reverse('url-delete', kwargs={
- 'short_url': url_obj.short_url, 'password': url_obj.password
+ 'short_url_hash': url_obj.short_url_hash, 'password': url_obj.password
  })
  )
  url_obj.refresh_from_db()