Update and add tests

Author: jhutchison-nava

dpc-portal/app/components/core/icon/uswds_component.rb

@@ -14,7 +14,7 @@ def initialize(name, size: 2, additional_classes: [])
       def icon_classes
         classes = @additional_classes
         # uswds only 'usa-icon--*' classes only start at size-3 (and end at size-9)
-        classes << ['usa-icon', (@size >= 3 && @size <= 9) ? "usa-icon--size-#{@size}" : '']
+        classes << ['usa-icon', @size >= 3 && @size <= 9 ? "usa-icon--size-#{@size}" : '']
         classes.uniq.join(' ').strip
       end
     end

dpc-portal/spec/components/core/icon/uswds_component_spec.rb

@@ -12,7 +12,7 @@
 
     let(:expected_html) do
       <<~HTML
-        <svg class="usa-icon" style="transform: scale(1)" aria-hidden="true" role="img">
+        <svg class="usa-icon" aria-hidden="true" role="img">
           <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#lock></use>
         </svg>
       HTML
@@ -24,23 +24,63 @@
 
     it { is_expected.to match_html_fragment(expected_html) }
 
-    context 'changed size' do
+    context 'icon size 3' do
+      let(:component) { described_class.new('circle_check', size: 3) }
+      let(:expected_html) do
+        <<~HTML
+          <svg class="usa-icon usa-icon--size-3" aria-hidden="true" role="img">
+            <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#circle_check></use>
+          </svg>
+        HTML
+      end
+
+      it { is_expected.to match_html_fragment(expected_html) }
+    end
+
+    context 'no icon size' do
+      let(:component) { described_class.new('circle_check') }
+      let(:expected_html) do
+        <<~HTML
+          <svg class="usa-icon" aria-hidden="true" role="img">
+            <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#circle_check></use>
+          </svg>
+        HTML
+      end
+
+      it { is_expected.to match_html_fragment(expected_html) }
+    end
+
+    context 'icon size 2' do
       let(:component) { described_class.new('circle_check', size: 2) }
       let(:expected_html) do
         <<~HTML
-          <svg class="usa-icon" style="transform: scale(2)" aria-hidden="true" role="img">
+          <svg class="usa-icon" aria-hidden="true" role="img">
             <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#circle_check></use>
           </svg>
         HTML
       end
 
       it { is_expected.to match_html_fragment(expected_html) }
     end
+
+    context 'icon size 10' do
+      let(:component) { described_class.new('circle_check', size: 10) }
+      let(:expected_html) do
+        <<~HTML
+          <svg class="usa-icon" aria-hidden="true" role="img">
+            <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#circle_check></use>
+          </svg>
+        HTML
+      end
+
+      it { is_expected.to match_html_fragment(expected_html) }
+    end
+
     context 'added classes' do
       let(:component) { described_class.new('lock', additional_classes: %w[foo bar]) }
       let(:expected_html) do
         <<~HTML
-          <svg class="foo bar usa-icon" style="transform: scale(1)" aria-hidden="true" role="img">
+          <svg class="foo bar usa-icon" aria-hidden="true" role="img">
             <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#lock></use>
           </svg>
         HTML

dpc-portal/spec/components/core/modal/modal_component_spec.rb

@@ -44,7 +44,7 @@
               </div>
             </div>
             <button type="button" class="usa-button usa-modal__close" aria-label="Close this window" data-close-modal>
-              <svg class="usa-icon" style="transform: scale(1)" aria-hidden="true" role="img">
+              <svg class="usa-icon" aria-hidden="true" role="img">
                 <use xlink:href="/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#close"></use>
               </svg>
             </button>

dpc-portal/spec/components/page/credential_delegate/new_invitation_component_spec.rb

@@ -116,7 +116,7 @@
                   </div>
               </div>
               <button type="button" class="usa-button usa-modal__close" aria-label="Close this window" data-close-modal>
-                  <svg class="usa-icon" style="transform: scale(1)" aria-hidden="true" role="img">
+                  <svg class="usa-icon" aria-hidden="true" role="img">
                     <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#close></use>
                   </svg>
               </button>

dpc-portal/spec/components/page/organization/organization_list_component_spec.rb

@@ -78,7 +78,7 @@ def normalize_space(str)
                   </td>
                   <td style="width: 25%;">
                       <div class="clearfix">
-                        <div class="float-left">  <svg class="text-gold usa-icon" style="transform: scale(1)" aria-hidden="true" role="img">
+                        <div class="float-left">  <svg class="text-gold usa-icon" aria-hidden="true" role="img">
                           <use xlink:href=/assets/@uswds/uswds/dist/img/sprite-9865eea7b251e43137fb770626d6cd51c474a3a436678a6e66cafce50968076f.svg#warning></use>
                         </svg>
                         </div>