Commit 0a55453a authored by intrigeri's avatar intrigeri

Merge remote-tracking branch 'origin/feature/jessie' into feature/jessie

parents 3cf80604 d0d539f5
......@@ -238,6 +238,7 @@ vidalia
vim-nox
virtualbox-guest-utils
wireless-tools
xsel
xul-ext-torbirdy
# needed for initramfs-tools' COMPRESS=xz
xz-utils
......
features/images/TorBrowserOkButton.png

786 Bytes | W: | H:

features/images/TorBrowserOkButton.png

598 Bytes | W: | H:

features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
features/images/TorBrowserOkButton.png
  • 2-up
  • Swipe
  • Onion skin
features/images/USBCreateLiveUSB.png

1.6 KB | W: | H:

features/images/USBCreateLiveUSB.png

860 Bytes | W: | H:

features/images/USBCreateLiveUSB.png
features/images/USBCreateLiveUSB.png
features/images/USBCreateLiveUSB.png
features/images/USBCreateLiveUSB.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -38,10 +38,9 @@ opt_parser = OptionParser.new do |opts|
cmd_opts[:user] = user
end
opts.on("-t", "--type TYPE",
"Run command as blocking with 'call' (default) or " \
"non-blocking with 'spawn'") do |type|
cmd_opts[:type] = (type == "spawn")
opts.on("-s", "--spawn",
"Run command in non-blocking mode") do |type|
cmd_opts[:spawn] = true
end
end
opt_parser.parse!(ARGV)
......
......@@ -81,7 +81,12 @@ When /^I open the address "([^"]*)" in the (.*)$/ do |address, browser|
open_address = Proc.new do
@screen.click(info[:address_bar_image])
sleep 0.5
@screen.type(address + Sikuli::Key.ENTER)
# The browser sometimes loses keypresses when suggestions are
# shown, which we work around this by pasting the address from the
# clipboard, in one go.
$vm.set_clipboard(address)
@screen.type('v', Sikuli::KeyModifier.CTRL)
@screen.type(Sikuli::Key.ENTER)
end
open_address.call
if browser == "Tor Browser"
......
......@@ -525,6 +525,11 @@ EOF
end
end
def set_clipboard(text)
execute_successfully("echo '#{text}' | xsel --input --clipboard",
:user => LIVE_USER)
end
def internal_snapshot_xml(name)
disk_devs = list_disk_devs
disks_xml = " <disks>\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment