Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6bf04498
Commit
6bf04498
authored
Feb 09, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added env external link and light web terminal spec
parent
75092d96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
0 deletions
+22
-0
app/views/projects/environments/terminal.html.haml
app/views/projects/environments/terminal.html.haml
+2
-0
changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml
...eased/27336-add-environment-url-link-to-terminal-page.yml
+4
-0
spec/features/environment_spec.rb
spec/features/environment_spec.rb
+16
-0
No files found.
app/views/projects/environments/terminal.html.haml
View file @
6bf04498
...
...
@@ -16,6 +16,8 @@
.col-sm-6
.nav-controls
=
link_to
@environment
.
external_url
,
class:
'btn btn-default'
do
=
icon
(
'external-link'
)
=
render
'projects/deployments/actions'
,
deployment:
@environment
.
last_deployment
.terminal-container
{
class:
container_class
}
...
...
changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml
0 → 100644
View file @
6bf04498
---
title
:
Added external environment link to web terminal view
merge_request
:
8303
author
:
spec/features/environment_spec.rb
View file @
6bf04498
...
...
@@ -101,6 +101,22 @@ feature 'Environment', :feature do
scenario
'it shows the terminal button'
do
expect
(
page
).
to
have_terminal_button
end
context
'web terminal'
,
:js
do
before
do
# Stub #terminals as it causes js-enabled feature specs to render the page incorrectly
allow_any_instance_of
(
Environment
).
to
receive
(
:terminals
)
{
nil
}
visit
terminal_namespace_project_environment_path
(
project
.
namespace
,
project
,
environment
)
end
it
'displays a web terminal'
do
expect
(
page
).
to
have_selector
(
'#terminal'
)
end
it
'displays a link to the environment external url'
do
expect
(
page
).
to
have_link
(
nil
,
href:
environment
.
external_url
)
end
end
end
context
'for developer'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment