Fix typos & remove commented code

bechir · atierant · commit 779ed967213e · 2023-04-04T16:20:43.000+02:00
diff --git a/assets/admin.js b/assets/admin.js
@@ -4,22 +4,6 @@ import Bloodhound from "bloodhound-js";
 import 'bootstrap-tagsinput';
 
 $(function() {
-    // Datetime picker initialization.
-    // See https://eonasdan.github.io/bootstrap-datetimepicker/
-    // $('[data-toggle="datetimepicker"]').datetimepicker({
-    //     icons: {
-    //         time: 'fa fa-clock-o',
-    //         date: 'fa fa-calendar',
-    //         up: 'fa fa-chevron-up',
-    //         down: 'fa fa-chevron-down',
-    //         previous: 'fa fa-chevron-left',
-    //         next: 'fa fa-chevron-right',
-    //         today: 'fa fa-check-circle-o',
-    //         clear: 'fa fa-trash',
-    //         close: 'fa fa-remove'
-    //     }
-    // });
-
     // Bootstrap-tagsinput initialization
     // https://bootstrap-tagsinput.github.io/bootstrap-tagsinput/examples/
     var $input = $('input[data-toggle="tagsinput"]');
diff --git a/assets/app.js b/assets/app.js
@@ -1,8 +1,6 @@
 import './styles/app.scss';
 
 // loads the Bootstrap jQuery plugins
-// import 'bootstrap-sass/assets/javascripts/bootstrap/transition.js';
-import 'bootstrap/js/dist/alert';
 import 'bootstrap/js/dist/alert';
 import 'bootstrap/js/dist/collapse';
 import 'bootstrap/js/dist/dropdown';
diff --git a/assets/styles/app.scss b/assets/styles/app.scss
@@ -154,8 +154,6 @@ body {
 
 header {
   margin-bottom: 2em;
-}
-
 
   .nav-link {
     padding: 0 2rem;
@@ -197,6 +195,7 @@ header {
       }
     }
   }
+}
 
 .body-container {
   flex: 1;
diff --git a/templates/admin/layout.html.twig b/templates/admin/layout.html.twig
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block header_navigation_links %}
-    <li class="nav-item{{ route in ['admin_index', 'admin_post_index'] ? ' active' : '' }}">
+    <li class="nav-item{{ _route in ['admin_index', 'admin_post_index'] ? ' active' : '' }}">
         <a class="nav-link" href="{{ path('admin_post_index') }}">
             <i class="fa fa-list-alt" aria-hidden="true"></i> {{ 'menu.post_list'|trans }}
         </a>
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -4,7 +4,7 @@
    See https://symfony.com/doc/current/templates.html#template-inheritance-and-layouts
 #}
 
-{% set route = app.request.get('_route') %}
+{% set _route = app.request.get('_route') %}
 
 <!DOCTYPE html>
 <html lang="{{ app.request.locale }}">
@@ -44,7 +44,7 @@
                         <div class="navbar-collapse collapse" id="appNavbar">
                             <ul class="navbar-nav ml-auto">
                                 {% block header_navigation_links %}
-                                    <li class="nav-item{{ route == 'blog_index' ? ' active' : '' }}">
+                                    <li class="nav-item{{ _route == 'blog_index' ? ' active' : '' }}">
                                         <a class="nav-link" href="{{ path('blog_index') }}">
                                             <i class="fa fa-home" aria-hidden="true"></i> {{ 'menu.homepage'|trans }}
                                         </a>
@@ -58,7 +58,7 @@
                                     {% endif %}
                                 {% endblock %}
 
-                                <li class="nav-item{{ route == 'blog_search' ? ' active' : '' }}">
+                                <li class="nav-item{{ _route == 'blog_search' ? ' active' : '' }}">
                                     <a class="nav-link" href="{{ path('blog_search') }}"> <i class="fa fa-search"></i> {{ 'menu.search'|trans }}</a>
                                 </li>
 
diff --git a/templates/form/layout.html.twig b/templates/form/layout.html.twig
@@ -2,17 +2,15 @@
 
 {# Errors #}
 
-{#
 {% block form_errors -%}
     {% if errors|length > 0 -%}
         {% if form is not rootform %}<span class="help-block">{% else %}<div class="alert alert-danger">{% endif %}
         <ul class="list-unstyled">
         {%- for error in errors -%}
-            {# use font-awesome icon library # }
+            {# use font-awesome icon library #}
             <li><span class="fa fa-exclamation-triangle"></span> {{ error.message }}</li>
         {%- endfor -%}
         </ul>
         {% if form is not rootform %}</span>{% else %}</div>{% endif %}
     {%- endif %}
 {%- endblock form_errors %}
-#}
diff --git a/tests/Controller/Admin/BlogControllerTest.php b/tests/Controller/Admin/BlogControllerTest.php
@@ -135,8 +135,8 @@ public function testAdminNewDuplicatedPost(): void
         // post titles must be unique, so trying to create the same post twice should result in an error
         $this->client->submit($form);
 
-        $this->assertSelectorTextContains('form .invalid-feedback .form-error-message', 'This title was already used in another blog post, but they must be unique.');
-        $this->assertSelectorExists('form #post_title.is-invalid');
+        $this->assertSelectorTextSame('form .form-group.has-error label', 'Title');
+        $this->assertSelectorTextContains('form .form-group.has-error .help-block', 'This title was already used in another blog post, but they must be unique.');
     }
 
     public function testAdminShowPost(): void

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,6 @@ body {`
`154`	`154`
`155`	`155`	`header {`
`156`	`156`	`margin-bottom: 2em;`
`157`		`-}`
`158`		`-`
`159`	`157`
`160`	`158`	`.nav-link {`
`161`	`159`	`padding: 0 2rem;`
`@@ -197,6 +195,7 @@ header {`
`197`	`195`	`}`
`198`	`196`	`}`
`199`	`197`	`}`
	`198`	`+}`
`200`	`199`
`201`	`200`	`.body-container {`
`202`	`201`	`flex: 1;`
Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ public function testAdminNewDuplicatedPost(): void`
`135`	`135`	`// post titles must be unique, so trying to create the same post twice should result in an error`
`136`	`136`	`$this->client->submit($form);`
`137`	`137`
`138`		`- $this->assertSelectorTextContains('form .invalid-feedback .form-error-message', 'This title was already used in another blog post, but they must be unique.');`
`139`		`- $this->assertSelectorExists('form #post_title.is-invalid');`
	`138`	`+ $this->assertSelectorTextSame('form .form-group.has-error label', 'Title');`
	`139`	`+ $this->assertSelectorTextContains('form .form-group.has-error .help-block', 'This title was already used in another blog post, but they must be unique.');`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public function testAdminShowPost(): void`