Skip to content

Commit 9b2ccec

Browse files
committed
Remove extra loading indicator class
1 parent d0874b0 commit 9b2ccec

2 files changed

Lines changed: 7 additions & 13 deletions

File tree

app/components/primer/open_project/filterable_tree_view.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<% tree.with_leaf(**@no_results_node_arguments) %>
2828
<% end %>
2929
<% end %>
30-
<div class="FilterableTreeViewLoadingIndicator FilterableTreeViewLoadingSkeleton" aria-hidden="true">
30+
<div class="FilterableTreeViewLoadingSkeleton" aria-hidden="true">
3131
<% if loading_indicator? %>
3232
<%= loading_indicator %>
3333
<% else %>

test/components/primer/open_project/filterable_tree_view_test.rb

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,23 +311,17 @@ def test_src_attribute_is_absent_when_src_is_not_provided
311311
def test_uses_a_skeleton_as_the_default_loading_indicator
312312
render_inline(Primer::OpenProject::FilterableTreeView.new(src: "/my/tree"))
313313

314-
assert_selector ".FilterableTreeViewLoadingIndicator .TreeViewSkeletonItemContainerStyle", count: 8
315-
end
316-
317-
def test_loading_indicator_can_be_overridden
318-
render_inline(Primer::OpenProject::FilterableTreeView.new(src: "/my/tree")) do |tree|
319-
tree.with_loading_indicator do
320-
'<span data-test-selector="custom-loading-indicator">Loading</span>'.html_safe
321-
end
314+
assert_selector ".FilterableTreeViewLoadingSkeleton[aria-hidden='true']" do
315+
assert_selector ".TreeViewSkeletonItemContainerStyle", count: 8
322316
end
323-
324-
assert_selector ".FilterableTreeViewLoadingIndicator [data-test-selector='custom-loading-indicator']"
325317
end
326318

327-
def test_custom_loading_indicator_preview
319+
def test_loading_indicator_can_be_overridden
328320
render_preview(:async_custom_loading_indicator)
329321

330-
assert_selector ".FilterableTreeViewLoadingIndicator svg.anim-rotate"
322+
assert_selector ".FilterableTreeViewLoadingSkeleton[aria-hidden='true']" do
323+
assert_selector "svg.anim-rotate"
324+
end
331325
end
332326

333327
def test_include_sub_items_checkbox_is_excluded_from_form_in_non_async_mode

0 commit comments

Comments
 (0)