#7243 - fixed markup tests

surveyjs · Oct 30, 2023 · 6d1697a · 6d1697a
1 parent bb85749
commit 6d1697a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/knockout/templates/question-matrixdynamic.html b/src/knockout/templates/question-matrixdynamic.html
@@ -50,6 +50,7 @@
   <td
     data-bind="css: $data.className, style: { minWidth: $data.minWidth, width: $data.width }, attr: { 'data-responsive-title': headers, title: $data.getTitle(), colspan: $data.colSpans }, event: {focusin: $data.focusIn }"
   >
+    <!-- ko if: $data.matrix -->
     <div data-bind="visible: question.isVisible, css: $parentContext.question.cssClasses.cellQuestionWrapper">
       <!-- ko if: $data.isOtherChoice -->
         <div data-bind="css: question.getCommentAreaCss(true), template: { name: 'survey-other', data: {'question': question, 'visible': true } }"></div>
@@ -79,6 +80,7 @@
       <!-- /ko -->
       <!-- /ko -->
     </div>
+    <!-- /ko -->
   </td>
 </script>
 <script type="text/html" id="survey-matrixtable">
@@ -170,14 +172,9 @@
     <tfoot>
       <tr>
         <!-- ko foreach: question.koTable().footerRow.cells -->
-          <!-- ko if: $data.hasQuestion -->
-            <!-- ko template: { name: 'survey-matrixcell', afterRender: function(els) { $data.matrix.koCellAfterRender(els, $data); } } --><!-- /ko -->
-          <!-- /ko -->
-          <!-- ko if: $data.hasTitle -->
-          <td>
-            <!-- ko template: { name: 'survey-string', data: $data.locTitle } --><!-- /ko -->
-          </td>
-          <!-- /ko -->
+
+            <!-- ko template: { name: 'survey-matrixcell', afterRender: function(els) { $data.matrix && $data.matrix.koCellAfterRender(els, $data); } } --><!-- /ko -->
+
         <!-- /ko -->
       </tr>
     </tfoot>

diff --git a/tests/markup/etalon_matrixdynamic.ts b/tests/markup/etalon_matrixdynamic.ts
@@ -87,6 +87,7 @@ registerMarkupTests(
           }
         ]
       },
+      removeIds: true,
       snapshot: "matrixdynamic-totals"
     }
   ]

diff --git a/tests/markup/snapshots/matrixdynamic-totals.snap.html b/tests/markup/snapshots/matrixdynamic-totals.snap.html
@@ -16,9 +16,9 @@
 						<div>
 							<div>
 								<div class="sv_select_wrapper">
-									<div aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 1" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell0i" role="combobox">
+									<div aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 1" aria-required="false" class="sv_q_dropdown_control" role="combobox">
 										<div class="sv_q_dropdown__value">
-											<input aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-label="Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell0i_0" inputmode="text" placeholder="Select..." role="combobox" type="text">
+											<input aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-label="Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" inputmode="text" placeholder="Select..." role="combobox" type="text">
 										</div>
 										<div class="sv_q_dropdown_clean-button" style="display:none;">
 											<svg aria-label="Clear" class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
@@ -53,7 +53,7 @@
 					</td>
 					<td class="sv_matrix_cell sv_matrix_cell_actions" colspan="1" data-responsive-title="" title="">
 						<div class="sv-action-bar sv-action-bar--default-size-mode">
-							<div class="sv-action" id="remove-row">
+							<div class="sv-action">
 								<div class="sv-action__content">
 									<button class="sv_matrix_dynamic_button" type="button">
 										<span class="sv-string-viewer">Remove</span>
@@ -70,9 +70,9 @@
 						<div>
 							<div>
 								<div class="sv_select_wrapper">
-									<div aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 1" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell0i" role="combobox">
+									<div aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 1" aria-required="false" class="sv_q_dropdown_control" role="combobox">
 										<div class="sv_q_dropdown__value">
-											<input aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-label="Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell0i_0" inputmode="text" placeholder="Select..." role="combobox" type="text">
+											<input aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-label="Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" inputmode="text" placeholder="Select..." role="combobox" type="text">
 										</div>
 										<div class="sv_q_dropdown_clean-button" style="display:none;">
 											<svg aria-label="Clear" class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
@@ -107,7 +107,7 @@
 					</td>
 					<td class="sv_matrix_cell sv_matrix_cell_actions" colspan="1" data-responsive-title="" title="">
 						<div class="sv-action-bar sv-action-bar--default-size-mode">
-							<div class="sv-action" id="remove-row">
+							<div class="sv-action">
 								<div class="sv-action__content">
 									<button class="sv_matrix_dynamic_button" type="button">
 										<span class="sv-string-viewer">Remove</span>
@@ -127,6 +127,8 @@
 							<div>Count: 0</div>
 						</div>
 					</td>
+					<td class="sv_matrix_cell_header sv_matrix_cell--dropdown" colspan="1" data-responsive-title="" title="">
+					</td>
 				</tr>
 			</tfoot>
 		</table>
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,7 @@ registerMarkupTests( @@
               }
             ]
           },
+          removeIds: true,
           snapshot: "matrixdynamic-totals"
         }
       ]
@@ Expand Down @@