Commit 742cf277 authored by Tuğçe Nur Taş's avatar Tuğçe Nur Taş Committed by Phil Hughes

Features/show project id on home panel

parent 9bdc9b1a
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
.project-home-desc .project-home-desc
- if @project.description.present? - if @project.description.present?
= markdown_field(@project, :description) = markdown_field(@project, :description)
- if can?(current_user, :read_project, @project)
.text-secondary.prepend-top-8
= s_('ProjectPage|Project ID: %{project_id}') % { project_id: @project.id }
- if @project.forked? - if @project.forked?
%p %p
......
---
title: Show Project ID on project home panel
merge_request: 20305
author: Tuğçe Nur Taş
type: added
...@@ -4057,6 +4057,9 @@ msgstr "" ...@@ -4057,6 +4057,9 @@ msgstr ""
msgid "ProjectLifecycle|Stage" msgid "ProjectLifecycle|Stage"
msgstr "" msgstr ""
msgid "ProjectPage|Project ID: %{project_id}"
msgstr ""
msgid "Projects" msgid "Projects"
msgstr "" msgstr ""
......
require 'spec_helper' require 'spec_helper'
describe 'projects/_home_panel' do describe 'projects/_home_panel' do
let(:group) { create(:group) } context 'notifications' do
let(:project) { create(:project, :public, namespace: group) } let(:project) { create(:project) }
let(:notification_settings) do before do
user&.notification_settings_for(project) assign(:project, project)
end
before do allow(view).to receive(:current_user).and_return(user)
assign(:project, project) allow(view).to receive(:can?).with(user, :read_project, project).and_return(false)
assign(:notification_setting, notification_settings) end
allow(view).to receive(:current_user).and_return(user) context 'when user is signed in' do
allow(view).to receive(:can?).and_return(false) let(:user) { create(:user) }
end
context 'when user is signed in' do before do
let(:user) { create(:user) } notification_settings = user.notification_settings_for(project)
assign(:notification_setting, notification_settings)
end
it 'makes it possible to set notification level' do it 'makes it possible to set notification level' do
render render
expect(view).to render_template('shared/notifications/_button') expect(view).to render_template('shared/notifications/_button')
expect(rendered).to have_selector('.notification-dropdown') expect(rendered).to have_selector('.notification-dropdown')
end
end end
end
context 'when user is signed out' do
let(:user) { nil }
it 'is not possible to set notification level' do context 'when user is signed out' do
render let(:user) { nil }
expect(rendered).not_to have_selector('.notification_dropdown') before do
end assign(:notification_setting, nil)
end end
context 'when project' do
let!(:user) { create(:user) }
let(:badges) { project.badges }
context 'has no badges' do it 'is not possible to set notification level' do
it 'should not render any badge' do
render render
expect(rendered).to have_selector('.project-badges') expect(rendered).not_to have_selector('.notification_dropdown')
expect(rendered).not_to have_selector('.project-badges > a')
end end
end end
end
context 'badges' do
shared_examples 'show badges' do shared_examples 'show badges' do
it 'should render the all badges' do it 'should render the all badges' do
render render
...@@ -62,7 +55,31 @@ describe 'projects/_home_panel' do ...@@ -62,7 +55,31 @@ describe 'projects/_home_panel' do
end end
end end
let(:user) { create(:user) }
let(:badges) { project.badges }
before do
assign(:project, project)
allow(view).to receive(:current_user).and_return(user)
allow(view).to receive(:can?).with(user, :read_project, project).and_return(false)
end
context 'has no badges' do
let(:project) { create(:project) }
it 'should not render any badge' do
render
expect(rendered).to have_selector('.project-badges')
expect(rendered).not_to have_selector('.project-badges > a')
end
end
context 'only has group badges' do context 'only has group badges' do
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
before do before do
create(:group_badge, group: project.group) create(:group_badge, group: project.group)
end end
...@@ -71,6 +88,8 @@ describe 'projects/_home_panel' do ...@@ -71,6 +88,8 @@ describe 'projects/_home_panel' do
end end
context 'only has project badges' do context 'only has project badges' do
let(:project) { create(:project) }
before do before do
create(:project_badge, project: project) create(:project_badge, project: project)
end end
...@@ -79,6 +98,9 @@ describe 'projects/_home_panel' do ...@@ -79,6 +98,9 @@ describe 'projects/_home_panel' do
end end
context 'has both group and project badges' do context 'has both group and project badges' do
let(:group) { create(:group) }
let(:project) { create(:project, namespace: group) }
before do before do
create(:project_badge, project: project) create(:project_badge, project: project)
create(:group_badge, group: project.group) create(:group_badge, group: project.group)
...@@ -87,4 +109,35 @@ describe 'projects/_home_panel' do ...@@ -87,4 +109,35 @@ describe 'projects/_home_panel' do
it_behaves_like 'show badges' it_behaves_like 'show badges'
end end
end end
context 'project id' do
let(:project) { create(:project) }
let(:user) { create(:user) }
before do
assign(:project, project)
allow(view).to receive(:current_user).and_return(user)
end
context 'user can read project' do
it 'is shown' do
allow(view).to receive(:can?).with(user, :read_project, project).and_return(true)
render
expect(rendered).to have_content("Project ID: #{project.id}")
end
end
context 'user cannot read project' do
it 'is not shown' do
allow(view).to receive(:can?).with(user, :read_project, project).and_return(false)
render
expect(rendered).not_to have_content("Project ID: #{project.id}")
end
end
end
end end
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