Commit 8df30a70 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'feature/15575-open-doc-instead-of-getting-started' into stable...

Merge branch 'feature/15575-open-doc-instead-of-getting-started' into stable (Fix-committed: #15575)
parents 237eb191 def825b6
......@@ -4,5 +4,5 @@ Encoding=UTF-8
_Name=Tails documentation
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation getting_started
Exec=/usr/local/bin/tails-documentation doc
Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
......@@ -87,7 +87,7 @@ class DocumentationWindow(tailsgreeter.gui.GreeterHelpWindow):
try:
page = sys.argv[1]
except IndexError:
page = 'getting_started'
page = 'doc'
try:
anchor = sys.argv[2]
......
......@@ -6,5 +6,5 @@ _Comment=Learn how to use Tails
Categories=Documentation;Tails;
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation getting_started
Exec=/usr/local/bin/tails-documentation doc
Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
......@@ -6,7 +6,7 @@ Feature: Tails documentation
Scenario: The Tails documentation launcher on the desktop works when offline
Given I have started Tails from DVD without network and logged in
When I double-click on the Tails documentation launcher on the desktop
Then the documentation viewer opens the "Getting started" page
Then the documentation viewer opens the "Documentation" page
#15514
@fragile
......@@ -14,7 +14,7 @@ Feature: Tails documentation
Given I have started Tails from DVD and logged in and the network is connected
When I double-click on the Tails documentation launcher on the desktop
Then the Tor Browser starts
And the Tor Browser opens the Getting started page
And the Tor Browser opens the "Documentation" page
#15321
@fragile
......
......@@ -220,10 +220,10 @@ end
# python2 (#12185) we have terrible unicode support; for instance
# `.child('Tails - Getting started…')` will fail since Dogtail expects
# ascii and cannot decode "…".
Then /^the Tor Browser opens the Getting started page$/ do
Then /^the Tor Browser opens the "Documentation" page$/ do
try_for(60) do
@torbrowser
.children(roleName: "document frame")
.any? { |f| f.name == 'Tails - Getting started…' }
.any? { |f| f.name == 'Tails - Documentation' }
end
end
......@@ -94,7 +94,7 @@ Then /^the VirtualBox guest modules are available$/ do
"The vboxguest module is not available.")
end
Then /^the documentation viewer opens the "(Support|Getting started)" page$/ do |page|
Then /^the documentation viewer opens the "(Support|Documentation)" page$/ do |page|
if @language == 'German'
expected_title = 'Tails-Dokumentation'
if page == 'Support'
......@@ -107,7 +107,7 @@ Then /^the documentation viewer opens the "(Support|Getting started)" page$/ do
if page == 'Support'
expected_heading = 'Search the documentation'
else
expected_heading = 'Found a bug?'
expected_heading = 'First steps with Tails'
end
end
app = Dogtail::Application.new('tails-documentation')
......
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