mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
Windows has been fixed at r29969. * test/rubygems/test_gem_stream_ui.rb: now can run tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
04b81ae799
commit
733be25907
3 changed files with 9 additions and 18 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Tue Jun 7 18:52:55 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
|
||||||
|
Windows has been fixed at r29969.
|
||||||
|
|
||||||
|
* test/rubygems/test_gem_stream_ui.rb: now can run tests.
|
||||||
|
|
||||||
Tue Jun 7 18:36:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
Tue Jun 7 18:36:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
* test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,
|
* test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,
|
||||||
|
|
|
@ -142,12 +142,8 @@ class Gem::StreamUI
|
||||||
end
|
end
|
||||||
|
|
||||||
def tty?
|
def tty?
|
||||||
if RUBY_PLATFORM =~ /mingw|mswin/
|
@usetty && @ins.tty?
|
||||||
@usetty
|
end
|
||||||
else
|
|
||||||
@usetty && @ins.tty?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# Choose from a list of options. +question+ is a prompt displayed above
|
# Choose from a list of options. +question+ is a prompt displayed above
|
||||||
|
|
|
@ -41,8 +41,6 @@ class TestGemStreamUI < Gem::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ask
|
def test_ask
|
||||||
skip 'TTY detection broken on windows' if Gem.win_platform?
|
|
||||||
|
|
||||||
timeout(1) do
|
timeout(1) do
|
||||||
expected_answer = "Arthur, King of the Britons"
|
expected_answer = "Arthur, King of the Britons"
|
||||||
@in.string = "#{expected_answer}\n"
|
@in.string = "#{expected_answer}\n"
|
||||||
|
@ -52,8 +50,6 @@ class TestGemStreamUI < Gem::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ask_no_tty
|
def test_ask_no_tty
|
||||||
skip 'TTY handling is broken on windows' if Gem.win_platform?
|
|
||||||
|
|
||||||
@in.tty = false
|
@in.tty = false
|
||||||
|
|
||||||
timeout(0.1) do
|
timeout(0.1) do
|
||||||
|
@ -63,8 +59,6 @@ class TestGemStreamUI < Gem::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ask_for_password
|
def test_ask_for_password
|
||||||
skip 'Always uses $stdin on windows' if Gem.win_platform?
|
|
||||||
|
|
||||||
timeout(1) do
|
timeout(1) do
|
||||||
expected_answer = "Arthur, King of the Britons"
|
expected_answer = "Arthur, King of the Britons"
|
||||||
@in.string = "#{expected_answer}\n"
|
@in.string = "#{expected_answer}\n"
|
||||||
|
@ -74,8 +68,6 @@ class TestGemStreamUI < Gem::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ask_for_password_no_tty
|
def test_ask_for_password_no_tty
|
||||||
skip 'TTY handling is broken on windows' if Gem.win_platform?
|
|
||||||
|
|
||||||
@in.tty = false
|
@in.tty = false
|
||||||
|
|
||||||
timeout(0.1) do
|
timeout(0.1) do
|
||||||
|
@ -85,8 +77,6 @@ class TestGemStreamUI < Gem::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ask_yes_no_no_tty_with_default
|
def test_ask_yes_no_no_tty_with_default
|
||||||
skip 'TTY handling is broken on windows' if Gem.win_platform?
|
|
||||||
|
|
||||||
@in.tty = false
|
@in.tty = false
|
||||||
|
|
||||||
timeout(0.1) do
|
timeout(0.1) do
|
||||||
|
@ -99,8 +89,6 @@ class TestGemStreamUI < Gem::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ask_yes_no_no_tty_without_default
|
def test_ask_yes_no_no_tty_without_default
|
||||||
skip 'TTY handling is broken on windows' if Gem.win_platform?
|
|
||||||
|
|
||||||
@in.tty = false
|
@in.tty = false
|
||||||
|
|
||||||
timeout(0.1) do
|
timeout(0.1) do
|
||||||
|
|
Loading…
Add table
Reference in a new issue