Skip to content

Commit a63ce63

Browse files
committed
Use startup_option instead of startup wait
1 parent 32b51c9 commit a63ce63

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

reline.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
2323
spec.add_development_dependency 'bundler'
2424
spec.add_development_dependency 'rake'
2525
spec.add_development_dependency 'test-unit'
26+
spec.add_development_dependency 'yamatanooroti', '>= 0.0.5'
2627
end

test/reline/yamatanooroti/test_rendering.rb

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ def teardown
2626
end
2727

2828
def test_history_back
29-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
30-
sleep 0.5
29+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
3130
write(":a\n")
3231
write("\C-p")
3332
close
@@ -40,8 +39,7 @@ def test_history_back
4039
end
4140

4241
def test_backspace
43-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
44-
sleep 0.5
42+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
4543
write(":abc\C-h\n")
4644
close
4745
assert_screen(<<~EOC)
@@ -53,8 +51,7 @@ def test_backspace
5351
end
5452

5553
def test_autowrap
56-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
57-
sleep 0.5
54+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
5855
write('01234567890123456789012')
5956
close
6057
assert_screen(<<~EOC)
@@ -65,8 +62,7 @@ def test_autowrap
6562
end
6663

6764
def test_finish_autowrapped_line
68-
start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
69-
sleep 0.5
65+
start_terminal(10, 40, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
7066
write("[{'user'=>{'email'=>'a@a', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}]\n")
7167
close
7268
assert_screen(<<~EOC)
@@ -82,8 +78,7 @@ def test_finish_autowrapped_line
8278
end
8379

8480
def test_finish_autowrapped_line_in_the_middle_of_lines
85-
start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
86-
sleep 0.5
81+
start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
8782
write("[{'user'=>{'email'=>'abcdef@abcdef', 'id'=>'ABC'}, 'version'=>4, 'status'=>'succeeded'}]#{"\C-b"*7}\n")
8883
close
8984
assert_screen(<<~EOC)
@@ -101,8 +96,7 @@ def test_finish_autowrapped_line_in_the_middle_of_lines
10196
end
10297

10398
def test_finish_autowrapped_line_in_the_middle_of_multilines
104-
start_terminal(30, 16, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
105-
sleep 0.5
99+
start_terminal(30, 16, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
106100
write("<<~EOM\n ABCDEFG\nEOM\n")
107101
close
108102
assert_screen(<<~'EOC')
@@ -120,8 +114,7 @@ def test_prompt
120114
write_inputrc <<~'LINES'
121115
"abc": "123"
122116
LINES
123-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
124-
sleep 0.5
117+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
125118
write("abc\n")
126119
close
127120
assert_screen(<<~EOC)
@@ -136,8 +129,7 @@ def test_mode_icon_emacs
136129
write_inputrc <<~LINES
137130
set show-mode-in-prompt on
138131
LINES
139-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
140-
sleep 0.5
132+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
141133
close
142134
assert_screen(<<~EOC)
143135
Multiline REPL.
@@ -150,8 +142,7 @@ def test_mode_icon_vi
150142
set editing-mode vi
151143
set show-mode-in-prompt on
152144
LINES
153-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
154-
sleep 0.5
145+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
155146
write(":a\n\C-[k")
156147
close
157148
assert_screen(<<~EOC)
@@ -167,8 +158,7 @@ def test_original_mode_icon_emacs
167158
set show-mode-in-prompt on
168159
set emacs-mode-string [emacs]
169160
LINES
170-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
171-
sleep 0.5
161+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
172162
close
173163
assert_screen(<<~EOC)
174164
Multiline REPL.
@@ -181,8 +171,7 @@ def test_original_mode_icon_with_quote
181171
set show-mode-in-prompt on
182172
set emacs-mode-string "[emacs]"
183173
LINES
184-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
185-
sleep 0.5
174+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
186175
close
187176
assert_screen(<<~EOC)
188177
Multiline REPL.
@@ -197,8 +186,7 @@ def test_original_mode_icon_vi
197186
set vi-ins-mode-string "{InS}"
198187
set vi-cmd-mode-string "{CmD}"
199188
LINES
200-
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl})
201-
sleep 0.5
189+
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl}, startup_message: 'Multiline REPL.')
202190
write(":a\n\C-[k")
203191
close
204192
assert_screen(<<~EOC)

0 commit comments

Comments
 (0)