Skip to content

Commit 9e24cff

Browse files
authored
Use predicates in tests for checking visibility (#2859)
1 parent 27c6af7 commit 9e24cff

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

lib/ruby_indexer/test/classes_and_modules_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,10 @@ class D; end
302302
RUBY
303303

304304
b_const = @index["A::B"].first
305-
assert_equal(Entry::Visibility::PRIVATE, b_const.visibility)
305+
assert_predicate(b_const, :private?)
306306

307307
c_const = @index["A::C"].first
308-
assert_equal(Entry::Visibility::PRIVATE, c_const.visibility)
308+
assert_predicate(c_const, :private?)
309309

310310
d_const = @index["A::D"].first
311311
assert_equal(Entry::Visibility::PUBLIC, d_const.visibility)

lib/ruby_indexer/test/constant_test.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ class A
130130
RUBY
131131

132132
b_const = @index["A::B"].first
133-
assert_equal(Entry::Visibility::PRIVATE, b_const.visibility)
133+
assert_predicate(b_const, :private?)
134134

135135
c_const = @index["A::C"].first
136-
assert_equal(Entry::Visibility::PRIVATE, c_const.visibility)
136+
assert_predicate(c_const, :private?)
137137

138138
d_const = @index["A::D"].first
139-
assert_equal(Entry::Visibility::PUBLIC, d_const.visibility)
139+
assert_predicate(d_const, :public?)
140140
end
141141

142142
def test_marking_constants_as_private_reopening_namespaces
@@ -163,13 +163,13 @@ module B
163163
RUBY
164164

165165
a_const = @index["A::B::CONST_A"].first
166-
assert_equal(Entry::Visibility::PRIVATE, a_const.visibility)
166+
assert_predicate(a_const, :private?)
167167

168168
b_const = @index["A::B::CONST_B"].first
169-
assert_equal(Entry::Visibility::PRIVATE, b_const.visibility)
169+
assert_predicate(b_const, :private?)
170170

171171
c_const = @index["A::B::CONST_C"].first
172-
assert_equal(Entry::Visibility::PRIVATE, c_const.visibility)
172+
assert_predicate(c_const, :private?)
173173
end
174174

175175
def test_marking_constants_as_private_with_receiver
@@ -187,10 +187,10 @@ module B
187187
RUBY
188188

189189
a_const = @index["A::B::CONST_A"].first
190-
assert_equal(Entry::Visibility::PRIVATE, a_const.visibility)
190+
assert_predicate(a_const, :private?)
191191

192192
b_const = @index["A::B::CONST_B"].first
193-
assert_equal(Entry::Visibility::PRIVATE, b_const.visibility)
193+
assert_predicate(b_const, :private?)
194194
end
195195

196196
def test_indexing_constant_aliases

lib/ruby_indexer/test/method_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def bar; end
141141
# The first entry points to the location of the module_function call
142142
assert_equal("Test", first_entry.owner.name)
143143
assert_instance_of(Entry::Module, first_entry.owner)
144-
assert_equal(Entry::Visibility::PRIVATE, first_entry.visibility)
144+
assert_predicate(first_entry, :private?)
145145
# The second entry points to the public singleton method
146146
assert_equal("Test::<Class:Test>", second_entry.owner.name)
147147
assert_instance_of(Entry::SingletonClass, second_entry.owner)

0 commit comments

Comments
 (0)