Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 17 deletions

diff --git a/spec/haml_lint/linter/no_plain_nodes_spec.rb b/spec/haml_lint/linter/no_plain_nodes_spec.rb
index eeb0e4ea96f..235e742bc54 100644
--- a/spec/haml_lint/linter/no_plain_nodes_spec.rb
+++ b/spec/haml_lint/linter/no_plain_nodes_spec.rb
@@ -6,7 +6,7 @@ require 'haml_lint/spec'
 
 require_relative '../../../haml_lint/linter/no_plain_nodes'
 
-RSpec.describe HamlLint::Linter::NoPlainNodes do
+RSpec.describe HamlLint::Linter::NoPlainNodes, feature_category: :tooling do
   include_context 'linter'
 
   context 'reports when a tag has an inline plain node' do
@@ -68,27 +68,27 @@ RSpec.describe HamlLint::Linter::NoPlainNodes do
   end
 
   context 'does not report multiline when one or more html entities' do
-    %w( > © »).each do |elem|
-      let(:haml) { <<-HAML }
-        %tag
-          #{elem}
-      HAML
-
-      it elem do
-        is_expected.not_to report_lint
+    %w[&nbsp;&gt; &#x000A9; &#187;].each do |elem|
+      context "with #{elem}" do
+        let(:haml) { <<-HAML }
+          %tag
+            #{elem}
+        HAML
+
+        it { is_expected.not_to report_lint }
       end
     end
   end
 
   context 'does report multiline when one or more html entities amidst plain text' do
-    %w(&nbsp;Test Test&gt; &#x000A9;Hello &nbsp;Hello&#187;).each do |elem|
-      let(:haml) { <<-HAML }
-        %tag
-          #{elem}
-      HAML
-
-      it elem do
-        is_expected.to report_lint
+    %w[&nbsp;Test Test&gt; &#x000A9;Hello &nbsp;Hello&#187;].each do |elem|
+      context "with #{elem}" do
+        let(:haml) { <<-HAML }
+          %tag
+            #{elem}
+        HAML
+
+        it { is_expected.to report_lint }
       end
     end
   end