From f7997f44ac34694e7b13fc2b274e7e292129d65b Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Wed, 22 Jun 2022 22:41:50 +0200 Subject: [PATCH] Clean up --- examples/simple/settings/base.py | 2 +- examples/simple/settings/docker.py | 198 +----------------------- examples/simple/settings/docker_test.py | 52 +++++++ runtests.py | 2 +- 4 files changed, 57 insertions(+), 197 deletions(-) create mode 100644 examples/simple/settings/docker_test.py diff --git a/examples/simple/settings/base.py b/examples/simple/settings/base.py index 2d6f6fdd..dd6152b0 100644 --- a/examples/simple/settings/base.py +++ b/examples/simple/settings/base.py @@ -5,6 +5,7 @@ from django_nine.versions import ( DJANGO_GTE_2_0, DJANGO_GTE_1_11, ) +from selenium import webdriver def project_dir(base): @@ -684,7 +685,6 @@ IS_TRAVIS = 'TRAVIS' in os.environ if IS_TRAVIS: CHROME_DRIVER_EXECUTABLE_PATH = '/home/travis/chromedriver' -from selenium import webdriver CHROME_DRIVER_OPTIONS = webdriver.ChromeOptions() CHROME_DRIVER_OPTIONS.add_argument('-headless') CHROME_DRIVER_OPTIONS.add_argument('-no-sandbox') diff --git a/examples/simple/settings/docker.py b/examples/simple/settings/docker.py index b575b3f1..505d5a8b 100644 --- a/examples/simple/settings/docker.py +++ b/examples/simple/settings/docker.py @@ -1,6 +1,5 @@ -import os - -from django_nine.versions import * +from chromedriver_py import binary_path +from selenium import webdriver from .bootstrap3_theme import * @@ -9,12 +8,6 @@ def project_dir(base): os.path.join(os.path.dirname(__file__), base).replace('\\', '/') ) -# EMAIL_HOST = 'smtp.gmail.com' -# EMAIL_PORT = 587 -# EMAIL_USE_TLS = True -# -# EMAIL_HOST_USER = 'artur.barseghyan.smtp.test@gmail.com' -# EMAIL_HOST_PASSWORD = 'FreeSMTPRulez999' def gettext(s): return s @@ -23,52 +16,10 @@ def gettext(s): PROJECT_DIR = project_dir DEBUG = True DEBUG_TOOLBAR = False +DEBUG_TEMPLATE = True # TEMPLATE_DEBUG = True DEV = True -# DATABASES = { -# 'default': { -# # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. -# # 'ENGINE': 'django.db.backends.sqlite3', -# 'ENGINE': 'django.db.backends.postgresql_psycopg2', -# # Or path to database file if using sqlite3. -# 'NAME': PROJECT_DIR('../../db/example.db'), -# # 'ENGINE': 'django.db.backends.mysql', -# # 'NAME': 'fobi', -# # 'TEST_NAME': 'fobi_test', -# # The following settings are not used with sqlite3: -# # 'USER': 'root', -# 'USER': 'postgres', -# 'PASSWORD': 'test', -# # Empty for localhost through domain sockets or '127.0.0.1' for -# # localhost through TCP. -# 'HOST': '', -# # Set to empty string for default. -# 'PORT': '', -# } -# } - -# TEST_DATABASES = { -# 'default': { -# # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. -# 'ENGINE': 'django.db.backends.postgresql_psycopg2', -# 'NAME': 'fobi', -# 'USER': 'postgres', -# 'PASSWORD': 'test', -# -# # 'ENGINE': 'django.db.backends.sqlite3', -# # 'NAME': PROJECT_DIR('../../db/example.db'), -# # 'USER': '', -# # 'PASSWORD': '', -# -# # Empty for localhost through domain sockets or '127.0.0.1' for -# # localhost through TCP. -# 'HOST': '', -# # Set to empty string for default. -# 'PORT': '', -# } -# } - POSTGRES_ENGINE = 'django.db.backends.postgresql' DATABASES = { @@ -97,15 +48,6 @@ ALLOWED_HOSTS = ['*'] EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' EMAIL_FILE_PATH = PROJECT_DIR('../../tmp') -EMAIL_HOST = 'smtp.gmail.com' -EMAIL_PORT = 587 -EMAIL_USE_TLS = True - -EMAIL_HOST_USER = 'artur.barseghyan.smtp.test@gmail.com' -EMAIL_HOST_PASSWORD = 'FreeSMTPRulez999' - -DEFAULT_FROM_EMAIL = '' - FOBI_DEBUG = True FOBI_RESTRICT_PLUGIN_ACCESS = False FOBI_RESTRICT_FIELDS_ACCESS = False @@ -115,7 +57,6 @@ FOBI_FAIL_ON_MISSING_FORM_ELEMENT_PLUGINS = True FOBI_FAIL_ON_ERRORS_IN_FORM_HANDLER_PLUGINS = True # FOBI_DEFAULT_THEME = 'foundation5' - FOBI_FAIL_ON_MISSING_FORM_HANDLER_PLUGINS = True FOBI_FAIL_ON_MISSING_FORM_WIZARD_HANDLER_PLUGINS = True FOBI_FAIL_ON_ERRORS_IN_FORM_ELEMENT_PLUGINS = False @@ -124,30 +65,10 @@ FOBI_FAIL_ON_ERRORS_IN_FORM_WIZARD_HANDLER_PLUGINS = True # WAIT_BETWEEN_TEST_STEPS = 0 # FOBI_WAIT_AT_TEST_END = 0 -MAILCHIMP_API_KEY = '186eee04b7eae9b1d9bb61b402c37e52-us7' - - -ENABLE_CAPTCHA = True # LANGUAGE_CODE = 'nl' -RECAPTCHA_PUBLIC_KEY = '6LdSp_8SAAAAAC1Q4ZvbvB9wOfCc92o9EGEcRMpp' -RECAPTCHA_PRIVATE_KEY = '6LdSp_8SAAAAAAxdzw2U6i3Q46jltXoiSEXAk5wL' -# from fobi.constants import ( -# SUBMIT_VALUE_AS_VAL, SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_MIX -# ) -# SUBMIT_VALUE_AS = SUBMIT_VALUE_AS_MIX -# -# FOBI_FORM_ELEMENT_RADIO_SUBMIT_VALUE_AS = SUBMIT_VALUE_AS #'val' -# FOBI_FORM_ELEMENT_SELECT_SUBMIT_VALUE_AS = SUBMIT_VALUE_AS #'val' -# FOBI_FORM_ELEMENT_SELECT_MULTIPLE_SUBMIT_VALUE_AS = SUBMIT_VALUE_AS #'val' -# 'val' -# FOBI_FORM_ELEMENT_SELECT_MODEL_OBJECT_SUBMIT_VALUE_AS = SUBMIT_VALUE_AS -# FOBI_FORM_ELEMENT_SELECT_MULTIPLE_MODEL_OBJECTS_SUBMIT_VALUE_AS = \ -# SUBMIT_VALUE_AS - -from selenium import webdriver CHROME_DRIVER_OPTIONS = webdriver.ChromeOptions() CHROME_DRIVER_OPTIONS.add_argument('-headless') CHROME_DRIVER_OPTIONS.add_argument('-no-sandbox') @@ -155,118 +76,5 @@ CHROME_DRIVER_OPTIONS.set_capability('chrome.binary', "/usr/bin/google-chrome") # CHROME_DRIVER_OPTIONS.add_argument('-single-process') -from chromedriver_py import binary_path CHROME_DRIVER_EXECUTABLE_PATH = binary_path # '/usr/bin/chromedriver' -# CHROME_DRIVER_EXECUTABLE_PATH = None FIREFOX_BIN_PATH = '/usr/lib/firefox/firefox' -FIREFOX_BIN_PATH = None -PHANTOM_JS_EXECUTABLE_PATH = '' -# PHANTOM_JS_EXECUTABLE_PATH = None - -os.environ.setdefault( - 'FOBI_SOURCE_PATH', - '/home/delusionalinsanity/bbrepos/django-fobi/src' -) - -DEBUG_TEMPLATE = True - -# DATABASES = { -# 'default': { -# 'ENGINE': 'djongo', -# 'NAME': 'your-db-name', -# } -# } - -FOBI_PLUGIN_INVISIBLE_RECAPTCHA_SITE_KEY = \ - '6Lcya0EUAAAAAHfpe9JSmvdy0Ie9SIOtX0Abdn_v' -FOBI_PLUGIN_INVISIBLE_RECAPTCHA_SITE_SECRET = \ - '6Lcya0EUAAAAAJQKcPYlOQwghvwaRvShwCrgyU12' - -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'filters': { - 'require_debug_false': { - '()': 'django.utils.log.RequireDebugFalse' - } - }, - 'root': { - 'level': 'INFO', - 'handlers': ['all_log'], - }, - 'formatters': { - 'verbose': { - 'format': '\n%(levelname)s %(asctime)s [%(pathname)s:%(lineno)s] ' - '%(message)s' - }, - 'simple': { - 'format': '\n%(levelname)s %(message)s' - }, - }, - 'handlers': { - 'mail_admins': { - 'level': 'ERROR', - 'filters': ['require_debug_false'], - 'class': 'django.utils.log.AdminEmailHandler' - }, - 'console': { - 'level': 'DEBUG', - 'class': 'logging.StreamHandler', - 'formatter': 'verbose' - }, - 'all_log': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': PROJECT_DIR("../../logs/all.log"), - 'maxBytes': 1048576, - 'backupCount': 99, - 'formatter': 'verbose', - }, - 'django_log': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': PROJECT_DIR("../../logs/django.log"), - 'maxBytes': 1048576, - 'backupCount': 99, - 'formatter': 'verbose', - }, - 'django_request_log': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': PROJECT_DIR("../../logs/django_request.log"), - 'maxBytes': 1048576, - 'backupCount': 99, - 'formatter': 'verbose', - }, - 'fobi_log': { - 'level': 'DEBUG', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': PROJECT_DIR("../../logs/fobi.log"), - 'maxBytes': 1048576, - 'backupCount': 99, - 'formatter': 'verbose', - }, - }, - 'loggers': { - 'django.request': { - 'handlers': ['django_request_log'], - 'level': 'INFO', - 'propagate': True, - }, - 'django': { - 'handlers': ['django_log'], - 'level': 'ERROR', - 'propagate': False, - }, - 'fobi': { - 'handlers': ['console', 'fobi_log'], - 'level': 'DEBUG', - 'propagate': True, - }, - 'django.db': { - 'handlers': ['console'], - 'level': 'DEBUG', - 'propagate': False, - }, - }, -} \ No newline at end of file diff --git a/examples/simple/settings/docker_test.py b/examples/simple/settings/docker_test.py new file mode 100644 index 00000000..b5632e1d --- /dev/null +++ b/examples/simple/settings/docker_test.py @@ -0,0 +1,52 @@ +from chromedriver_py import binary_path +from selenium import webdriver +from .bootstrap3_theme import * + +TESTING = True + +INSTALLED_APPS = list(INSTALLED_APPS) + +LOGGING = {} + +DEBUG_TOOLBAR = False + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'fobi', + 'USER': 'postgres', + 'PASSWORD': 'test', + + # Empty for localhost through domain sockets or '127.0.0.1' for + # localhost through TCP. + 'HOST': 'postgresql', + 'TEST': { + 'HOST': 'postgresql', + 'NAME': 'fobi_tests', + 'USER': 'postgres', + 'PASSWORD': 'test', + } + } +} + +# FeinCMS addons + +INSTALLED_APPS += [ + 'feincms', # FeinCMS + + 'fobi.contrib.apps.feincms_integration', # Fobi FeinCMS app + + 'page', # Example +] + +MIGRATION_MODULES = { + 'fobi': 'fobi.migrations', + 'db_store': 'fobi.contrib.plugins.form_handlers.db_store.migrations', + 'page': 'page.migrations', +} + +CHROME_DRIVER_EXECUTABLE_PATH = binary_path # '/usr/bin/chromedriver' +CHROME_DRIVER_OPTIONS = webdriver.ChromeOptions() +CHROME_DRIVER_OPTIONS.add_argument('-headless') +CHROME_DRIVER_OPTIONS.add_argument('-no-sandbox') +CHROME_DRIVER_OPTIONS.set_capability('chrome.binary', "/usr/bin/google-chrome") diff --git a/runtests.py b/runtests.py index b358418d..42702e54 100755 --- a/runtests.py +++ b/runtests.py @@ -5,7 +5,7 @@ import pytest def main(): - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.test") + os.environ.__setitem__("DJANGO_SETTINGS_MODULE", "settings.docker_test") sys.path.insert(0, "examples/simple") sys.path.insert(0, "src") return pytest.main()