diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-02-09 19:35:52 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-02-10 17:06:24 +0000 |
| commit | 6bf04498f252a7aa9789a2182f61a3ea92fe0b2a (patch) | |
| tree | 3151d595e706ba9fe0003c02a78ac017ac5fa26c | |
| parent | 75092d9647bab00070b0b77f0fe1050d900a39a1 (diff) | |
| download | gitlab-ce-27336-add-environment-url-link-to-terminal-page.tar.gz | |
Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page
| -rw-r--r-- | app/views/projects/environments/terminal.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml | 4 | ||||
| -rw-r--r-- | spec/features/environment_spec.rb | 16 |
3 files changed, 22 insertions, 0 deletions
diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml index 1d49e9cbaf7..ef0dd0eda3c 100644 --- a/app/views/projects/environments/terminal.html.haml +++ b/app/views/projects/environments/terminal.html.haml @@ -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 } diff --git a/changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml b/changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml new file mode 100644 index 00000000000..dd4907166c4 --- /dev/null +++ b/changelogs/unreleased/27336-add-environment-url-link-to-terminal-page.yml @@ -0,0 +1,4 @@ +--- +title: Added external environment link to web terminal view +merge_request: 8303 +author: diff --git a/spec/features/environment_spec.rb b/spec/features/environment_spec.rb index 2f49e89b4e4..c203e1f20c1 100644 --- a/spec/features/environment_spec.rb +++ b/spec/features/environment_spec.rb @@ -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 |