Fix username and e-mail visual bug in user setup

.gitignore

@@ -4,3 +4,4 @@
 .DS_Store
 media/
 staticfiles
+.idea

project/api/models/account.py

@@ -218,8 +218,15 @@ def resize_profile_image(self):
         tmp_image_file = StringIO.StringIO()
         profile_image.save(tmp_image_file, 'JPEG', quality=90)
         tmp_image_file.seek(0)
-        self.profile_image = InMemoryUploadedFile(tmp_image_file, 'ImageField', self.profile_image.name, 'image/jpeg', tmp_image_file.len, None)
 
+        self.profile_image = InMemoryUploadedFile(
+            tmp_image_file,
+            'ImageField',
+            self.profile_image.name,
+            'image/jpeg',
+            tmp_image_file.len,
+            None
+        )
 
         # Make a Thumbnail Image for the new resized image
         thumb_image = profile_image.copy()

project/api/models/activity.py

@@ -1,4 +1,5 @@
 from django.db import models
+
 from .account import Account
 from .civi import Civi
 from .thread import Thread

project/api/models/civi.py

@@ -1,17 +1,16 @@
-import random as r
 import os, json, datetime, math, uuid
-
 from calendar import month_name
-from django.db import models
-from django.core.serializers.json import DjangoJSONEncoder
-from django.utils.deconstruct import deconstructible
+
 from django.core.files.storage import default_storage
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db import models
 from django.conf import settings
+from django.utils.deconstruct import deconstructible
 
 from .account import Account
-from .thread import Thread
 from .bill import Bill
 from .hashtag import Hashtag
+from .thread import Thread
 
 class CiviManager(models.Manager):
     def summarize(self, civi):

project/api/models/invitation.py

@@ -1,8 +1,8 @@
 """
 Handles beta/website access invitations
 """
-from django.db import models
 from django.contrib.auth.models import User
