Commit a7a08738 authored by Sean McGivern's avatar Sean McGivern

Merge branch '27287-label-dropdown-error-messages' into 'master'

Fix form response errors not shown for create label dropdown.

See merge request !9058
parents 5a84b5fd 7f67b6c2
...@@ -107,9 +107,9 @@ ...@@ -107,9 +107,9 @@
if (typeof label.message === 'string') { if (typeof label.message === 'string') {
errors = label.message; errors = label.message;
} else { } else {
errors = label.message.map(function (value, key) { errors = Object.keys(label.message).map(key =>
return key + " " + value[0]; `${gl.text.humanize(key)} ${label.message[key].join(', ')}`
}).join("<br/>"); ).join("<br/>");
} }
this.$newLabelError this.$newLabelError
......
---
title: Fix displaying error messages for create label dropdown
merge_request: 9058
author: Tom Koole
...@@ -7,9 +7,9 @@ feature 'Issue Sidebar', feature: true do ...@@ -7,9 +7,9 @@ feature 'Issue Sidebar', feature: true do
let(:project) { create(:project, :public) } let(:project) { create(:project, :public) }
let(:issue) { create(:issue, project: project) } let(:issue) { create(:issue, project: project) }
let!(:user) { create(:user)} let!(:user) { create(:user)}
let!(:label) { create(:label, project: project, title: 'bug') }
before do before do
create(:label, project: project, title: 'bug')
login_as(user) login_as(user)
end end
...@@ -50,16 +50,6 @@ feature 'Issue Sidebar', feature: true do ...@@ -50,16 +50,6 @@ feature 'Issue Sidebar', feature: true do
visit_issue(project, issue) visit_issue(project, issue)
end end
describe 'when clicking on edit labels', js: true do
it 'shows dropdown option to create a new label' do
find('.block.labels .edit-link').click
page.within('.block.labels') do
expect(page).to have_content 'Create new'
end
end
end
context 'sidebar', js: true do context 'sidebar', js: true do
it 'changes size when the screen size is smaller' do it 'changes size when the screen size is smaller' do
sidebar_selector = 'aside.right-sidebar.right-sidebar-collapsed' sidebar_selector = 'aside.right-sidebar.right-sidebar-collapsed'
...@@ -77,30 +67,34 @@ feature 'Issue Sidebar', feature: true do ...@@ -77,30 +67,34 @@ feature 'Issue Sidebar', feature: true do
end end
end end
context 'creating a new label', js: true do context 'editing issue labels', js: true do
it 'shows option to crate a new label is present' do before do
page.within('.block.labels') do page.within('.block.labels') do
find('.edit-link').click find('.edit-link').click
end
end
it 'shows option to create a new label' do
page.within('.block.labels') do
expect(page).to have_content 'Create new' expect(page).to have_content 'Create new'
end end
end end
it 'shows dropdown switches to "create label" section' do context 'creating a new label', js: true do
before do
page.within('.block.labels') do page.within('.block.labels') do
find('.edit-link').click
click_link 'Create new' click_link 'Create new'
end
end
it 'shows dropdown switches to "create label" section' do
page.within('.block.labels') do
expect(page).to have_content 'Create new label' expect(page).to have_content 'Create new label'
end end
end end
it 'adds new label' do it 'adds new label' do
page.within('.block.labels') do page.within('.block.labels') do
find('.edit-link').click
sleep 1
click_link 'Create new'
fill_in 'new_label_name', with: 'wontfix' fill_in 'new_label_name', with: 'wontfix'
page.find(".suggest-colors a", match: :first).click page.find(".suggest-colors a", match: :first).click
click_button 'Create' click_button 'Create'
...@@ -110,6 +104,19 @@ feature 'Issue Sidebar', feature: true do ...@@ -110,6 +104,19 @@ feature 'Issue Sidebar', feature: true do
end end
end end
end end
it 'shows error message if label title is taken' do
page.within('.block.labels') do
fill_in 'new_label_name', with: label.title
page.find('.suggest-colors a', match: :first).click
click_button 'Create'
page.within('.dropdown-page-two') do
expect(page).to have_content 'Title has already been taken'
end
end
end
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