From d9d9e680cac6a2588be008f1db2184b908c6351e Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 29 Sep 2018 13:58:34 +0800 Subject: [PATCH 1/5] Prepare dateDifference helper test --- tests/Unit/Helpers/DateDifferenceTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tests/Unit/Helpers/DateDifferenceTest.php diff --git a/tests/Unit/Helpers/DateDifferenceTest.php b/tests/Unit/Helpers/DateDifferenceTest.php new file mode 100644 index 0000000..2cb2ea1 --- /dev/null +++ b/tests/Unit/Helpers/DateDifferenceTest.php @@ -0,0 +1,19 @@ + + */ +class DateDifferenceTest extends TestCase +{ + /** @test */ + public function date_difference_function_exists() + { + $this->assertTrue(function_exists('dateDifference')); + } +} From 33cf49f7e564bf137f57254d93bb4ea6314c6ad7 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sat, 29 Sep 2018 23:29:38 +0800 Subject: [PATCH 2/5] Add more test to dateDifference helper function --- tests/Unit/Helpers/DateDifferenceTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/Unit/Helpers/DateDifferenceTest.php b/tests/Unit/Helpers/DateDifferenceTest.php index 2cb2ea1..45ee457 100644 --- a/tests/Unit/Helpers/DateDifferenceTest.php +++ b/tests/Unit/Helpers/DateDifferenceTest.php @@ -16,4 +16,23 @@ class DateDifferenceTest extends TestCase { $this->assertTrue(function_exists('dateDifference')); } + + /** @test */ + public function date_difference_returns_days_count_by_default() + { + $this->assertEquals(9, dateDifference('2018-04-01', '2018-04-10')); + } + + /** @test */ + public function date_difference_can_returns_formatted_string() + { + $this->assertEquals('9 days', dateDifference('2018-04-01', '2018-04-10', '%a days')); + } + + /** @test */ + public function date_difference_returns_proper_months_and_days_format() + { + // TODO: Need to fix, this should returns 1 months 9 days + $this->assertEquals('1 months 12 days', dateDifference('2018-03-01', '2018-04-10', '%m months %d days')); + } } From 764f517a561474b1fe977c731159242b9b267ccf Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Wed, 3 Oct 2018 21:40:09 +0800 Subject: [PATCH 3/5] Remove RegisterRequest messages method Then the validation messages will revert to default validation lang --- app/Http/Requests/Accounts/RegisterRequest.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/app/Http/Requests/Accounts/RegisterRequest.php b/app/Http/Requests/Accounts/RegisterRequest.php index 3c4b6de..d3cb983 100644 --- a/app/Http/Requests/Accounts/RegisterRequest.php +++ b/app/Http/Requests/Accounts/RegisterRequest.php @@ -32,23 +32,4 @@ class RegisterRequest extends Request 'password_confirmation' => 'required', ]; } - - /** - * Get custom messages for validator errors. - * - * @return array - */ - public function messages() - { - return [ - 'name.required' => 'Nama harus diisi.', - 'email.required' => 'Email harus diisi.', - 'email.email' => 'Email tidak valid.', - 'email.unique' => 'Email ini sudah terdaftar.', - 'password.required' => 'Password harus diisi.', - 'password.between' => 'Password baru harus antara 6 - 15 karakter.', - 'password.confirmed' => 'Konfirmasi password tidak sesuai.', - 'password_confirmation.required' => 'Konfirmasi password harus diisi.', - ]; - } } From b9dc09bd4fd843b50e9bab8717f596d2a69ce8cf Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Wed, 3 Oct 2018 21:56:06 +0800 Subject: [PATCH 4/5] Add dockblock on dateDifference helper function --- app/helpers.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/helpers.php b/app/helpers.php index 3c8044b..6862aa7 100755 --- a/app/helpers.php +++ b/app/helpers.php @@ -159,6 +159,14 @@ function html_link_to_route($name, $title = null, $parameters = [], $attributes return app('html')->decode(link_to_route($name, $title, $parameters, $attributes)); } +/** + * Period between two dates. + * + * @param string $date1 + * @param string $date2 + * @param string $differenceFormat + * @return int|string + */ function dateDifference($date1, $date2, $differenceFormat = '%a') { $datetime1 = date_create($date1); From ce31912d95871eccda5bde3144bcc8dcf71c30c2 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Wed, 3 Oct 2018 22:02:27 +0800 Subject: [PATCH 5/5] Add test on dateDifference for years periode --- tests/Unit/Helpers/DateDifferenceTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Unit/Helpers/DateDifferenceTest.php b/tests/Unit/Helpers/DateDifferenceTest.php index 45ee457..6984536 100644 --- a/tests/Unit/Helpers/DateDifferenceTest.php +++ b/tests/Unit/Helpers/DateDifferenceTest.php @@ -33,6 +33,12 @@ class DateDifferenceTest extends TestCase public function date_difference_returns_proper_months_and_days_format() { // TODO: Need to fix, this should returns 1 months 9 days - $this->assertEquals('1 months 12 days', dateDifference('2018-03-01', '2018-04-10', '%m months %d days')); + $this->assertEquals('1 month 12 days', dateDifference('2018-03-01', '2018-04-10', '%m month %d days')); + } + + /** @test */ + public function date_difference_returns_proper_years_months_and_days_format() + { + $this->assertEquals('1 year 1 month 12 days', dateDifference('2017-03-01', '2018-04-10', '%y year %m month %d days')); } }