+from django.db import models
 
 class InvitationManager(models.Manager):
     """

project/api/models/notification.py

@@ -1,4 +1,5 @@
 from django.db import models
+
 from .account import Account
 from .civi import Civi
 from .thread import Thread

project/api/models/rationale.py

@@ -1,4 +1,5 @@
 from django.db import models
+
 from .bill import Bill
 from .representative import Representative
 from .vote import Vote

project/api/models/representative.py

@@ -1,4 +1,5 @@
 from django.db import models
+
 from utils.constants import US_STATES
 
 class RepresentativeManager(models.Manager):

project/api/models/thread.py

@@ -1,13 +1,15 @@
+import os, uuid
+from calendar import month_name
+
+from django.core.files.storage import default_storage
+from django.conf import settings
 from django.db import models
+from django.utils.deconstruct import deconstructible
+
 from .account import Account
 from .category import Category
 from .fact import Fact
 from .hashtag import Hashtag
-from calendar import month_name
-import os, uuid
-from django.utils.deconstruct import deconstructible
-from django.core.files.storage import default_storage
-from django.conf import settings
 from utils.constants import US_STATES
 
 class ThreadManager(models.Manager):

project/api/models/vote.py

@@ -1,4 +1,5 @@
 from django.db import models
+
 from .bill import Bill
 from .representative import Representative
 

project/api/read.py

@@ -1,11 +1,9 @@
-from django.http import JsonResponse, HttpResponseBadRequest
-from models import Account, Thread, Civi, Representative, Category, Activity
-#  Topic, Attachment, Category, Civi, Comment, Hashtag,
 from django.contrib.auth.models import User
+from django.http import JsonResponse, HttpResponseBadRequest
 from django.forms.models import model_to_dict
-from utils import json_response
 
-from legislation import sunlightapi as sun
+from models import Account, Thread, Civi, Representative, Activity
+from utils import json_response
 
 def get_user(request, user):
     try:
@@ -89,14 +87,14 @@ def get_rep(request, rep_id):
     # TODO: FINISH THIS
     try:
         # Federal Representatives only
-        u = Representative.objects.get(id=rep_id)
-        a = Account.objects.get(user=u)
-        result = Account.objects.summarize(a)
+        rep_user = Representative.objects.get(id=rep_id)
+        rep_account = Account.objects.get(user=rep_user)
+        result = Account.objects.summarize(rep_account)
 
         result['representatives'] = []
-        if request.user.username != user:
+        if request.user.username != rep_user.username:
             ra = Account.objects.get(user=request.user)
-            if user in ra.following.all():
+            if rep_user.username in ra.following.all():
                 result['follow_state'] = True
             else:
                 result['follow_state'] = False
@@ -124,6 +122,8 @@ def get_thread(request, thread_id):
         c = civis.order_by('-created')
         c_scores = [ci.score(req_a.id) for ci in c]
         c_data = [Civi.objects.serialize_s(ci) for ci in c]
+
+        problems = []
         for idx, item in enumerate(c_data):
             problems[idx]['score'] = c_scores[idx]
 

project/api/tasks.py

@@ -10,10 +10,11 @@
 from __future__ import absolute_import
 
 from django.conf import settings
-from celery import shared_task
 from django.core.mail import send_mail
-from django.template.loader import render_to_string
 from django.core.mail import get_connection, EmailMultiAlternatives
+from django.template.loader import render_to_string
+
+from celery import shared_task
 
 @shared_task(name="send_email")
 def send_email(subject="", recipient_list="", context=None):

project/api/urls.py

@@ -1,6 +1,8 @@
-from django.conf.urls import url
 import read, write
 
+from django.conf.urls import url
+
+
 #TODO: RESTful API - http://www.django-rest-framework.org/
 urlpatterns = [
     url(r'^account_data/(?P<user>[-\w]+)/$', read.get_user, name='get user'),

project/api/write.py

@@ -11,16 +11,13 @@
 from django.contrib.auth.decorators import user_passes_test
 from django.contrib.sites.shortcuts import get_current_site
 
-
 # civi packages
 from api.forms import UpdateProfileImage
 from api.models import Thread
 from api.tasks import send_mass_email
 from models import Account, Activity, Category, Civi, CiviImage, Invitation
 from utils.custom_decorators import require_post_params
 from utils.constants import US_STATES
-from utils.custom_decorators import require_post_params
-
 
 @login_required
 @require_post_params(params=['title', 'summary', 'category_id'])
@@ -318,7 +315,6 @@ def editThread(request):
     }
     return JsonResponse({'data': return_data})
 
-
 @login_required
 def uploadphoto(request):
     pass
@@ -417,7 +413,7 @@ def clearProfileImage(request):
 
             return HttpResponse('Image Deleted')
         except Exception:
-            return HttpResponseServerError(reason=str(default))
+            return HttpResponseServerError(reason=str("default"))
     else:
         return HttpResponseForbidden('allowed only via POST')
 
@@ -543,7 +539,7 @@ def requestFollow(request):
             verb=u'is following you', # Verb
             target=target_account, # Target Object
             popup_string="{user} is now following you".format(user=account.full_name),
-            link="/{}/{}".format(profile, request.user.username)
+            link="/{}/{}".format("profile", request.user.username)
         )
 
         return JsonResponse({"result": data})
@@ -597,7 +593,7 @@ def editUserCategories(request):
             account.save()
 
         data = {
-            'user_categories' : list(account.categories.values_list('id', flat=True)) or all_categories
+            'user_categories' : list(account.categories.values_list('id', flat=True)) or "all_categories"
         }
         return JsonResponse({"result": data})
     except Account.DoesNotExist as e:

project/authentication/authentication.py

@@ -1,22 +1,20 @@
-from django.contrib.auth.models import User
-from api.models import Account, Invitation
-from django.http import JsonResponse, HttpResponse, HttpResponseServerError, HttpResponseRedirect, HttpResponseBadRequest
+from django.conf import settings
 from django.contrib.auth import authenticate, logout, login
-from utils.custom_decorators import require_post_params
-from forms import AccountRegistrationForm, PasswordResetForm, RecoverUserForm
-from api.tasks import send_email
+from django.contrib.auth.models import User
+from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.contrib.sites.shortcuts import get_current_site
+from django.http import JsonResponse, HttpResponse, HttpResponseServerError, HttpResponseRedirect, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404
-from django.conf import settings
-
+from django.template.response import TemplateResponse #TODO: move this out to views
+from django.utils.crypto import salted_hmac
 from django.utils.encoding import force_bytes, force_text
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
 from django.utils.http import int_to_base36
 
-from django.contrib.auth.tokens import PasswordResetTokenGenerator
-from django.utils.crypto import salted_hmac
-
-from django.template.response import TemplateResponse #TODO: move this out to views
+from api.tasks import send_email
+from api.models import Account, Invitation
+from forms import AccountRegistrationForm, PasswordResetForm, RecoverUserForm
+from utils.custom_decorators import require_post_params
 
 class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
     """ Token Generator for Email Confirmation """

project/authentication/forms.py

@@ -1,17 +1,18 @@
+import re
+
 from django import forms
 from django.contrib.auth.models import User
 from django.contrib.auth.forms import (
     UserCreationForm, SetPasswordForm, PasswordResetForm as AuthRecoverUserForm
 )
-from django.utils.translation import ugettext_lazy as _
-from reserved_usernames import RESERVED_USERNAMES
-from api.tasks import send_email as task_send_email
+from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.shortcuts import get_current_site
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
-from django.contrib.auth.tokens import default_token_generator
+from django.utils.translation import ugettext_lazy as _
 
-import re
+from api.tasks import send_email as task_send_email
+from reserved_usernames import RESERVED_USERNAMES
 
 class AccountRegistrationForm(UserCreationForm):
     email = forms.EmailField(required=True)

project/civiwiki/routing.py

@@ -1,5 +1,6 @@
 from channels.routing import route
 from channels import include
+
 from api import consumers
 
 thread_routing = [

project/frontend_views/urls.py

@@ -2,7 +2,6 @@
 import views as v
 
 urlpatterns = [
-    url(r'^dbview$', v.dbview, name='dbview'),
     url(r'^login$', v.login_view, name='login'),
     url(r'^beta$', v.beta_view, name='beta'),
     url(r'^about$', v.about_view, name='about'),
@@ -14,7 +13,6 @@
     url(r'^setup$', v.user_setup, name='user setup'),
     url(r'^profile$', v.user_profile, name='default_profile'),
     url(r'^settings$', v.settings_view, name='settings'),
-    url(r'^add_civi$', v.add_civi, name='add civi'),
     url(r'^invite$', v.invite, name='invite'),
     url(r'^beta_register/(?P<email>[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/(?P<token>\w{31})$', v.beta_register, name='beta_register'),
     url(r'^$', v.base_view, name='base'),

project/frontend_views/views.py

@@ -1,17 +1,17 @@
 import json
 
 from django.conf import settings
-from django.http import HttpResponse, HttpResponseRedirect
-from django.template.response import TemplateResponse
+from django.contrib.auth.decorators import user_passes_test
 from django.contrib.auth.models import User
 from django.db.models import F
+from django.http import HttpResponse, HttpResponseRedirect
+from django.template.response import TemplateResponse
+
 from api.models import Category, Account, Thread, Civi, Activity, Invitation
 from api.forms import UpdateProfileImage
-
-# from legislation import sunlightapi as sun
-from django.contrib.auth.decorators import user_passes_test
-from utils.custom_decorators import beta_blocker, login_required, full_account
 from utils.constants import US_STATES
+from utils.custom_decorators import beta_blocker, login_required, full_account
+
 
 def base_view(request):
     if not request.user.is_authenticated():
@@ -146,24 +146,6 @@ def issue_thread(request, thread_id=None):
 def create_group(request):
     return TemplateResponse(request, 'newgroup.html', {})
 
-@login_required
-@beta_blocker
-@full_account
-def dbview(request):
-    result = [{'id': c.id, 'name': c.name} for c in Category.objects.all()]
-
-    return TemplateResponse(request, 'dbview.html', {'result': json.dumps(result)})
-
-
-@login_required
-@beta_blocker
-@full_account
-def add_civi(request):
-    categories = [{'id': c.id, 'name': c.name} for c in Category.objects.all()]
-    topics = [{'id': c.id, 'topic': c.topic} for c in Topic.objects.all()]
-
-    return TemplateResponse(request, 'add_civi.html', {'categories': json.dumps(categories), 'topics': json.dumps(topics)})
-
 
 @login_required
 @user_passes_test(lambda u: u.is_staff)

project/test_framework/app/hooks.py

@@ -0,0 +1,23 @@
+import os
+from contextlib import contextmanager
+
+import logging
+from aloe import around, world
+from selenium.webdriver.remote.remote_connection import LOGGER
+from selenium import webdriver
+
+'''
+this method sets a global variable of type WebDriver. This is the browser.
+@around.all is a global hook. It will be ran once before all scenarios
+After the last scenario is completed (pass or fail) the WebDriver will be closed
+'''
+@around.all
+@contextmanager
+def with_chrome():
+    LOGGER.setLevel(logging.WARNING)
+    driver_path = os.path.dirname(os.path.realpath(__file__)).replace("app", "conf\chromedriver.exe")
+    world.browser = webdriver.Chrome(executable_path = driver_path)
+    world.browser.maximize_window()
+    yield
+    world.browser.quit()
+    delattr(world, 'browser')