popular_proposals no está referenciado en elections

elections/tests/home_tests.py

@@ -4,16 +4,9 @@
 from elections.views import HomeView
 from elections.forms import ElectionSearchByTagsForm
 from elections.models import Election, Candidate
-from django.contrib.auth.forms import AuthenticationForm
-from backend_citizen.forms import (UserCreationForm as RegistrationForm,
-                                   GroupCreationForm)
-from popular_proposal.models import (ProposalTemporaryData,
-                                     PopularProposal)
 from elections.models import Area
 from django.contrib.auth.models import User
-import datetime
 from django.test import override_settings
-from django.utils import timezone
 
 
 class HomeTestCase(TestCase):
@@ -43,60 +36,9 @@ def test_get_home(self):
         self.assertIn('form', response.context)
         self.assertIsInstance(response.context['form'], ElectionSearchByTagsForm)
 
-    def test_home_view(self):
-        view = HomeView()
-        context = view.get_context_data()
-
-        self.assertIn('form', context)
-        self.assertIn('featured_elections', context)
-        self.assertIsInstance(context['form'], ElectionSearchByTagsForm)
-        self.assertIn('register_new_form', context)
-        self.assertIn('login_form', context)
-        self.assertIn('group_login_form', context)
-        self.assertIsInstance(context['register_new_form'], RegistrationForm)
-        self.assertIsInstance(context['login_form'], AuthenticationForm)
-        self.assertIsInstance(context['group_login_form'], GroupCreationForm)
-
     @override_settings(IMPORTANT_CANDIDATE_IN_LANDING=1)
     def test_if_candidate_in_settings_then_bring_it(self):
         view = HomeView()
         context = view.get_context_data()
         expected_candidate = Candidate.objects.get(id=1)
         self.assertEquals(context['important_candidate'], expected_candidate)
-
-    def test_counter_of_proposals(self):
-        a_day_ago = timezone.now() - datetime.timedelta(days=1)
-        ProposalTemporaryData.objects.create(proposer=self.fiera,
-                                             area=self.arica,
-                                             created=a_day_ago,
-                                             data=self.data)
-        ProposalTemporaryData.objects.create(proposer=self.fiera,
-                                             area=self.arica,
-                                             created=a_day_ago,
-                                             data=self.data)
-        PopularProposal.objects.create(proposer=self.fiera,
-                                       area=self.arica,
-                                       data=self.data,
-                                       created=a_day_ago,
-                                       title=u'This is a title',
-                                       clasification=u'education'
-                                       )
-        eight_days_ago = timezone.now() - datetime.timedelta(days=8)
-        p1 = PopularProposal.objects.create(proposer=self.fiera,
-                                            area=self.arica,
-                                            data=self.data,
-                                            title=u'This is a title',
-                                            clasification=u'education',
-                                            created=eight_days_ago
-                                            )
-        p1.created = eight_days_ago
-        p1.save()
-        p2 = ProposalTemporaryData.objects.create(proposer=self.fiera,
-                                                  area=self.arica,
-                                                  data=self.data,
-                                                  created=eight_days_ago)
-        p2.created = eight_days_ago
-        p2.save()
-        view = HomeView()
-        context = view.get_context_data()
-        self.assertEquals(context['total_proposals'], 2)

elections/views.py

@@ -10,11 +10,7 @@
 import logging
 from backend_citizen.forms import GroupCreationForm
 from candidator.models import Topic, TakenPosition
-from django.shortcuts import get_object_or_404
 from django.contrib.auth.forms import AuthenticationForm
-from backend_citizen.forms import UserCreationForm as RegistrationForm
-from popular_proposal.models import PopularProposal
-from popular_proposal.filters import ProposalWithoutAreaFilter
 from django_filters.views import FilterMixin
 from django.core.cache import cache
 from django.conf import settings
@@ -70,24 +66,8 @@ def get_context_data(self, **kwargs):
         context['featured_elections'] = featured_elections
 
         context['searchable_elections_enabled'] = True
-        context['register_new_form'] = RegistrationForm()
         context['login_form'] = AuthenticationForm()
         context['group_login_form'] = GroupCreationForm()
-        total_proposals = cache.get('total_proposals')
-        if total_proposals is None:
-            total_proposals = PopularProposal.objects.count()
-            cache.set('total_proposals', total_proposals, 600)
-        context['total_proposals'] = total_proposals
-        proposals_with_likers = cache.get('proposals_with_likers')
-        if proposals_with_likers is None:
-            proposals_with_likers = PopularProposal.ordered.by_likers()[:9]
-            cache.set('proposals_with_likers', proposals_with_likers, 600)
-        context['proposals_with_likers'] = proposals_with_likers
-        featured_proposals = cache.get('featured_proposals')
-        if featured_proposals is None:
-            featured_proposals = PopularProposal.objects.filter(featured=True).filter(content_type__app_label="popular_proposal")
-            cache.set('featured_proposals', featured_proposals, 600)
-        context['featured_proposals'] = featured_proposals
         featured_candidates = cache.get('featured_candidates')
         if featured_candidates is None:
             featured_candidates = Candidate.objects.filter(commitments__isnull=False).filter(elections__name="Presidencia")
