Commit 4ac93585 authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets Committed by Nicolò Maria Mezzopera

Fix input on new group page

Fixes js validation error after form was submitted
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 77778929
...@@ -12,6 +12,7 @@ const successMessageSelector = '.validation-success'; ...@@ -12,6 +12,7 @@ const successMessageSelector = '.validation-success';
const pendingMessageSelector = '.validation-pending'; const pendingMessageSelector = '.validation-pending';
const unavailableMessageSelector = '.validation-error'; const unavailableMessageSelector = '.validation-error';
const suggestionsMessageSelector = '.gl-path-suggestions'; const suggestionsMessageSelector = '.gl-path-suggestions';
const inputGroupSelector = '.input-group';
export default class GroupPathValidator extends InputValidator { export default class GroupPathValidator extends InputValidator {
constructor(opts = {}) { constructor(opts = {}) {
...@@ -39,7 +40,7 @@ export default class GroupPathValidator extends InputValidator { ...@@ -39,7 +40,7 @@ export default class GroupPathValidator extends InputValidator {
static validateGroupPathInput(inputDomElement) { static validateGroupPathInput(inputDomElement) {
const groupPath = inputDomElement.value; const groupPath = inputDomElement.value;
if (inputDomElement.checkValidity() && groupPath.length > 0) { if (inputDomElement.checkValidity() && groupPath.length > 1) {
GroupPathValidator.setMessageVisibility(inputDomElement, pendingMessageSelector); GroupPathValidator.setMessageVisibility(inputDomElement, pendingMessageSelector);
fetchGroupPathAvailability(groupPath) fetchGroupPathAvailability(groupPath)
...@@ -69,9 +70,10 @@ export default class GroupPathValidator extends InputValidator { ...@@ -69,9 +70,10 @@ export default class GroupPathValidator extends InputValidator {
} }
static setMessageVisibility(inputDomElement, messageSelector, isVisible = true) { static setMessageVisibility(inputDomElement, messageSelector, isVisible = true) {
const messageElement = inputDomElement.parentElement.parentElement.querySelector( const messageElement = inputDomElement
messageSelector, .closest(inputGroupSelector)
); .parentElement.querySelector(messageSelector);
messageElement.classList.toggle('hide', !isVisible); messageElement.classList.toggle('hide', !isVisible);
} }
......
...@@ -68,6 +68,35 @@ RSpec.describe 'Group' do ...@@ -68,6 +68,35 @@ RSpec.describe 'Group' do
end end
end end
describe 'real-time group url validation', :js do
it 'shows a message if group url is available' do
fill_in 'group_path', with: 'az'
wait_for_requests
expect(page).to have_content('Group path is available')
end
it 'shows an error if group url is taken' do
fill_in 'group_path', with: user.username
wait_for_requests
expect(page).to have_content('Group path is already taken')
end
it 'does not break after an invalid form submit' do
fill_in 'group_name', with: 'MyGroup'
fill_in 'group_path', with: 'z'
click_button 'Create group'
expect(page).to have_content('Group URL is too short')
fill_in 'group_path', with: 'az'
wait_for_requests
expect(page).to have_content('Group path is available')
end
end
describe 'Mattermost team creation' do describe 'Mattermost team creation' do
before do before do
stub_mattermost_setting(enabled: mattermost_enabled) stub_mattermost_setting(enabled: mattermost_enabled)
......
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