Merge pull request #912 from openeuropa/EWPP-1391

EWPP-1391: Remove deprecated ecl classes

composer.json

@@ -11,7 +11,7 @@
         "drupal/smart_trim": "^1.2",
         "drupal/twig_field_value": "^2.0",
         "drupal/ui_patterns": "^1.0",
-        "openeuropa/ecl-twig-loader": "3.x-dev",
+        "openeuropa/ecl-twig-loader": "^3.0",
         "openeuropa/oe_time_caching": "~1.0",
         "ralouphie/mimey": "^2.1"
     },

modules/oe_theme_helper/templates/oe-theme-helper-call-label-status.html.twig

@@ -14,5 +14,5 @@
   {% elseif name == 'closed' %}
     {% set background_class = ' ecl-label--low' %}
   {% endif %}
-  <span class="call-status ecl-label ecl-u-text-uppercase ecl-u-type-color-black{{ background_class }}">{{ label }}</span>
+  <span class="call-status ecl-label ecl-u-type-color-black{{ background_class }}">{{ label }}</span>
 {% endif %}

modules/oe_theme_helper/templates/oe-theme-helper-call-status.html.twig

@@ -6,4 +6,4 @@
  * @see template_preprocess_oe_theme_helper_call_status()
  */
 #}
-<span {{ attributes.addClass('ecl-u-text-uppercase') }}>{{ label }}</span>
+<span {{ attributes.addClass('ecl-u-type-uppercase') }}>{{ label }}</span>

tests/Functional/ContentCallForProposalsRenderTest.php

@@ -119,7 +119,7 @@ public function testProposalRendering(): void {
     $field_list_assert->assertPattern($details_expected_values, $details_html);
     $field_list_assert->assertVariant('horizontal', $details_html);
 
-    $selector = '//*[text() = "Status"]/following-sibling::dd[1]/div/span[@class="call-proposals-status ecl-u-text-uppercase"]';
+    $selector = '//*[text() = "Status"]/following-sibling::dd[1]/div/span[@class="call-proposals-status ecl-u-type-uppercase"]';
     $this->assertSession()->elementExists('xpath', $selector);
     $this->assertEquals('N/A', $content_items[0]->find('xpath', $selector)->getText());
 

tests/Kernel/CallForProposalsRenderTest.php

@@ -132,7 +132,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--high.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--high.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Test short title fallback.
@@ -210,7 +210,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--low.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--low.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Check status Upcoming label and background.
@@ -249,7 +249,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--medium.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--medium.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Check status N/A.

tests/Kernel/CallForTendersRenderTest.php

@@ -135,7 +135,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--high.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--high.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Test short title fallback.
@@ -199,7 +199,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--low.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--low.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Check Deadline date is striked when Call for tenders is closed.
@@ -237,7 +237,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--medium.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--medium.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Check status N/A.

tests/Kernel/ConsultationRenderTest.php

@@ -116,7 +116,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--high.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--high.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Test short title fallback.
@@ -150,7 +150,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--low.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--low.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
 
     // Check status Upcoming label and background.
@@ -179,7 +179,7 @@ public function testTeaser(): void {
     $assert->assertPattern($expected_values, $html);
 
     $crawler = new Crawler($html);
-    $actual = $crawler->filter('span.call-status.ecl-label.ecl-u-text-uppercase.ecl-label--medium.ecl-u-type-color-black');
+    $actual = $crawler->filter('span.call-status.ecl-label.ecl-label--medium.ecl-u-type-color-black');
     $this->assertCount(1, $actual);
   }