From d3f283c4e7de24a067cf350b60e46bddcf28b50b Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Mon, 27 Jun 2022 12:04:11 +0200 Subject: [PATCH] Update usage of RubyTree to avoid deprecated methods --- lib/file_tree.rb | 6 +++--- spec/lib/file_tree_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/file_tree.rb b/lib/file_tree.rb index 6b0d8dcd..405f5c6f 100644 --- a/lib/file_tree.rb +++ b/lib/file_tree.rb @@ -45,8 +45,8 @@ class FileTree icon: node_icon(node), id: node.content.try(:ancestor_id), state: { - disabled: !node.is_leaf?, - opened: !node.is_leaf?, + disabled: !node.leaf?, + opened: !node.leaf?, }, text: node.name, } @@ -54,7 +54,7 @@ class FileTree private :map_to_js_tree def node_icon(node) - if node.is_leaf? && !node.is_root? + if node.leaf? && !node.root? file_icon(node.content) else folder_icon diff --git a/spec/lib/file_tree_spec.rb b/spec/lib/file_tree_spec.rb index 8b053e74..15066f64 100644 --- a/spec/lib/file_tree_spec.rb +++ b/spec/lib/file_tree_spec.rb @@ -90,7 +90,7 @@ describe FileTree do end it 'creates tree nodes for intermediary path segments' do - expect(file_tree.instance_variable_get(:@root).reject(&:content).reject(&:is_root?).map(&:name)).to eq(files.first.path.split('/')) + expect(file_tree.instance_variable_get(:@root).reject(&:content).reject(&:root?).map(&:name)).to eq(files.first.path.split('/')) end end