Skip to content

Commit da7ff7e

Browse files
committed
no need to require parent_node_ext explicitly
1 parent 452940a commit da7ff7e

File tree

7 files changed

+43
-69
lines changed

7 files changed

+43
-69
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
bundler-cache: true
2323
- name: Run tests
2424
run: bundle exec rake
25-
- name: Run tests for siblings
26-
run: TEST_SIBLINGS=true bundle exec rake
2725

2826
deploy:
2927
runs-on: ubuntu-latest

spec/node_query/adapter/parser_spec.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,10 @@
3838
end
3939
end
4040

41-
if ENV['TEST_SIBLINGS'] == 'true'
42-
require 'parser_node_ext/parent_node_ext'
43-
44-
describe "#get_siblings" do
45-
it "gets the siblings of node" do
46-
node = parser_parse("class Synvert; end").children.first
47-
expect(adapter.get_siblings(node)).to eq [nil, nil]
48-
end
41+
describe "#get_siblings" do
42+
it "gets the siblings of node" do
43+
node = parser_parse("class Synvert; end").children.first
44+
expect(adapter.get_siblings(node)).to eq [nil, nil]
4945
end
5046
end
5147
end

spec/node_query/adapter/prism_spec.rb

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,14 @@
4343
end
4444
end
4545

46-
if ENV['TEST_SIBLINGS'] == 'true'
47-
require 'prism_ext/parent_node_ext'
48-
49-
describe "#get_siblings" do
50-
it "gets the siblings of node" do
51-
node = prism_parse("class Synvert; end").body.first.constant_path
52-
siblings = adapter.get_siblings(node)
53-
expect(siblings.size).to eq 5
54-
expect(siblings[0]).to be_nil
55-
expect(siblings[1]).to be_nil
56-
expect(siblings[4]).to eq :Synvert
57-
end
46+
describe "#get_siblings" do
47+
it "gets the siblings of node" do
48+
node = prism_parse("class Synvert; end").body.first.constant_path
49+
siblings = adapter.get_siblings(node)
50+
expect(siblings.size).to eq 5
51+
expect(siblings[0]).to be_nil
52+
expect(siblings[1]).to be_nil
53+
expect(siblings[4]).to eq :Synvert
5854
end
5955
end
6056
end

spec/node_query/adapter/syntax_tree_spec.rb

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,13 @@
4242
end
4343
end
4444

45-
if ENV['TEST_SIBLINGS'] == 'true'
46-
require 'syntax_tree_ext/parent_node_ext'
47-
48-
describe "#get_siblings" do
49-
it "gets the siblings of node" do
50-
node = syntax_tree_parse("class Synvert; end").body.first.constant
51-
siblings = adapter.get_siblings(node)
52-
expect(siblings.size).to eq 2
53-
expect(siblings[0]).to be_nil
54-
expect(siblings[1].class).to eq SyntaxTree::BodyStmt
55-
end
45+
describe "#get_siblings" do
46+
it "gets the siblings of node" do
47+
node = syntax_tree_parse("class Synvert; end").body.first.constant
48+
siblings = adapter.get_siblings(node)
49+
expect(siblings.size).to eq 2
50+
expect(siblings[0]).to be_nil
51+
expect(siblings[1].class).to eq SyntaxTree::BodyStmt
5652
end
5753
end
5854
end

spec/node_query_parser/parser_spec.rb

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,14 @@ def initialize(id, name)
145145
expect(expression.query_nodes(node)).to eq [node.body.first.body.first.body.first]
146146
end
147147

