From 68760efe6af854063f2ac0f427e3f014815ea1ba Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 2 Mar 2017 16:35:07 +0100 Subject: [PATCH] login: moved to apps module --- rhodecode/{ => apps}/login/__init__.py | 0 rhodecode/{ => apps}/login/tests/__init__.py | 0 rhodecode/{ => apps}/login/tests/test_register_captcha.py | 4 ++-- rhodecode/{ => apps}/login/views.py | 0 rhodecode/config/middleware.py | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename rhodecode/{ => apps}/login/__init__.py (100%) rename rhodecode/{ => apps}/login/tests/__init__.py (100%) rename rhodecode/{ => apps}/login/tests/test_register_captcha.py (97%) rename rhodecode/{ => apps}/login/views.py (100%) diff --git a/rhodecode/login/__init__.py b/rhodecode/apps/login/__init__.py similarity index 100% rename from rhodecode/login/__init__.py rename to rhodecode/apps/login/__init__.py diff --git a/rhodecode/login/tests/__init__.py b/rhodecode/apps/login/tests/__init__.py similarity index 100% rename from rhodecode/login/tests/__init__.py rename to rhodecode/apps/login/tests/__init__.py diff --git a/rhodecode/login/tests/test_register_captcha.py b/rhodecode/apps/login/tests/test_register_captcha.py similarity index 97% rename from rhodecode/login/tests/test_register_captcha.py rename to rhodecode/apps/login/tests/test_register_captcha.py index 276be5ff..ef30cbce 100644 --- a/rhodecode/login/tests/test_register_captcha.py +++ b/rhodecode/apps/login/tests/test_register_captcha.py @@ -22,8 +22,8 @@ import mock import pytest +from rhodecode.apps.login.views import LoginView, CaptchaData from rhodecode.config.routing import ADMIN_PREFIX -from rhodecode.login.views import LoginView, CaptchaData from rhodecode.model.settings import SettingsModel from rhodecode.tests.utils import AssertResponse @@ -92,7 +92,7 @@ class TestRegisterCaptcha(object): assertr.no_element_exists('#recaptcha_field') @pytest.mark.parametrize('valid', [False, True]) - @mock.patch('rhodecode.login.views.submit') + @mock.patch('rhodecode.apps.login.views.submit') @mock.patch.object(LoginView, '_get_captcha_data') def test_register_with_active_captcha( self, m_get_captcha_data, m_submit, valid, app, csrf_token): diff --git a/rhodecode/login/views.py b/rhodecode/apps/login/views.py similarity index 100% rename from rhodecode/login/views.py rename to rhodecode/apps/login/views.py diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py index c43b8695..475ed844 100644 --- a/rhodecode/config/middleware.py +++ b/rhodecode/config/middleware.py @@ -281,7 +281,7 @@ def includeme(config): config.include('rhodecode.admin') config.include('rhodecode.authentication') config.include('rhodecode.integrations') - config.include('rhodecode.login') + config.include('rhodecode.apps.login') config.include('rhodecode.tweens') config.include('rhodecode.api') config.include('rhodecode.svn_support')