Skip to content

Commit bfaae12

Browse files
SOHELAHMED7SOHELAHMED7
committed
Fix failing tests
1 parent 6dd3242 commit bfaae12

File tree

42 files changed

+170
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+170
-170
lines changed

‎tests/specs/blog/models/base/Category.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public function rules()
2626
{
2727
return [
2828
'trim' => [['title'], 'trim'],
29-
'title_unique' => [['title'], 'unique'],
30-
'title_string' => [['title'], 'string', 'max' => 255],
31-
'active_boolean' => [['active'], 'boolean'],
3229
'active_default' => [['active'], 'default', 'value' => false],
3330
'required' => [['title', 'active'], 'required'],
31+
'title_string' => [['title'], 'string', 'max' => 255],
32+
'active_boolean' => [['active'], 'boolean'],
33+
'title_unique' => [['title'], 'unique'],
3434
];
3535
}
3636

‎tests/specs/blog/models/base/Comment.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public function rules()
3030
{
3131
return [
3232
'trim' => [['post_id'], 'trim'],
33+
'message_default' => [['message'], 'default', 'value' => []],
34+
'meta_data_default' => [['meta_data'], 'default', 'value' => []],
35+
'required' => [['post_id', 'author_id', 'message', 'created_at'], 'required'],
36+
'created_at_integer' => [['created_at'], 'integer'],
3337
'post_id_string' => [['post_id'], 'string', 'max' => 128],
3438
'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'post'],
3539
'author_id_integer' => [['author_id'], 'integer'],
3640
'author_id_exist' => [['author_id'], 'exist', 'targetRelation' => 'author'],
37-
'message_default' => [['message'], 'default', 'value' => []],
38-
'meta_data_default' => [['meta_data'], 'default', 'value' => []],
39-
'created_at_integer' => [['created_at'], 'integer'],
4041
'safe' => [['message', 'meta_data'], 'safe'],
41-
'required' => [['post_id', 'author_id', 'message', 'created_at'], 'required'],
4242
];
4343
}
4444

