Merge branch '40274-user-settings-breadcrumbs' into 'master'
Fix breadcrumbs in User Settings Closes #40274 See merge request gitlab-org/gitlab-ce!16172
This commit is contained in:
commit
377d5c9ec3
5 changed files with 18 additions and 0 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
- add_to_breadcrumbs "Applications", oauth_applications_path
|
||||||
|
- breadcrumb_title @application.name
|
||||||
- page_title @application.name, "Applications"
|
- page_title @application.name, "Applications"
|
||||||
- @content_class = "limit-container-width" unless fluid_layout
|
- @content_class = "limit-container-width" unless fluid_layout
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
- add_to_breadcrumbs "SSH Keys", profile_keys_path
|
||||||
|
- breadcrumb_title @key.title
|
||||||
- page_title @key.title, "SSH Keys"
|
- page_title @key.title, "SSH Keys"
|
||||||
- @content_class = "limit-container-width" unless fluid_layout
|
- @content_class = "limit-container-width" unless fluid_layout
|
||||||
= render 'profiles/head'
|
= render 'profiles/head'
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix breadcrumbs in User Settings
|
||||||
|
merge_request: 16172
|
||||||
|
author: rfwatson
|
||||||
|
type: fixed
|
|
@ -27,6 +27,7 @@ feature 'Profile > SSH Keys' do
|
||||||
|
|
||||||
expect(page).to have_content("Title: #{attrs[:title]}")
|
expect(page).to have_content("Title: #{attrs[:title]}")
|
||||||
expect(page).to have_content(attrs[:key])
|
expect(page).to have_content(attrs[:key])
|
||||||
|
expect(find('.breadcrumbs-sub-title')).to have_link(attrs[:title])
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when only DSA and ECDSA keys are allowed' do
|
context 'when only DSA and ECDSA keys are allowed' do
|
||||||
|
|
|
@ -2,12 +2,20 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'Profile > Applications' do
|
describe 'Profile > Applications' do
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
|
let(:application) { create(:oauth_application, owner: user) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
sign_in(user)
|
sign_in(user)
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'User manages applications', :js do
|
describe 'User manages applications', :js do
|
||||||
|
it 'views an application' do
|
||||||
|
visit oauth_application_path(application)
|
||||||
|
|
||||||
|
expect(page).to have_content("Application: #{application.name}")
|
||||||
|
expect(find('.breadcrumbs-sub-title')).to have_link(application.name)
|
||||||
|
end
|
||||||
|
|
||||||
it 'deletes an application' do
|
it 'deletes an application' do
|
||||||
create(:oauth_application, owner: user)
|
create(:oauth_application, owner: user)
|
||||||
visit oauth_applications_path
|
visit oauth_applications_path
|
||||||
|
|
Loading…
Reference in a new issue