diff --git a/protected/humhub/docs/guide/dev-testing.md b/protected/humhub/docs/guide/dev-testing.md new file mode 100644 index 0000000000..de0f723112 --- /dev/null +++ b/protected/humhub/docs/guide/dev-testing.md @@ -0,0 +1,21 @@ +Testing +==================== + +1. Install codeception +composer global require "codeception/codeception=2.0.*" "codeception/specify=*" "codeception/verify=*" + +2. Create test Database: +CREATE DATABASE `humhub_test` CHARACTER SET utf8 COLLATE utf8_general_ci; + +3. Migrate Up: +cd protected/humhub/tests/codeception/bin +php yii migrate/up --includeModuleMigrations=1 --interactive=0 +php yii installer/auto + +4. Build Tests: +cd protected/humhub/tests +codecept build + +5. Run Tests: +cd protected/humhub/tests/ +codecept run diff --git a/protected/humhub/modules/user/views/account/editModules.php b/protected/humhub/modules/user/views/account/editModules.php index a38301a095..19d0f4dbfc 100644 --- a/protected/humhub/modules/user/views/account/editModules.php +++ b/protected/humhub/modules/user/views/account/editModules.php @@ -9,7 +9,7 @@ use yii\helpers\Url;
-

+
$module): ?>
diff --git a/protected/humhub/modules/user/views/account/editSettings.php b/protected/humhub/modules/user/views/account/editSettings.php index a25ecaf470..c7829daf02 100644 --- a/protected/humhub/modules/user/views/account/editSettings.php +++ b/protected/humhub/modules/user/views/account/editSettings.php @@ -8,10 +8,9 @@ use \humhub\models\Setting;
User settings'); ?>
+
- -
-

+ 'basic-settings-form']); ?> field($model, 'tags'); ?> diff --git a/protected/humhub/modules/user/views/account/emailing.php b/protected/humhub/modules/user/views/account/emailing.php index 52a635e0d5..a9d97e629b 100644 --- a/protected/humhub/modules/user/views/account/emailing.php +++ b/protected/humhub/modules/user/views/account/emailing.php @@ -11,33 +11,29 @@ use humhub\modules\user\models\User;

-
- field($model, 'enable_html5_desktop_notifications')->checkbox(); ?>
-
+
Email Notifications'); ?>
-
- +
-
-
+
field($model, 'receive_email_notifications')->dropdownList([User::RECEIVE_EMAIL_NEVER => Yii::t('UserModule.views_account_emailing', 'Never'), User::RECEIVE_EMAIL_WHEN_OFFLINE => Yii::t('UserModule.views_account_emailing', 'When I´m offline'), User::RECEIVE_EMAIL_ALWAYS => Yii::t('UserModule.views_account_emailing', 'Always')]); ?> -
-
- together in workspaces.'); ?> - +
+ +
+ field($model, 'receive_email_activities')->dropdownList([ User::RECEIVE_EMAIL_NEVER => Yii::t('UserModule.views_account_emailing', 'Never'), User::RECEIVE_EMAIL_DAILY_SUMMARY => Yii::t('UserModule.views_account_emailing', 'Daily summary'), diff --git a/protected/humhub/modules/user/views/account/security.php b/protected/humhub/modules/user/views/account/security.php index e589ff0009..3bdb97d9e2 100644 --- a/protected/humhub/modules/user/views/account/security.php +++ b/protected/humhub/modules/user/views/account/security.php @@ -1,28 +1,23 @@
Security settings'); ?>
-
-
- -