‎tests/specs/blog/models/base/Fakerable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public function rules()
3737
{
3838
return [
3939
'trim' => [['str_text', 'str_varchar', 'str_date', 'str_datetime', 'str_country'], 'trim'],
40+
'int_min_default' => [['int_min'], 'default', 'value' => 3],
4041
'active_boolean' => [['active'], 'boolean'],
4142
'floatval_double' => [['floatval'], 'double'],
4243
'floatval_lim_double' => [['floatval_lim'], 'double', 'min' => 0, 'max' => 1],
4344
'doubleval_double' => [['doubleval'], 'double'],
4445
'int_min_integer' => [['int_min'], 'integer', 'min' => 5],
45-
'int_min_default' => [['int_min'], 'default', 'value' => 3],
4646
'int_max_integer' => [['int_max'], 'integer', 'max' => 5],
4747
'int_minmax_integer' => [['int_minmax'], 'integer', 'min' => 5, 'max' => 25],
4848
'int_created_at_integer' => [['int_created_at'], 'integer'],

‎tests/specs/blog/models/base/Post.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ public function rules()
3232
{
3333
return [
3434
'trim' => [['title', 'slug', 'created_at'], 'trim'],
35-
'category_id_integer' => [['category_id'], 'integer'],
36-
'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'category'],
37-
'created_by_id_integer' => [['created_by_id'], 'integer'],
38-
'created_by_id_exist' => [['created_by_id'], 'exist', 'targetRelation' => 'createdBy'],
39-
'title_unique' => [['title'], 'unique'],
40-
'slug_unique' => [['slug'], 'unique'],
35+
'active_default' => [['active'], 'default', 'value' => false],
36+
'required' => [['title', 'category_id', 'active'], 'required'],
4137
'title_string' => [['title'], 'string', 'max' => 255],
4238
'slug_string' => [['slug'], 'string', 'min' => 1, 'max' => 200],
4339
'active_boolean' => [['active'], 'boolean'],
44-
'active_default' => [['active'], 'default', 'value' => false],
4540
'created_at_date' => [['created_at'], 'date', 'format' => 'php:Y-m-d'],
46-
'required' => [['title', 'category_id', 'active'], 'required'],
41+
'title_unique' => [['title'], 'unique'],
42+
'slug_unique' => [['slug'], 'unique'],
43+
'category_id_integer' => [['category_id'], 'integer'],
44+
'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'category'],
45+
'created_by_id_integer' => [['created_by_id'], 'integer'],
46+
'created_by_id_exist' => [['created_by_id'], 'exist', 'targetRelation' => 'createdBy'],
4747
];
4848
}
4949

‎tests/specs/blog/models/base/User.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ public function rules()
2929
{
3030
return [
3131
'trim' => [['username', 'email', 'password', 'role', 'created_at'], 'trim'],
32-
'username_unique' => [['username'], 'unique'],
33-
'email_unique' => [['email'], 'unique'],
32+
'role_default' => [['role'], 'default', 'value' => 'reader'],
33+
'flags_default' => [['flags'], 'default', 'value' => 0],
34+
'created_at_default' => [['created_at'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
35+
'required' => [['username', 'email', 'password'], 'required'],
3436
'username_string' => [['username'], 'string', 'max' => 200],
3537
'email_string' => [['email'], 'string', 'max' => 200],
3638
'email_email' => [['email'], 'email'],
3739
'password_string' => [['password'], 'string'],
3840
'role_string' => [['role'], 'string', 'max' => 20],
39-
'role_default' => [['role'], 'default', 'value' => 'reader'],
4041
'flags_integer' => [['flags'], 'integer'],
41-
'flags_default' => [['flags'], 'default', 'value' => 0],
4242
'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
43-
'required' => [['username', 'email', 'password'], 'required'],
44-
'created_at_default' => [['created_at'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
43+
'username_unique' => [['username'], 'unique'],
44+
'email_unique' => [['email'], 'unique'],
4545
];
4646
}
4747

‎tests/specs/blog_v2/models/base/Category.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public function rules()
2727
{
2828
return [
2929
'trim' => [['title', 'cover'], 'trim'],
30+
'required' => [['title', 'cover', 'active'], 'required'],
3031
'title_string' => [['title'], 'string', 'max' => 100],
3132
'cover_string' => [['cover'], 'string'],
3233
'active_boolean' => [['active'], 'boolean'],
33-
'required' => [['title', 'cover', 'active'], 'required'],
3434
];
3535
}
3636

‎tests/specs/blog_v2/models/base/Comment.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public function rules()
3030
{
3131
return [
3232
'trim' => [['message', 'meta_data', 'created_at'], 'trim'],
33+
'meta_data_default' => [['meta_data'], 'default', 'value' => ''],
34+
'required' => [['post_id', 'message', 'created_at'], 'required'],
35+
'message_string' => [['message'], 'string'],
36+
'meta_data_string' => [['meta_data'], 'string', 'min' => 1, 'max' => 300],
37+
'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
3338
'post_id_integer' => [['post_id'], 'integer'],
3439
'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'post'],
3540
'user_id_integer' => [['user_id'], 'integer'],
3641
'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'user'],
37-
'message_string' => [['message'], 'string'],
38-
'meta_data_string' => [['meta_data'], 'string', 'min' => 1, 'max' => 300],
39-
'meta_data_default' => [['meta_data'], 'default', 'value' => ''],
40-
'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
41-
'required' => [['post_id', 'message', 'created_at'], 'required'],
4242
];
4343
}
4444

‎tests/specs/blog_v2/models/base/Post.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ public function rules()
3434
{
3535
return [
3636
'trim' => [['title', 'slug', 'created_at'], 'trim'],
37-
'category_id_integer' => [['category_id'], 'integer'],
38-
'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'category'],
39-
'created_by_id_integer' => [['created_by_id'], 'integer'],
40-
'created_by_id_exist' => [['created_by_id'], 'exist', 'targetRelation' => 'createdBy'],
41-
'title_unique' => [['title'], 'unique'],
37+
'lang_default' => [['lang'], 'default', 'value' => 'ru'],
38+
'required' => [['title', 'category_id', 'active'], 'required'],
4239
'title_string' => [['title'], 'string', 'max' => 255],
4340
'slug_string' => [['slug'], 'string', 'min' => 1, 'max' => 200],
4441
'lang_string' => [['lang'], 'string'],
4542
'lang_in' => [['lang'], 'in', 'range' => [
4643
'ru',
4744
'eng',
4845
]],
49-
'lang_default' => [['lang'], 'default', 'value' => 'ru'],
5046
'active_boolean' => [['active'], 'boolean'],
5147
'created_at_date' => [['created_at'], 'date', 'format' => 'php:Y-m-d'],
52-
'required' => [['title', 'category_id', 'active'], 'required'],
48+
'title_unique' => [['title'], 'unique'],
49+
'category_id_integer' => [['category_id'], 'integer'],
50+
'category_id_exist' => [['category_id'], 'exist', 'targetRelation' => 'category'],
51+
'created_by_id_integer' => [['created_by_id'], 'integer'],
52+
'created_by_id_exist' => [['created_by_id'], 'exist', 'targetRelation' => 'createdBy'],
5353
];
5454
}
5555

‎tests/specs/blog_v2/models/base/Tag.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public function rules()
2626
{
2727
return [
2828
'trim' => [['name'], 'trim'],
29-
'name_unique' => [['name'], 'unique'],
29+
'required' => [['name', 'lang'], 'required'],
3030
'name_string' => [['name'], 'string', 'max' => 100],
3131
'lang_string' => [['lang'], 'string'],
3232
'lang_in' => [['lang'], 'in', 'range' => [
3333
'ru',
3434
'eng',
3535
]],
36-
'required' => [['name', 'lang'], 'required'],
36+
'name_unique' => [['name'], 'unique'],
3737
];
3838
}
3939

‎tests/specs/blog_v2/models/base/User.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function rules()
2929
{
3030
return [
3131
'trim' => [['login', 'email', 'password', 'created_at'], 'trim'],
32-
'login_unique' => [['login'], 'unique'],
33-
'email_unique' => [['email'], 'unique'],
32+
'flags_default' => [['flags'], 'default', 'value' => 0],
33+
'required' => [['login', 'email', 'password'], 'required'],
3434
'login_string' => [['login'], 'string'],
3535
'email_string' => [['email'], 'string', 'max' => 255],
3636
'email_email' => [['email'], 'email'],
@@ -42,9 +42,9 @@ public function rules()
4242
'reader',
4343
]],
4444
'flags_integer' => [['flags'], 'integer'],
45-
'flags_default' => [['flags'], 'default', 'value' => 0],
4645
'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
47-
'required' => [['login', 'email', 'password'], 'required'],
46+
'login_unique' => [['login'], 'unique'],
47+
'email_unique' => [['email'], 'unique'],
4848
];
4949
}
5050

0 commit comments

Comments
 (0)