minor EasyCorp#1411 Added some missing CSS classes for action links/buttons (javiereguiluz)

javiereguiluz · javiereguiluz · commit 7433f73bb64f · 2016-11-26T12:33:10.000+01:00
This PR was merged into the master branch. Discussion ---------- Added some missing CSS classes for action links/buttons This replaces EasyCorp#1396. Using `id` instead of `class` is increasingly considered a bad practice in CSS. EasyAdmin already applies a default CSS class for most actions, so this PR ensures that all actions have that default CSS. Commits ------- e89904a Added some missing CSS classes for action links/buttons
diff --git a/Resources/views/form/bootstrap_3_layout.html.twig b/Resources/views/form/bootstrap_3_layout.html.twig
@@ -468,7 +468,7 @@
                 <div id="form-actions-row">
                     {% block item_actions %}
                         {# the 'save' action is hardcoded for the 'edit' and 'new' views #}
-                        <button type="submit" class="btn btn-primary">
+                        <button type="submit" class="btn btn-primary action-save">
                             <i class="fa fa-save"></i> {{ 'action.save'|trans(_trans_parameters, _translation_domain) }}
                         </button>
 
diff --git a/Tests/Controller/DefaultBackendTest.php b/Tests/Controller/DefaultBackendTest.php
@@ -130,6 +130,7 @@ public function testListViewSearchAction()
         );
 
         $this->assertEquals('Search', trim($crawler->filter('.action-search button[type=submit]')->text()));
+        $this->assertContains('action-search', $crawler->filter('.global-actions > div')->first()->attr('class'));
         $this->assertEquals('_self', $crawler->filter('.action-search button')->attr('formtarget'));
 
         $i = 0;
@@ -146,6 +147,7 @@ public function testListViewNewAction()
         $crawler = $this->requestListView();
 
         $this->assertEquals('Add Category', trim($crawler->filter('.global-actions a.btn')->text()));
+        $this->assertContains('action-new', trim($crawler->filter('.global-actions a.btn')->attr('class')));
         $this->assertEquals('_self', $crawler->filter('.global-actions a.btn')->attr('target'));
         $this->assertCount(0, $crawler->filter('.global-actions a.btn i'), 'The default "new" button shows no icon.');
         $this->assertStringStartsWith('/admin/?action=new&entity=Category&sortField=id&sortDirection=DESC&page=1', $crawler->filter('.global-actions a.btn')->attr('href'));
@@ -156,6 +158,7 @@ public function testListViewItemActions()
         $crawler = $this->requestListView();
 
         $this->assertEquals('Edit', trim($crawler->filter('#main .table td.actions a')->eq(0)->text()));
+        $this->assertContains('action-edit', trim($crawler->filter('#main .table td.actions a')->eq(0)->attr('class')));
         $this->assertEquals('_self', $crawler->filter('#main .table td.actions a')->eq(0)->attr('target'));
         $this->assertEquals('Delete', trim($crawler->filter('#main .table td.actions a')->eq(1)->text()));
     }
@@ -261,13 +264,16 @@ public function testShowViewActions()
         $crawler = $this->requestShowView();
 
         // edit action
+        $this->assertContains('action-edit', trim($crawler->filter('.form-actions a:contains("Edit")')->attr('class')));
         $this->assertContains('fa-edit', trim($crawler->filter('.form-actions a:contains("Edit") i')->attr('class')));
         $this->assertEquals('_self', $crawler->filter('.form-actions a:contains("Edit")')->attr('target'));
 
         // delete action
+        $this->assertContains('action-delete', trim($crawler->filter('.form-actions a:contains("Delete")')->attr('class')));
         $this->assertContains('fa-trash', trim($crawler->filter('.form-actions a:contains("Delete") i')->attr('class')));
 
         // list action
+        $this->assertContains('action-list', trim($crawler->filter('.form-actions a:contains("Back to listing")')->attr('class')));
         $this->assertEquals('btn btn-secondary action-list', trim($crawler->filter('.form-actions a:contains("Back to listing")')->attr('class')));
         $this->assertEquals('_self', $crawler->filter('.form-actions a:contains("Back to listing")')->attr('target'));
     }
@@ -340,9 +346,11 @@ public function testEditViewActions()
         $crawler = $this->requestEditView();
 
         // save action
+        $this->assertContains('action-save', trim($crawler->filter('#form-actions-row button:contains("Save changes")')->attr('class')));
         $this->assertContains('fa-save', trim($crawler->filter('#form-actions-row button:contains("Save changes") i')->attr('class')));
 
         // delete action
+        $this->assertContains('action-delete', trim($crawler->filter('#form-actions-row a:contains("Delete")')->attr('class')));
         $this->assertContains('fa-trash', trim($crawler->filter('#form-actions-row a:contains("Delete") i')->attr('class')));
 
         // list action
@@ -459,6 +467,7 @@ public function testNewViewActions()
         $crawler = $this->requestNewView();
 
         // save action
+        $this->assertContains('action-save', trim($crawler->filter('#form-actions-row button:contains("Save changes")')->attr('class')));
         $this->assertContains('fa-save', trim($crawler->filter('#form-actions-row button:contains("Save changes") i')->attr('class')));
 
         // list action