@@ -221,10 +201,6 @@ def get_context_data(self, **kwargs):
         kwargs = {'data': initial or None,
                   'area': self.object
                   }
-        filterset = ProposalWithoutAreaFilter(**kwargs)
-        context['proposal_filter_form'] = filterset.form
-
-        context['popular_proposals'] = filterset.qs
         return context
 
     def get_queryset(self, *args, **kwargs):

popular_proposal/tests/popular_proposal_model_tests.py

@@ -125,35 +125,6 @@ def test_featured_proposals_are_first(self):
         proposals = PopularProposal.objects.all()
         self.assertEquals(p2, proposals.first())
 
-    def test_home_view_brings_featured_first(self):
-        p1 = PopularProposal.objects.create(proposer=self.fiera,
-                                            area=self.arica,
-                                            data=self.data,
-                                            title=u'This is a title1',
-                                            clasification=u'education'
-                                            )
-        p2 = PopularProposal.objects.create(proposer=self.fiera,
-                                            area=self.arica,
-                                            data=self.data,
-                                            title=u'This is a title2',
-                                            clasification=u'education',
-                                            featured=True
-                                            )
-        p3 = PopularProposal.objects.create(proposer=self.fiera,
-                                            area=self.arica,
-                                            data=self.data,
-                                            title=u'This is a title3',
-                                            clasification=u'education',
-                                            featured=True
-                                            )
-        url = reverse('home')
-        response = self.client.get(url)
-        featured_proposals = response.context['featured_proposals']
-        # this proposal has 4 likes
-        self.assertIn(p2, featured_proposals)
-        self.assertIn(p3, featured_proposals)
-        self.assertNotIn(p1, featured_proposals)
-
     def test_get_ribbon_text(self):
         p1 = PopularProposal.objects.create(proposer=self.fiera,
                                             area=self.arica,

popular_proposal/tests/subscription_tests.py

@@ -363,14 +363,3 @@ def test_manager_order_by_likes(self):
         self.assertEquals(ps.all()[2], self.proposal1)
         # this proposal has 4 likes
         self.assertEquals(ps.all()[3], self.proposal3)
-
-    def test_get_home_with_the_proposals(self):
-        url = reverse('home')
-        response = self.client.get(url)
-        ps = response.context['proposals_with_likers']
-        # this proposal has 4 likes
-        self.assertEquals(ps.all()[0], self.proposal2)
-        # this proposal has 4 likes
-        self.assertEquals(ps.all()[1], self.proposal4)
-        # this proposal has 4 likes
-        self.assertEquals(ps.all()[2], self.proposal1)

popular_proposal/tests/views_tests.py

@@ -163,35 +163,6 @@ def test_filtering_form_by_area(self):
         form = filterset.form
         self.assertTrue(form.is_valid())
 
-    def test_area_detail_view_brings_proposals(self):
-        url = self.algarrobo.get_absolute_url()
-        response = self.client.get(url)
-        self.assertIn(self.popular_proposal1,
-                      response.context['popular_proposals'])
-        self.assertIn(self.popular_proposal2,
-                      response.context['popular_proposals'])
-
-    def test_get_area_with_form(self):
-        url = self.algarrobo.get_absolute_url()
-        response = self.client.get(url)
-        self.assertIsInstance(response.context['proposal_filter_form'],
-                              Form)
-        self.assertIn(self.popular_proposal1,
-                      response.context['popular_proposals'])
-
-        self.assertIn(self.popular_proposal2,
-                      response.context['popular_proposals'])
-        clasification_id = TOPIC_CHOICES[2][0]
-        response = self.client.get(url, {'clasification': clasification_id})
-        form = response.context['proposal_filter_form']
-        self.assertEquals(form.fields['clasification'].initial,
-                          clasification_id)
-        self.assertNotIn(self.popular_proposal1,
-                         response.context['popular_proposals'])
-
-        self.assertIn(self.popular_proposal2,
-                      response.context['popular_proposals'])
-
 
 class ProposalFilterTestsCase(PopularProposalTestCaseBase):
     def setUp(self):

elections/tests/template_tags_tests.py → votai_general_theme/tests/template_tags_tests.py

@@ -18,8 +18,6 @@
 from popular_proposal.models import PopularProposal, Commitment
 from popular_proposal.forms.form_texts import TOPIC_CHOICES
 from django.test import override_settings
-from django.shortcuts import render
-from constance import config
 from constance.test import override_config
 
 class TemplateTagsTestCase(TestCase):