diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-09-02 12:55:16 -0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-09-13 11:49:55 -0400 |
| commit | 0663d72d306e17c2f116cdf9becfb06b01d83842 (patch) | |
| tree | af48b113bf3e8057b832b354d981e989ea4a7ce7 | |
| parent | 404f438f45c2da884cf4f16239ac1fda548db09f (diff) | |
| download | gitlab-ce-0663d72d306e17c2f116cdf9becfb06b01d83842.tar.gz | |
Restore SSH Key title auto-population behavior
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21823
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/profiles/keys/index.html.haml | 1 | ||||
| -rw-r--r-- | spec/features/profiles/keys_spec.rb | 18 |
3 files changed, 20 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4cad8707015..38ce9e5450b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -131,6 +131,7 @@ v 8.12.0 (unreleased) v 8.11.6 (unreleased) - Fix an error where we were unable to create a CommitStatus for running state + - Restore SSH Key title auto-population behavior. !6186 v 8.11.5 - Optimize branch lookups and force a repository reload for Repository#find_branch. !6087 diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index a42b3b8eb38..93187873501 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -1,4 +1,5 @@ - page_title "SSH Keys" += render 'profiles/head' .row.prepend-top-default .col-lg-3.profile-settings-sidebar diff --git a/spec/features/profiles/keys_spec.rb b/spec/features/profiles/keys_spec.rb new file mode 100644 index 00000000000..3b20d38c520 --- /dev/null +++ b/spec/features/profiles/keys_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +describe 'Profile > SSH Keys', feature: true do + let(:user) { create(:user) } + + before do + login_as(user) + visit profile_keys_path + end + + describe 'User adds an SSH key' do + it 'auto-populates the title', js: true do + fill_in('Key', with: attributes_for(:key).fetch(:key)) + + expect(find_field('Title').value).to eq 'dummy@gitlab.com' + end + end +end |