cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
StyleCI Bot
2023-10-09 07:16:01 +00:00
parent 5f9e3803ad
commit 0b73ac5165
6 changed files with 90 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Client/kb/UserController.php
View File

@@ -269,8 +269,7 @@ class UserController extends Controller
$page = $page
->where(['status' => 1, 'visibility'=>1])
->first();
}
else {
} else {
$page = $page->where('status', 1)->first();
}

34
tests/Unit/ArticleControllerTest.php
View File

@@ -7,16 +7,16 @@ use App\Http\Requests\kb\ArticleUpdate;
use App\Http\Requests\kb\CategoryRequest;
use App\Model\kb\Article;
use App\Model\kb\Category;
use App\Model\kb\Comment;
use App\Model\kb\Relationship;
use App\User;
use Faker\Factory as FakerFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Tests\TestCase;
use Illuminate\Support\Facades\Lang;
class ArticleControllerTest extends TestCase
{
//use DatabaseTransactions;
@@ -57,6 +57,7 @@ class ArticleControllerTest extends TestCase
$this->assertAuthenticated();
}
/** @test */
public function it_can_display_the_article_index_page()
{
@@ -64,16 +65,16 @@ class ArticleControllerTest extends TestCase
$response->assertStatus(200);
}
public function testStoreArticleWithCategories()
{
// Create a Category model for testing
$data = [
'name' => 'Test Category',
'description' => 'Test Category Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertTrue($validator->passes());
@@ -84,7 +85,6 @@ class ArticleControllerTest extends TestCase
$this->assertDatabaseHas('kb_category', $data);
$category = Category::latest()->first();
// Article data
$articleData = [
'name' => 'Test Article',
@@ -101,12 +101,11 @@ class ArticleControllerTest extends TestCase
// Act
try {
$validator = Validator::make($articleData, (new ArticleRequest)->rules());
$validator = Validator::make($articleData, (new ArticleRequest())->rules());
$this->assertTrue($validator->passes());
$response = $this->post(route('article.store'), $articleData);
$response->assertStatus(200);
} catch (Exception $e) {
$response = null;
}
@@ -117,13 +116,12 @@ class ArticleControllerTest extends TestCase
$article = Article::latest()->first();
$article_relationship = new Relationship;
$article_relationship = new Relationship();
$article_relationship->category_id = $category->id;
$article_relationship->article_id = $article->id;
$article_relationship->save();
// Verify that the article was created and the category relationship exists
$this->assertDatabaseHas('kb_article', [
'name' => $articleData['name'],
@@ -137,7 +135,7 @@ class ArticleControllerTest extends TestCase
'article_id' => Article::latest()->first()->id, // Get the ID of the latest created article
]);
} else {
$this->fail("Exception thrown: " . $e->getMessage());
$this->fail('Exception thrown: '.$e->getMessage());
}
}
@@ -148,17 +146,17 @@ class ArticleControllerTest extends TestCase
$relationship = Relationship::latest()->first(); // Create a sample Relationship for testing
$category = Category::latest()->first(); // Create a sample Category for testing
$assign = $relationship->where('article_id', 'id')->pluck('category_id');
$category = $category->pluck('id', 'name');
$response = $this->get("/article/{$article->id}/edit",
$response = $this->get(
"/article/{$article->id}/edit",
['category' => $category,
'article' => $article,
'assign'=>$assign
]);
'assign' => $assign,
]
);
$response->assertStatus(200);
}
public function testUpdateArticle()
@@ -179,8 +177,7 @@ class ArticleControllerTest extends TestCase
'minute' => '20',
];
$validator = Validator::make($data, (new ArticleUpdate)->rules());
$validator = Validator::make($data, (new ArticleUpdate())->rules());
$this->assertTrue($validator->passes());
@@ -197,7 +194,6 @@ class ArticleControllerTest extends TestCase
$relation->category_id = $category->id;
$relation->article_id = $article->id;
$relation->save();
}
/** @test */
@@ -214,7 +210,6 @@ class ArticleControllerTest extends TestCase
// Assert that success message is flashed
$response->assertSessionHas('success', Lang::get('lang.article_deleted_successfully'));
// Create a category
$category = Category::latest()->first();
@@ -228,7 +223,6 @@ class ArticleControllerTest extends TestCase
$this->assertDatabaseMissing('kb_category', ['id' => $category->id]);
}
public function it_cannot_delete_a_article_if_related()
{
// Create a category

30
tests/Unit/CategoryControllerTest.php
View File

@@ -3,12 +3,9 @@
namespace Tests\Unit;
use App\Http\Requests\kb\CategoryRequest;
use App\Model\helpdesk\Ticket\Ticket_Thread;
use App\Model\helpdesk\Ticket\Tickets;
use App\Model\kb\Category;
use App\Model\kb\Relationship;
use App\User;
use DateTimeZone;
use Faker\Factory as FakerFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Hash;
@@ -16,7 +13,6 @@ use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Tests\TestCase;
use UTC;
class CategoryControllerTest extends TestCase
{
@@ -74,7 +70,7 @@ class CategoryControllerTest extends TestCase
'description' => 'Category Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertTrue($validator->passes());
@@ -83,7 +79,6 @@ class CategoryControllerTest extends TestCase
$response->assertStatus(302);
$response->assertSessionHas('success');
$this->assertDatabaseHas('kb_category', $data);
}
public function testValidationFailsWhenNameMissing()
@@ -92,7 +87,7 @@ class CategoryControllerTest extends TestCase
'description' => 'Category Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
@@ -106,7 +101,7 @@ class CategoryControllerTest extends TestCase
'description' => 'Category Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
@@ -120,7 +115,7 @@ class CategoryControllerTest extends TestCase
'description' => 'Category Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
@@ -133,22 +128,23 @@ class CategoryControllerTest extends TestCase
'name' => 'New Category',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
$this->assertTrue($validator->errors()->has('description'));
}
public function testEditCategory()
{
$category = Category::latest()->first();
$categories = Category::pluck('name', 'id')->toArray();
$response = $this->get("/category/{$category->id}/edit",
$response = $this->get(
"/category/{$category->id}/edit",
['category' => $category,
'categories' => $categories,
]);
]
);
$response->assertStatus(200);
}
@@ -163,7 +159,7 @@ class CategoryControllerTest extends TestCase
'description' => 'Updated Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertTrue($validator->passes());
@@ -174,7 +170,6 @@ class CategoryControllerTest extends TestCase
$this->assertDatabaseHas('kb_category', $data);
}
/** @test */
public function it_cannot_update_an_existing_category()
{
@@ -186,20 +181,18 @@ class CategoryControllerTest extends TestCase
'description' => 'Updated Description',
];
$validator = Validator::make($data, (new CategoryRequest)->rules());
$validator = Validator::make($data, (new CategoryRequest())->rules());
$this->assertFalse($validator->passes());
$response = $this->put(route('category.update', $category->id), $data);
$response->assertStatus(302);
$this->assertTrue($validator->fails());
$this->assertTrue($validator->errors()->has('name'));
}
/** @test */
public function it_can_delete_a_category()
{
// Create a category
$category = Category::latest()->first();
@@ -217,7 +210,6 @@ class CategoryControllerTest extends TestCase
// Assert that the response has a success message
$response->assertSessionHas('success', Lang::get('lang.category_deleted_successfully'));
}
/** @test */

