Updates simplify testproject settings (and fix them) (#1325)

* Updates simplify testproject settings (and fix them)

* Set `SESSION_COOKIE_SECURE = False` explicitly for dev

testproject/testproject/settings/base.py

@@ -1,12 +1,3 @@
-"""
-Generated by 'django-admin startproject' using Django 1.9.5.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.9/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.9/ref/settings/
-"""
 import os
 
 from django.urls import reverse_lazy
@@ -53,17 +44,17 @@
 
 TEST_RUNNER = "django.test.runner.DiscoverRunner"
 
-
 MIDDLEWARE = [
+    "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django.middleware.security.SecurityMiddleware",
 ]
 
+
 ROOT_URLCONF = "testproject.urls"
 
 TEMPLATES = [
@@ -103,24 +94,6 @@
     }
 }
 
-# Password validation
-# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
-    },
-]
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 

testproject/testproject/settings/dev.py

@@ -2,21 +2,24 @@
 
 DEBUG = True
 
-
 for template_engine in TEMPLATES:
     template_engine["OPTIONS"]["debug"] = True
 
-
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
+# Used by debug_toolbar
 INTERNAL_IPS = ["127.0.0.1"]
+
 ALLOWED_HOSTS = [
     "localhost",
     "0.0.0.0",
     "127.0.0.1",
 ]
-SESSION_COOKIE_DOMAIN = ".localhost"
 
+# Removed.
+# See: https://forum.djangoproject.com/t/why-are-cookie-secure-settings-defaulted-to-false/1133/4
+# and https://github.com/django-wiki/django-wiki/pull/1325
+# SESSION_COOKIE_DOMAIN = ".localhost"
 SESSION_COOKIE_SECURE = False
 
 try:
@@ -26,7 +29,6 @@
         "debug_toolbar.middleware.DebugToolbarMiddleware",
     ]
     INSTALLED_APPS = list(INSTALLED_APPS) + ["debug_toolbar"]
-    INTERNAL_IPS = ("127.0.0.1",)
     DEBUG_TOOLBAR_CONFIG = {"INTERCEPT_REDIRECTS": False}
 except ImportError:
     pass