Merge branch 'master' into pr/159

Author: trco

bootstrap_modal_forms/mixins.py

@@ -2,6 +2,8 @@
 from django.contrib.auth import login as auth_login
 from django.http import HttpResponseRedirect
 
+from .utils import is_ajax
+
 
 class PassRequestMixin(object):
     """
@@ -38,8 +40,7 @@ class CreateUpdateAjaxMixin(object):
     """
 
     def save(self, commit=True):
-        # if not self.request.is_ajax() or self.request.POST.get('closeOnSubmit') == 'False':
-        if not self.request.is_ajax() or self.request.POST.get('asyncUpdate') == 'True':
+        if not is_ajax(self.request.META) or self.request.POST.get('asyncUpdate') == 'True':
             instance = super(CreateUpdateAjaxMixin, self).save(commit=commit)
         else:
             instance = super(CreateUpdateAjaxMixin, self).save(commit=False)
@@ -66,7 +67,7 @@ class LoginAjaxMixin(object):
     """
 
     def form_valid(self, form):
-        if not self.request.is_ajax():
+        if not is_ajax(self.request.META):
             auth_login(self.request, form.get_user())
             messages.success(self.request, self.success_message)
-        return HttpResponseRedirect(self.get_success_url())
+        return HttpResponseRedirect(self.get_success_url())

bootstrap_modal_forms/utils.py

@@ -0,0 +1,8 @@
+def is_ajax(meta):
+    if 'HTTP_X_REQUESTED_WITH' not in meta:
+        return False
+
+    if meta['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest':
+        return True
+
+    return False

tests/tests_functional.py

@@ -30,7 +30,7 @@ def test_signup_login(self):
 
         # User sees error in form
         error = self.wait_for(class_name='help-block')
-        self.assertEqual(error.text, 'The two password fields didn\'t match.')
+        self.assertEqual(error.text, 'The two password fields didn’t match.')
 
         # User fills in and submits sign up form correctly
         form = modal.find_element_by_tag_name('form')
@@ -278,10 +278,6 @@ def test_delete_object(self):
         alert = self.wait_for(class_name='alert')
         self.assertEqual(alert.text[:-2], 'Success: Book was deleted.')
 
-        # User sees 'No books added yet.'
-        no_books = self.browser.find_element_by_class_name('no-books')
-        self.assertEqual(no_books.text, 'No books added yet.')
-
         # There is no books in database anymore
         books = Book.objects.all()
         self.assertEqual(books.count(), 0)