summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-09-24 13:36:37 +0000
committerRémy Coutable <remy@rymai.me>2018-09-24 13:36:37 +0000
commit842ed384075b74207d80a03565e71819fc61932b (patch)
treeaab33898d69cbe905bf05ba9a198fa09559ff78c
parent28086b203ae397e01d5e9870dfbddd66466450c2 (diff)
parentfbb0fc5e8740e8acbbc319bc961b9c65dadb0431 (diff)
downloadgitlab-ce-842ed384075b74207d80a03565e71819fc61932b.tar.gz
Merge branch 'feature/new_user_snippets_breadcrumbs' into 'master'
Feature/new user snippets breadcrumbs See merge request gitlab-org/gitlab-ce!21661
-rw-r--r--app/views/snippets/new.html.haml3
-rw-r--r--changelogs/unreleased/51282-link-to-user-snippets-on-new-user-snippet-page.yml5
-rw-r--r--spec/features/snippets/user_sees_breadcrumb_links.rb17
3 files changed, 24 insertions, 1 deletions
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index f01915107e3..c8a5e199674 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1,5 +1,6 @@
- @hide_top_links = true
-- breadcrumb_title "Snippets"
+- add_to_breadcrumbs "Snippets", dashboard_snippets_path
+- breadcrumb_title "New"
- page_title "New Snippet"
%h3.page-title
New Snippet
diff --git a/changelogs/unreleased/51282-link-to-user-snippets-on-new-user-snippet-page.yml b/changelogs/unreleased/51282-link-to-user-snippets-on-new-user-snippet-page.yml
new file mode 100644
index 00000000000..1d2075ae549
--- /dev/null
+++ b/changelogs/unreleased/51282-link-to-user-snippets-on-new-user-snippet-page.yml
@@ -0,0 +1,5 @@
+---
+title: Add link to User Snippets in breadcrumbs of New User Snippet page
+merge_request:
+author: J.D. Bean
+type: add
diff --git a/spec/features/snippets/user_sees_breadcrumb_links.rb b/spec/features/snippets/user_sees_breadcrumb_links.rb
new file mode 100644
index 00000000000..696f2b93390
--- /dev/null
+++ b/spec/features/snippets/user_sees_breadcrumb_links.rb
@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+describe 'New user snippet breadcrumbs' do
+ let(:user) { create(:user) }
+
+ before do
+ sign_in(user)
+ visit new_snippet_path
+ end
+
+ it 'display a link to user snippets and new user snippet pages' do
+ page.within '.breadcrumbs' do
+ expect(find_link('Snippets')[:href]).to end_with(dashboard_snippets_path)
+ expect(find_link('New')[:href]).to end_with(new_snippet_path)
+ end
+ end
+end