148-
if ENV['TEST_SIBLINGS'] == 'true'
149-
require 'parser_node_ext/parent_node_ext'
150-
151-
it 'matches next sibling node' do
152-
expression = parser.parse('.ivasgn[variable=@id] + .ivasgn[variable=@name]')
153-
expect(expression.query_nodes(node)).to eq [node.body.first.body.first.body[1]]
154-
end
155-
156-
it 'matches sebsequent sibling node' do
157-
expression = parser.parse('.ivasgn[variable=@id] ~ .ivasgn[variable=@name]')
158-
expect(expression.query_nodes(node)).to eq [node.body.first.body.first.body[1]]
159-
end
148+
it 'matches next sibling node' do
149+
expression = parser.parse('.ivasgn[variable=@id] + .ivasgn[variable=@name]')
150+
expect(expression.query_nodes(node)).to eq [node.body.first.body.first.body[1]]
151+
end
152+
153+
it 'matches sebsequent sibling node' do
154+
expression = parser.parse('.ivasgn[variable=@id] ~ .ivasgn[variable=@name]')
155+
expect(expression.query_nodes(node)).to eq [node.body.first.body.first.body[1]]
160156
end
161157

162158
it 'matches goto scope' do

spec/node_query_parser/prism_spec.rb

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,14 @@ def initialize(id, name)
148148
expect(expression.query_nodes(node)).to eq [node.body.first.body.body.first.body.body.first.value]
149149
end
150150

151-
if ENV['TEST_SIBLINGS'] == 'true'
152-
require 'prism_ext/parent_node_ext'
153-
154-
it 'matches next sibling node' do
155-
expression = parser.parse('.instance_variable_write_node[name=@id] + .instance_variable_write_node[name=@name]')
156-
expect(expression.query_nodes(node)).to eq [node.body.first.body.body.first.body.body.last]
157-
end
158-
159-
it 'matches sebsequent sibling node' do
160-
expression = parser.parse('.instance_variable_write_node[name=@id] ~ .instance_variable_write_node[name=@name]')
161-
expect(expression.query_nodes(node)).to eq [node.body.first.body.body.first.body.body.last]
162-
end
151+
it 'matches next sibling node' do
152+
expression = parser.parse('.instance_variable_write_node[name=@id] + .instance_variable_write_node[name=@name]')
153+
expect(expression.query_nodes(node)).to eq [node.body.first.body.body.first.body.body.last]
154+
end
155+
156+
it 'matches sebsequent sibling node' do
157+
expression = parser.parse('.instance_variable_write_node[name=@id] ~ .instance_variable_write_node[name=@name]')
158+
expect(expression.query_nodes(node)).to eq [node.body.first.body.body.first.body.body.last]
163159
end
164160

165161
it 'matches goto scope' do

spec/node_query_parser/syntax_tree_spec.rb

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,14 @@ def initialize(id, name)
148148
expect(expression.query_nodes(node)).to eq [node.body.first.bodystmt.statements.body.first.bodystmt.statements.body.first.target]
149149
end
150150

151-
if ENV['TEST_SIBLINGS'] == 'true'
152-
require 'syntax_tree_ext/parent_node_ext'
153-
154-
it 'matches next sibling node' do
155-
expression = parser.parse('.Assign[target=@id] + .Assign[target=@name]')
156-
expect(expression.query_nodes(node)).to eq [node.body.first.bodystmt.statements.body.first.bodystmt.statements.body.last]
157-
end
158-
159-
it 'matches sebsequent sibling node' do
160-
expression = parser.parse('.Assign[target=@id] ~ .Assign[target=@name]')
161-
expect(expression.query_nodes(node)).to eq [node.body.first.bodystmt.statements.body.first.bodystmt.statements.body.last]
162-
end
151+
it 'matches next sibling node' do
152+
expression = parser.parse('.Assign[target=@id] + .Assign[target=@name]')
153+
expect(expression.query_nodes(node)).to eq [node.body.first.bodystmt.statements.body.first.bodystmt.statements.body.last]
154+
end
155+
156+
it 'matches sebsequent sibling node' do
157+
expression = parser.parse('.Assign[target=@id] ~ .Assign[target=@name]')
158+
expect(expression.query_nodes(node)).to eq [node.body.first.bodystmt.statements.body.first.bodystmt.statements.body.last]
163159
end
164160

165161
it 'matches goto scope' do

0 commit comments

Comments
 (0)