Commit 377d5c9e authored by Sean McGivern's avatar Sean McGivern

Merge branch '40274-user-settings-breadcrumbs' into 'master'

Fix breadcrumbs in User Settings

Closes #40274

See merge request gitlab-org/gitlab-ce!16172
parents a17fad97 9219ac0a
- add_to_breadcrumbs "Applications", oauth_applications_path
- breadcrumb_title @application.name
- page_title @application.name, "Applications"
- @content_class = "limit-container-width" unless fluid_layout
......
- add_to_breadcrumbs "SSH Keys", profile_keys_path
- breadcrumb_title @key.title
- page_title @key.title, "SSH Keys"
- @content_class = "limit-container-width" unless fluid_layout
= render 'profiles/head'
......
---
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(attrs[:key])
expect(find('.breadcrumbs-sub-title')).to have_link(attrs[:title])
end
context 'when only DSA and ECDSA keys are allowed' do
......
......@@ -2,12 +2,20 @@ require 'spec_helper'
describe 'Profile > Applications' do
let(:user) { create(:user) }
let(:application) { create(:oauth_application, owner: user) }
before do
sign_in(user)
end
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
create(:oauth_application, owner: user)
visit oauth_applications_path
......
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