20
tests/Unit/PageControllerTest.php
View File

@@ -2,8 +2,7 @@
namespace Tests\Unit;
use App\Http\Requests\kb\CategoryRequest;
use App\Model\kb\Category;
use App\Http\Requests\kb\PageRequest;
use App\Model\kb\Page;
use App\User;
use Faker\Factory as FakerFactory;
@@ -11,7 +10,6 @@ use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Tests\TestCase;
use App\Http\Requests\kb\PageRequest;
class PageControllerTest extends TestCase
{
@@ -67,8 +65,8 @@ class PageControllerTest extends TestCase
$response = $this->get('/page/create');
$response->assertStatus(200);
}
public function testValidationPasses()
{
$data = [
@@ -76,7 +74,7 @@ class PageControllerTest extends TestCase
'description' => 'Page Description',
];
$validator = Validator::make($data, (new PageRequest)->rules());
$validator = Validator::make($data, (new PageRequest())->rules());
$this->assertTrue($validator->passes());
@@ -93,7 +91,7 @@ class PageControllerTest extends TestCase
'description' => 'Page Description',
];
$validator = Validator::make($data, (new PageRequest)->rules());
$validator = Validator::make($data, (new PageRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
@@ -107,7 +105,7 @@ class PageControllerTest extends TestCase
'description' => 'Page Description',
];
$validator = Validator::make($data, (new PageRequest)->rules());
$validator = Validator::make($data, (new PageRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
@@ -120,7 +118,7 @@ class PageControllerTest extends TestCase
'name' => 'New',
];
$validator = Validator::make($data, (new PageRequest)->rules());
$validator = Validator::make($data, (new PageRequest())->rules());
$this->assertFalse($validator->passes());
$this->assertTrue($validator->fails());
@@ -134,7 +132,6 @@ class PageControllerTest extends TestCase
$response = $this->get('/page/'.$page->id.'/edit');
$response->assertStatus(200);
}
public function testUpdatePage()
@@ -146,7 +143,7 @@ class PageControllerTest extends TestCase
'description' => 'Updated Description',
];
$validator = Validator::make($data, (new PageRequest)->rules());
$validator = Validator::make($data, (new PageRequest())->rules());
$this->assertTrue($validator->passes());
$response = $this->put('/page/'.$page->id, $data);
@@ -165,7 +162,7 @@ class PageControllerTest extends TestCase
'description' => 'Updated Description',
];
$validator = Validator::make($data, (new PageRequest)->rules());
$validator = Validator::make($data, (new PageRequest())->rules());
$this->assertFalse($validator->passes());
$response = $this->put('/page/'.$page->id, $data);
@@ -184,5 +181,4 @@ class PageControllerTest extends TestCase
$this->assertDatabaseMissing('kb_pages', ['id' => $page->id]);
// You can add more assertions as needed.
}
}