-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #326 from gloggi/generateSonstiges_lindo
Generate sonstiges lindo
- Loading branch information
Showing
8 changed files
with
286 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?php | ||
|
|
||
| namespace App\Http\Requests; | ||
|
|
||
| use Illuminate\Support\Facades\Lang; | ||
|
|
||
| class BlockGenerateRequest extends FormRequest { | ||
|
|
||
| /** | ||
| * Get the validation rules that apply to the request. | ||
| * | ||
| * @return array | ||
| */ | ||
| public function rules() { | ||
| return [ | ||
| 'name' => 'required|max:255', | ||
| 'blocks_startdate' => 'date|required', | ||
| 'blocks_enddate' => 'date|required', | ||
| 'requirements' => 'nullable|regex:/^\d+(,\d+)*$/|allExistInCourse', | ||
| ]; | ||
| } | ||
|
|
||
| public function attributes() { | ||
| return Lang::get('t.models.block'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| @extends('layouts.default') | ||
|
|
||
| @section('pagetitle'){{__('t.views.admin.block_generate.page_title') }}@endsection | ||
|
|
||
| @section('content') | ||
|
|
||
| <b-card> | ||
| <template #header>{{__('t.views.admin.block_generate.generate_from')}}</template> | ||
|
|
||
| <form-basic :action="['admin.block.generate_store', { course: {{ $course->id }} }]" enctype="multipart/form-data"> | ||
|
|
||
| <input-text name="name" label="{{__('t.models.block.name')}}" required autofocus></input-text> | ||
|
|
||
| <input-date name="blocks_startdate" value="{{ Auth::user()->getLastUsedBlockDate($course)->format('Y-m-d') }}" label="{{__('t.models.block.blocks_startdate')}}" required></input-date> | ||
|
|
||
| <input-date name="blocks_enddate" value="{{ Auth::user()->getLastUsedBlockDate($course)->format('Y-m-d') }}" label="{{__('t.models.block.blocks_enddate')}}" required></input-date> | ||
|
|
||
| <input-multi-select | ||
| name="requirements" | ||
| label="{{__('t.models.block.requirements')}}" | ||
| :options="{{ json_encode($course->requirements->map->only('id', 'content')) }}" | ||
| display-field="content" | ||
| multiple></input-multi-select> | ||
|
|
||
| <button-submit label="{{__('t.views.admin.block_generate.generate')}}"></button-submit> | ||
|
|
||
| </form-basic> | ||
|
|
||
| </b-card> | ||
|
|
||
| @endsection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| <?php | ||
|
|
||
| namespace Feature\Admin\Block; | ||
|
|
||
| use App\Models\Block; | ||
| use Carbon\Carbon; | ||
| use Illuminate\Testing\TestResponse; | ||
| use Illuminate\Validation\ValidationException; | ||
| use Tests\TestCaseWithCourse; | ||
|
|
||
| class GenerateBlockTest extends TestCaseWithCourse { | ||
|
|
||
| private $payload; | ||
|
|
||
| public function setUp(): void { | ||
| parent::setUp(); | ||
|
|
||
| $this->payload = ['name' => 'SonstigesBlockGenTest', 'blocks_startdate' => '01.10.2023', 'blocks_enddate' => '07.10.2023', 'requirements' => null]; | ||
| } | ||
|
|
||
| public function test_shouldRequireLogin() { | ||
| // given | ||
| auth()->logout(); | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $this->payload); | ||
|
|
||
| // then | ||
| $response->assertStatus(302); | ||
| $response->assertRedirect('/login'); | ||
| } | ||
|
|
||
| public function test_shouldGenerateAndDisplayOneBlock() { | ||
| // given | ||
| $payload = $this->payload; | ||
| $payload['blocks_enddate'] = $payload['blocks_startdate']; | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $response->assertStatus(302); | ||
| $response->assertRedirect('/course/' . $this->courseId . '/admin/blocks'); | ||
| /** @var TestResponse $response */ | ||
| $response = $response->followRedirects(); | ||
| $response->assertSee($payload['name']); | ||
| $response->assertSee($payload['blocks_startdate']); | ||
| } | ||
|
|
||
| public function test_shouldGenerateAndDisplayBlocks() { | ||
| // given | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $this->payload); | ||
|
|
||
| // then | ||
| $response->assertStatus(302); | ||
| $response->assertRedirect('/course/' . $this->courseId . '/admin/blocks'); | ||
| /** @var TestResponse $response */ | ||
| $response = $response->followRedirects(); | ||
| $response->assertSee($this->payload['name']); | ||
| $response->assertSee($this->payload['blocks_startdate']); | ||
| $response->assertSee($this->payload['blocks_enddate']); | ||
| } | ||
|
|
||
| public function test_shouldGenerateAndDisplayBlocksWithRequirements() { | ||
| // given | ||
| $payload = $this->payload; | ||
| $payload = $this->payload; | ||
| $requirementIds = [$this->createRequirement(), 'abc', $this->createRequirement()]; | ||
| $payload['requirements'] = implode(',', $requirementIds); | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $this->assertInstanceOf(ValidationException::class, $response->exception); | ||
| /** @var ValidationException $exception */ | ||
| $exception = $response->exception; | ||
| $this->assertEquals('Anforderungen Format ist ungültig.', $exception->validator->errors()->first('requirements')); | ||
| } | ||
|
|
||
| public function test_shouldValidateNewBlockData_invalidRequirements() { | ||
| // given | ||
| $payload = $this->payload; | ||
| $payload['name'] = ' '; | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $this->assertInstanceOf(ValidationException::class, $response->exception); | ||
| /** @var ValidationException $exception */ | ||
| $exception = $response->exception; | ||
| $this->assertEquals('Blockname muss ausgefüllt sein.', $exception->validator->errors()->first('name')); | ||
| } | ||
|
|
||
| public function test_shouldNotCreateBlockWithNegativeTimespan() { | ||
| // given | ||
| $payload = $this->payload; | ||
| $payload['name'] = 'NegSonstigesBlock'; | ||
| $payload['blocks_startdate'] = '02.10.2023'; | ||
| $payload['blocks_enddate'] = '01.10.2023'; | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $response->assertStatus(302); | ||
| $response->assertRedirect('/course/' . $this->courseId . '/admin/blocks'); | ||
| /** @var TestResponse $response */ | ||
| $response = $response->followRedirects(); | ||
| $response->assertSee('Es wurden keine Blöcke generiert.'); | ||
| $response->assertDontSee($this->payload['name']); | ||
| } | ||
|
|
||
| public function test_shouldValidateNewBlockData_noBlockName() { | ||
| // given | ||
| $payload = $this->payload; | ||
| unset($payload['name']); | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $this->assertInstanceOf(ValidationException::class, $response->exception); | ||
| /** @var ValidationException $exception */ | ||
| $exception = $response->exception; | ||
| $this->assertEquals('Blockname muss ausgefüllt sein.', $exception->validator->errors()->first('name')); | ||
| } | ||
|
|
||
| public function test_shouldValidateNewBlockData_longBlockname() { | ||
| // given | ||
| $payload = $this->payload; | ||
| $payload['name'] = 'Extrem langer Blockname 1Extrem langer Blockname 2Extrem langer Blockname 3Extrem langer Blockname 4Extrem langer Blockname 5Extrem langer Blockname 6Extrem langer Blockname 7Extrem langer Blockname 8Extrem langer Blockname 9Extrem langer Blockname 10Extrem langer Blockname 11'; | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $this->assertInstanceOf(ValidationException::class, $response->exception); | ||
| /** @var ValidationException $exception */ | ||
| $exception = $response->exception; | ||
| $this->assertEquals('Blockname darf maximal 255 Zeichen haben.', $exception->validator->errors()->first('name')); | ||
| } | ||
|
|
||
| public function test_shouldValidateNewBlockData_invalidDate() { | ||
| // given | ||
| $payload = $this->payload; | ||
| $payload['blocks_startdate'] = 'asdf'; | ||
|
|
||
| // when | ||
| $response = $this->post('/course/' . $this->courseId . '/admin/blocks/generate', $payload); | ||
|
|
||
| // then | ||
| $this->assertInstanceOf(ValidationException::class, $response->exception); | ||
| /** @var ValidationException $exception */ | ||
| $exception = $response->exception; | ||
| $this->assertEquals('Startdatum muss ein gültiges Datum sein.', $exception->validator->errors()->first('blocks_startdate')); | ||
| } | ||
| } | ||
|
|
||
|
|