Commit 34c61c8c authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master'

Resolve "Add environment URL link to terminal page"

Closes #27336

See merge request !9107
parents 1ce973b5 6bf04498
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
.col-sm-6 .col-sm-6
.nav-controls .nav-controls
= link_to @environment.external_url, class: 'btn btn-default' do
= icon('external-link')
= render 'projects/deployments/actions', deployment: @environment.last_deployment = render 'projects/deployments/actions', deployment: @environment.last_deployment
.terminal-container{ class: container_class } .terminal-container{ class: container_class }
......
---
title: Added external environment link to web terminal view
merge_request: 8303
author:
...@@ -101,6 +101,22 @@ feature 'Environment', :feature do ...@@ -101,6 +101,22 @@ feature 'Environment', :feature do
scenario 'it shows the terminal button' do scenario 'it shows the terminal button' do
expect(page).to have_terminal_button expect(page).to have_terminal_button
end 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 end
context 'for developer' do context 'for developer' do
......
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