From fa18b19e23e18c815ed542f39f69eaf3fa4e67c1 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 14 Sep 2021 17:23:06 +0530 Subject: [PATCH] Validation Message Fixed --- .../Admin/src/Resources/lang/ar/app.php | 2 +- .../Admin/src/Resources/lang/de/app.php | 2 +- .../Admin/src/Resources/lang/en/app.php | 2 +- .../Admin/src/Resources/lang/es/app.php | 2 +- .../Admin/src/Resources/lang/fa/app.php | 2 +- .../Admin/src/Resources/lang/fr/app.php | 2 +- .../Admin/src/Resources/lang/it/app.php | 2 +- .../Admin/src/Resources/lang/nl/app.php | 2 +- .../Admin/src/Resources/lang/pl/app.php | 2 +- .../Admin/src/Resources/lang/pt_BR/app.php | 2 +- .../Admin/src/Resources/lang/tr/app.php | 2 +- .../views/catalog/attributes/edit.blade.php | 2 +- .../Admin/Catalog/AttributeCest.php | 26 ++++++++++++++++--- 13 files changed, 34 insertions(+), 16 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 38e8163f5..29936d7ea 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -635,7 +635,7 @@ return [ 'use_in_flat' => "إنشاء في جدول المنتجات المسطحة", 'is_comparable' => "السمة قابلة للمقارنة", 'default_null_option' => 'إنشاء خيار فارغ افتراضي', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index b9f25b8ff..f90eaec58 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -625,7 +625,7 @@ return [ 'use_in_flat' => 'In Produkt Flat Tabelle erstellen', 'is_comparable' => 'Attribut ist vergleichbar', 'default_null_option' => 'Erstellen Sie eine leere Standardoption', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 3f891239f..dc3d1abd3 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -646,7 +646,7 @@ return [ 'use_in_flat' => "Create in Product Flat Table", 'is_comparable' => "Attribute is comparable", 'default_null_option' => 'Create default empty option', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ] ], diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index e2351c5ea..565e158c8 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -646,7 +646,7 @@ return [ 'use_in_flat' => "Crear en tabla plana de productos", 'is_comparable' => "El atributo es comparable", 'default_null_option' => 'Crear opción vacía por defecto', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index b1ec18b3d..ec2e42311 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -635,7 +635,7 @@ return [ 'use_in_flat' => 'اضافه به جدول flat (product_flat)', 'is_comparable' => "ویژگی قابل مقایسه است", 'default_null_option' => 'گزینه پیش فرض خالی ایجاد کنید', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php index 28d0e7e76..80a3ff81b 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php @@ -645,7 +645,7 @@ return [ 'use_in_flat' => 'Créer dans la table plate du produit', 'is_comparable' => 'L\'attribut est comparable', 'default_null_option' => 'Créer une option vide par défaut', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index 86b050f4d..3c6ee9963 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -635,7 +635,7 @@ return [ 'use_in_flat' => "Crea in tabella Product flat", 'is_comparable' => "L'attributo è comparabile", 'default_null_option' => 'Crea opzione predefinita vuota', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index bcd1f253d..fc19acecc 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -632,7 +632,7 @@ return [ 'use_in_flat' => "Create in Product Flat Table", 'is_comparable' => "Attribuut is vergelijkbaar ", 'default_null_option' => 'Create default empty option', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index 60b65783d..58c3bd874 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -634,7 +634,7 @@ return [ 'use_in_flat' => "Utwórz w płaskiej tabeli produktu", 'is_comparable' => "Atrybut jest porównywalny", 'default_null_option' => 'Utwórz domyślną pustą opcję', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index 1a6cfec17..acd60e6ca 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -633,7 +633,7 @@ return [ 'use_in_flat' => "Criar na tabela plana do produto", 'is_comparable' => "O atributo é comparável", 'default_null_option' => 'Criar opção vazia padrão', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 67856734f..6376a4a5e 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -628,7 +628,7 @@ return [ 'use_in_flat' => "Ürün Tablosu Oluştur", 'is_comparable' => "Nitelik kıyaslanabilir", 'default_null_option' => 'Varsayılan boş seçenek oluştur', - 'validations' => [ + 'validation-messages' => [ 'max-size' => 'The image size must be less than 600 KB' ], ], diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php index 8ac2579eb..f32bb1b4b 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php @@ -367,7 +367,7 @@
- +
diff --git a/tests/functional/Admin/Catalog/AttributeCest.php b/tests/functional/Admin/Catalog/AttributeCest.php index d1a203d5b..ef4d9a5a9 100644 --- a/tests/functional/Admin/Catalog/AttributeCest.php +++ b/tests/functional/Admin/Catalog/AttributeCest.php @@ -7,6 +7,12 @@ use Webkul\Attribute\Models\Attribute; class AttributeCest { + /** + * Test attribute index page. + * + * @param FunctionalTester $I + * @return void + */ public function testIndex(FunctionalTester $I): void { $attribute = $I->have(Attribute::class); @@ -21,6 +27,12 @@ class AttributeCest $I->see($attribute->admin_name, '//script[@type="text/x-template"]'); } + /** + * Attribute creation test. + * + * @param FunctionalTester $I + * @return void + */ public function testCreate(FunctionalTester $I): void { $I->loginAsAdmin(); @@ -40,6 +52,12 @@ class AttributeCest $I->seeRecord(Attribute::class, $testData); } + /** + * Attribute updation test. + * + * @param FunctionalTester $I + * @return void + */ public function testEdit(FunctionalTester $I): void { $attribute = $I->have(Attribute::class, ['use_in_flat' => 0]); @@ -66,11 +84,11 @@ class AttributeCest } /** - * @param FunctionalTester $I + * Fill form. * - * @param bool $skipType - * - * @return array with the test-data + * @param FunctionalTester $I + * @param bool $skipType + * @return array */ private function fillForm(FunctionalTester $I, bool $skipType = false): array {