From def001ff7908b7ce5991c9aa02b3a5cf7ac7c578 Mon Sep 17 00:00:00 2001 From: dumityty Date: Mon, 7 May 2018 22:22:06 +0100 Subject: [PATCH 1/7] delete all runs --- src/Xhgui/Controller/Run.php | 14 ++++++++++++++ src/routes.php | 4 ++++ src/templates/runs/list.twig | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/src/Xhgui/Controller/Run.php b/src/Xhgui/Controller/Run.php index 67de9132a..4d1b151ef 100644 --- a/src/Xhgui/Controller/Run.php +++ b/src/Xhgui/Controller/Run.php @@ -124,6 +124,20 @@ public function delete() $this->app->redirect($redirect); } + public function delete_all() { + $request = $this->app->request(); + + // Delete all profile runs. + $delete = $this->profiles->truncate(); + + $this->app->flash('success', 'Deleted all profiles'); + + $referrer = $request->getReferrer(); + // In case route is accessed directly the referrer is not set. + $redirect = isset($referrer) ? $referrer : $this->app->urlFor('home'); + $this->app->redirect($redirect); + } + public function url() { $request = $this->app->request(); diff --git a/src/routes.php b/src/routes.php index a673d8802..1becebfc8 100644 --- a/src/routes.php +++ b/src/routes.php @@ -34,6 +34,10 @@ $di['runController']->delete(); })->name('run.delete'); +$app->get('/run/delete_all', function () use ($di, $app) { + $di['runController']->delete_all(); +})->name('run.delete_all'); + $app->get('/url/view', function () use ($di, $app) { $app->controller = $di['runController']; $app->controller->url(); diff --git a/src/templates/runs/list.twig b/src/templates/runs/list.twig index 2dc85a179..7033da111 100644 --- a/src/templates/runs/list.twig +++ b/src/templates/runs/list.twig @@ -10,6 +10,10 @@ {% if runs|length or has_search %}
+ + Delete all + + Search From 581007944a1041ec050f6e0213e9d4dda29b73b9 Mon Sep 17 00:00:00 2001 From: dumityty Date: Tue, 8 May 2018 09:41:03 +0100 Subject: [PATCH 2/7] add unit test for delete all route --- tests/Controller/RunTest.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/Controller/RunTest.php b/tests/Controller/RunTest.php index ed496b3a0..19773c139 100644 --- a/tests/Controller/RunTest.php +++ b/tests/Controller/RunTest.php @@ -192,4 +192,29 @@ public function testDelete() $result = $this->profiles->getAll(); $this->assertCount(4, $result['results']); } + + public function testDeleteAll() + { + loadFixture($this->profiles, XHGUI_ROOT_DIR . '/tests/fixtures/results.json'); + + Environment::mock(array( + 'SCRIPT_NAME' => 'index.php', + 'PATH_INFO' => '/run/delete_all', + )); + + $this->app->expects($this->once()) + ->method('urlFor') + ->with('home'); + + $this->app->expects($this->once()) + ->method('redirect'); + + $result = $this->profiles->getAll(); + $this->assertCount(5, $result['results']); + + $this->runs->delete_all(); + + $result = $this->profiles->getAll(); + $this->assertCount(0, $result['results']); + } } From b65b0e62e144f3d642e05d272521bafd1ab1db87 Mon Sep 17 00:00:00 2001 From: dumityty Date: Tue, 8 May 2018 09:45:09 +0100 Subject: [PATCH 3/7] move bracket to new line for coding standards --- src/Xhgui/Controller/Run.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xhgui/Controller/Run.php b/src/Xhgui/Controller/Run.php index 4d1b151ef..ee118c86e 100644 --- a/src/Xhgui/Controller/Run.php +++ b/src/Xhgui/Controller/Run.php @@ -124,7 +124,8 @@ public function delete() $this->app->redirect($redirect); } - public function delete_all() { + public function delete_all() + { $request = $this->app->request(); // Delete all profile runs. From 7266c8454b4291f3d05e109884ff6c5b8ee858db Mon Sep 17 00:00:00 2001 From: dumityty Date: Tue, 8 May 2018 09:49:34 +0100 Subject: [PATCH 4/7] fix coding standards --- src/Xhgui/Controller/Run.php | 18 +++++++++--------- src/routes.php | 2 +- tests/Controller/RunTest.php | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Xhgui/Controller/Run.php b/src/Xhgui/Controller/Run.php index ee118c86e..b8074b175 100644 --- a/src/Xhgui/Controller/Run.php +++ b/src/Xhgui/Controller/Run.php @@ -124,19 +124,19 @@ public function delete() $this->app->redirect($redirect); } - public function delete_all() + public function deleteAll() { - $request = $this->app->request(); + $request = $this->app->request(); - // Delete all profile runs. - $delete = $this->profiles->truncate(); + // Delete all profile runs. + $delete = $this->profiles->truncate(); - $this->app->flash('success', 'Deleted all profiles'); + $this->app->flash('success', 'Deleted all profiles'); - $referrer = $request->getReferrer(); - // In case route is accessed directly the referrer is not set. - $redirect = isset($referrer) ? $referrer : $this->app->urlFor('home'); - $this->app->redirect($redirect); + $referrer = $request->getReferrer(); + // In case route is accessed directly the referrer is not set. + $redirect = isset($referrer) ? $referrer : $this->app->urlFor('home'); + $this->app->redirect($redirect); } public function url() diff --git a/src/routes.php b/src/routes.php index 1becebfc8..387ddb835 100644 --- a/src/routes.php +++ b/src/routes.php @@ -36,7 +36,7 @@ $app->get('/run/delete_all', function () use ($di, $app) { $di['runController']->delete_all(); -})->name('run.delete_all'); +})->name('run.deleteAll'); $app->get('/url/view', function () use ($di, $app) { $app->controller = $di['runController']; diff --git a/tests/Controller/RunTest.php b/tests/Controller/RunTest.php index 19773c139..0787ddece 100644 --- a/tests/Controller/RunTest.php +++ b/tests/Controller/RunTest.php @@ -195,26 +195,26 @@ public function testDelete() public function testDeleteAll() { - loadFixture($this->profiles, XHGUI_ROOT_DIR . '/tests/fixtures/results.json'); + loadFixture($this->profiles, XHGUI_ROOT_DIR . '/tests/fixtures/results.json'); - Environment::mock(array( - 'SCRIPT_NAME' => 'index.php', - 'PATH_INFO' => '/run/delete_all', - )); + Environment::mock(array( + 'SCRIPT_NAME' => 'index.php', + 'PATH_INFO' => '/run/delete_all', + )); - $this->app->expects($this->once()) - ->method('urlFor') - ->with('home'); + $this->app->expects($this->once()) + ->method('urlFor') + ->with('home'); - $this->app->expects($this->once()) - ->method('redirect'); + $this->app->expects($this->once()) + ->method('redirect'); - $result = $this->profiles->getAll(); - $this->assertCount(5, $result['results']); + $result = $this->profiles->getAll(); + $this->assertCount(5, $result['results']); - $this->runs->delete_all(); + $this->runs->delete_all(); - $result = $this->profiles->getAll(); - $this->assertCount(0, $result['results']); + $result = $this->profiles->getAll(); + $this->assertCount(0, $result['results']); } } From 0354dd3293bf28b3f4c3895c050c8b39149d9dc2 Mon Sep 17 00:00:00 2001 From: dumityty Date: Tue, 8 May 2018 09:56:49 +0100 Subject: [PATCH 5/7] fix indentation --- src/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes.php b/src/routes.php index 387ddb835..ddc130871 100644 --- a/src/routes.php +++ b/src/routes.php @@ -35,7 +35,7 @@ })->name('run.delete'); $app->get('/run/delete_all', function () use ($di, $app) { - $di['runController']->delete_all(); + $di['runController']->delete_all(); })->name('run.deleteAll'); $app->get('/url/view', function () use ($di, $app) { From 24d20af42297c0abac2ced4851d1c708bd2b224b Mon Sep 17 00:00:00 2001 From: dumityty Date: Tue, 8 May 2018 10:13:31 +0100 Subject: [PATCH 6/7] use correct function name --- src/routes.php | 2 +- tests/Controller/RunTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes.php b/src/routes.php index ddc130871..72f273b68 100644 --- a/src/routes.php +++ b/src/routes.php @@ -35,7 +35,7 @@ })->name('run.delete'); $app->get('/run/delete_all', function () use ($di, $app) { - $di['runController']->delete_all(); + $di['runController']->deleteAll(); })->name('run.deleteAll'); $app->get('/url/view', function () use ($di, $app) { diff --git a/tests/Controller/RunTest.php b/tests/Controller/RunTest.php index 0787ddece..0d07f830c 100644 --- a/tests/Controller/RunTest.php +++ b/tests/Controller/RunTest.php @@ -212,7 +212,7 @@ public function testDeleteAll() $result = $this->profiles->getAll(); $this->assertCount(5, $result['results']); - $this->runs->delete_all(); + $this->runs->deleteAll(); $result = $this->profiles->getAll(); $this->assertCount(0, $result['results']); From 223b15c1f605b5333cd422ed79cf5e84916162ca Mon Sep 17 00:00:00 2001 From: dumityty Date: Tue, 8 May 2018 13:19:08 +0100 Subject: [PATCH 7/7] update the route name in twig template --- src/templates/runs/list.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/runs/list.twig b/src/templates/runs/list.twig index 7033da111..83323e828 100644 --- a/src/templates/runs/list.twig +++ b/src/templates/runs/list.twig @@ -10,7 +10,7 @@ {% if runs|length or has_search %}
- + Delete all